fix: propagate tracing information from spog to internal services

infrastructure/Cargo.toml

@@ -31,5 +31,7 @@ tracing-opentelemetry = "0.19.0"
 tracing-subscriber = { version = "0.3.17", default-features = false, features = ["env-filter", "tracing-log"] }
 tracing-actix-web = "0.7.8"
 url = "2.4.0"
+reqwest = "*"
+http = "0.2.9"
 
 trustification-auth = { path = "../auth", features = ["actix"] }

infrastructure/src/lib.rs

@@ -1,9 +1,9 @@
 mod infra;
-mod tracing;
 
 pub mod app;
 pub mod endpoint;
 pub mod health;
+pub mod tracing;
 
 pub use infra::*;
 

infrastructure/src/tracing.rs

@@ -1,5 +1,7 @@
 use core::fmt;
-
+use opentelemetry::propagation::Injector;
+use opentelemetry::Context;
+use reqwest::RequestBuilder;
 use tracing_bunyan_formatter::BunyanFormattingLayer;
 
 #[derive(clap::ValueEnum, Clone, Copy, Debug, PartialEq)]
@@ -25,6 +27,56 @@ impl fmt::Display for Tracing {
     }
 }
 
+pub trait PropagateCurrentContext {
+    fn propagate_current_context(self) -> Self
+    where
+        Self: Sized;
+}
+
+impl PropagateCurrentContext for reqwest::RequestBuilder {
+    #[inline]
+    fn propagate_current_context(self) -> Self
+    where
+        Self: Sized,
+    {
+        self.propagate_context(&opentelemetry::Context::current())
+    }
+}
+
+pub trait WithTracing {
+    fn propagate_context(self, cx: &Context) -> Self;
+}
+
+impl WithTracing for RequestBuilder {
+    fn propagate_context(self, cx: &Context) -> Self {
+        let headers = opentelemetry::global::get_text_map_propagator(|prop| {
+            let mut injector = HeaderInjector::new();
+            prop.inject_context(cx, &mut injector);
+            injector.0
+        });
+        self.headers(headers)
+    }
+}
+
+struct HeaderInjector(http::HeaderMap);
+
+impl HeaderInjector {
+    pub fn new() -> Self {
+        Self(Default::default())
+    }
+}
+
+impl Injector for HeaderInjector {
+    /// Set a key and value in the HeaderMap.  Does nothing if the key or value are not valid inputs.
+    fn set(&mut self, key: &str, value: String) {
+        if let Ok(name) = http::header::HeaderName::from_bytes(key.as_bytes()) {
+            if let Ok(val) = http::header::HeaderValue::from_str(&value) {
+                self.0.insert(name, val);
+            }
+        }
+    }
+}
+
 /// Try getting the sampling rate from the environment variables
 fn sampling_from_env() -> Option<f64> {
     std::env::var_os("OTEL_TRACES_SAMPLER_ARG").and_then(|s| s.to_str().map(|s| s.parse::<f64>().ok()).unwrap())

spog/api/src/server.rs

@@ -27,6 +27,7 @@ use trustification_auth::{
     client::{TokenInjector, TokenProvider},
     swagger_ui::SwaggerUiOidc,
 };
+use trustification_infrastructure::tracing::PropagateCurrentContext;
 use trustification_infrastructure::{app::http::HttpServerBuilder, MainContext};
 use trustification_version::version;
 use utoipa::OpenApi;
@@ -201,6 +202,7 @@ impl AppState {
             .client
             .get(url)
             .query(&[("id", id)])
+            .propagate_current_context()
             .inject_token(provider)
             .await?
             .send()
@@ -227,6 +229,7 @@ impl AppState {
             .query(&[("q", q)])
             .query(&[("offset", offset), ("limit", limit)])
             .apply(&options)
+            .propagate_current_context()
             .inject_token(provider)
             .await?
             .send()
@@ -248,6 +251,7 @@ impl AppState {
             .client
             .get(url)
             .query(&[("advisory", id)])
+            .propagate_current_context()
             .inject_token(provider)
             .await?
             .send()
@@ -274,6 +278,7 @@ impl AppState {
             .query(&[("q", q)])
             .query(&[("offset", offset), ("limit", limit)])
             .apply(&options)
+            .propagate_current_context()
             .inject_token(provider)
             .await?
             .send()
@@ -295,6 +300,7 @@ impl AppState {
         let response = self
             .client
             .post(url)
+            .propagate_current_context()
             .inject_token(provider)
             .await?
             .json(&AnalyzeRequest { purls })