Propagate OpenTelemetry spans

sessions/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "sessions"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.81"
+anyhow = { version = "1.0.81" }
 async-graphql = { version = "7.0.3", default-features = false, features = [
     "chrono",
     "graphiql",
@@ -13,11 +13,13 @@ async-graphql = { version = "7.0.3", default-features = false, features = [
 async-graphql-axum = { version = "7.0.3" }
 axum = { version = "0.7.4" }
 axum-extra = { version = "0.9.2", features = ["typed-header"] }
+axum-tracing-opentelemetry = "0.18.0"
 chrono = { version = "0.4.35" }
 clap = { version = "4.5.3", features = ["derive", "env"] }
 dotenvy = { version = "0.15.7" }
 models = { path = "../models" }
 opentelemetry = { version = "0.22.0", features = ["metrics"] }
+opentelemetry-http = { version = "0.11.0" }
 opentelemetry-otlp = { version = "0.15.0", features = ["metrics", "tokio"] }
 opentelemetry-semantic-conventions = { version = "0.14.0" }
 opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] }

sessions/src/main.rs

@@ -17,8 +17,9 @@ use crate::{
     opa::OpaClient,
     route_handlers::GraphQLHandler,
 };
-use async_graphql::{extensions::Tracing, http::GraphiQLSource, SDLExportOptions};
+use async_graphql::{http::GraphiQLSource, SDLExportOptions};
 use axum::{response::Html, routing::get, Router};
+use axum_tracing_opentelemetry::middleware::{OtelAxumLayer, OtelInResponseLayer};
 use clap::Parser;
 use opentelemetry_otlp::WithExportConfig;
 use sea_orm::{ConnectOptions, Database, DatabaseConnection, DbErr, TransactionError};
@@ -84,7 +85,7 @@ async fn main() {
             let database = setup_database(args.database_url).await.unwrap();
             let opa_client = OpaClient::new(args.opa_url);
             let schema = root_schema_builder()
-                .extension(Tracing)
+                .extension(async_graphql::extensions::Tracing)
                 .data(database)
                 .data(opa_client)
                 .finish();
@@ -117,13 +118,16 @@ fn setup_router(schema: RootSchema) -> Router {
     #[allow(clippy::missing_docs_in_private_items)]
     const GRAPHQL_ENDPOINT: &str = "/";
 
-    Router::new().route(
-        GRAPHQL_ENDPOINT,
-        get(Html(
-            GraphiQLSource::build().endpoint(GRAPHQL_ENDPOINT).finish(),
-        ))
-        .post(GraphQLHandler::new(schema)),
-    )
+    Router::new()
+        .route(
+            GRAPHQL_ENDPOINT,
+            get(Html(
+                GraphiQLSource::build().endpoint(GRAPHQL_ENDPOINT).finish(),
+            ))
+            .post(GraphQLHandler::new(schema)),
+        )
+        .layer(OtelInResponseLayer)
+        .layer(OtelAxumLayer::default())
 }
 
 /// Serves the endpoints on the specified port forever

sessions/src/opa.rs

@@ -1,5 +1,6 @@
 use axum_extra::headers::{authorization::Bearer, Authorization};
 use serde::{Deserialize, Serialize};
+use tracing::instrument;
 use url::Url;
 
 /// Parametrers required by OPA to make the policy decision
@@ -50,14 +51,22 @@ impl OpaClient {
     }
 
     /// Queries OPA with the [`OpaInput`] and returns the [`Decision`]
+    #[instrument(skip(input))]
     async fn query<P: Serialize>(&self, input: OpaInput<P>) -> Result<Decision, reqwest::Error> {
-        self.client
+        let mut request = self
+            .client
             .post(self.endpoint.clone())
             .json(&input)
-            .send()
-            .await?
-            .json()
-            .await
+            .build()?;
+
+        opentelemetry::global::get_text_map_propagator(|propagator| {
+            propagator.inject_context(
+                &opentelemetry::Context::current(),
+                &mut opentelemetry_http::HeaderInjector(request.headers_mut()),
+            )
+        });
+
+        self.client.execute(request).await?.json().await
     }
 
     /// Queries OPA with the [`OpaInput`] and returns a [`Result`]