update dependencies

Author: lovasoa

Cargo.lock

@@ -18,7 +18,7 @@ panic = "abort"
 codegen-units = 2
 
 [dependencies]
-sqlx = { package = "sqlx-oldapi", version = "0.6.53", default-features = false, features = [
+sqlx = { package = "sqlx-oldapi", version = "0.6.54", default-features = false, features = [
     "any",
     "runtime-tokio-rustls",
     "migrate",
@@ -83,11 +83,11 @@ regex = "1"
 # OpenTelemetry / tracing
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] }
-tracing-opentelemetry = "0.32"
-tracing-actix-web = { version = "0.7", default-features = false, features = ["opentelemetry_0_31"] }
+tracing-opentelemetry = { version = "0.32", default-features = false }
+tracing-actix-web = { version = "0.7", default-features = false }
 tracing-log = "0.2"
-opentelemetry = "0.31"
-opentelemetry_sdk = { version = "0.31", features = ["metrics", "rt-tokio", "spec_unstable_metrics_views", "experimental_trace_batch_span_processor_with_async_runtime", "experimental_metrics_periodicreader_with_async_runtime"] }
+opentelemetry = { version = "0.31", default-features = false, features = ["trace", "metrics"] }
+opentelemetry_sdk = { version = "0.31", default-features = false, features = ["metrics", "rt-tokio", "spec_unstable_metrics_views", "experimental_trace_batch_span_processor_with_async_runtime", "experimental_metrics_periodicreader_with_async_runtime"] }
 opentelemetry-otlp = { version = "0.31", default-features = false, features = ["http-proto", "metrics"] }
 opentelemetry-http = { version = "0.31", default-features = false }
 opentelemetry-semantic-conventions = { version = "0.31", features = ["semconv_experimental"] }

Cargo.toml

@@ -322,8 +322,7 @@ fn init_otel_tracing(logfmt_layer: logfmt::LogfmtLayer) -> anyhow::Result<()> {
     let subscriber = tracing_subscriber::registry()
         .with(default_env_filter())
         .with(logfmt_layer)
-        .with(otel_layer)
-        .with(tracing_opentelemetry::MetricsLayer::new(meter_provider));
+        .with(otel_layer);
 
     set_global_subscriber(subscriber)
 }

src/telemetry.rs

@@ -325,6 +325,30 @@ fn sql_execution_span_name(source_path: &std::path::Path) -> String {
     format!("SQL {}", source_path.display())
 }
 
+struct RequestHeaderCarrier<'a>(&'a actix_web::http::header::HeaderMap);
+
+impl opentelemetry::propagation::Extractor for RequestHeaderCarrier<'_> {
+    fn get(&self, key: &str) -> Option<&str> {
+        self.0.get(key).and_then(|value| value.to_str().ok())
+    }
+
+    fn keys(&self) -> Vec<&str> {
+        self.0
+            .keys()
+            .map(actix_web::http::header::HeaderName::as_str)
+            .collect()
+    }
+}
+
+fn set_otel_parent(request: &ServiceRequest, span: &Span) {
+    use tracing_opentelemetry::OpenTelemetrySpanExt as _;
+
+    let parent_context = opentelemetry::global::get_text_map_propagator(|propagator| {
+        propagator.extract(&RequestHeaderCarrier(request.headers()))
+    });
+    let _ = span.set_parent(parent_context);
+}
+
 struct SqlPageRootSpanBuilder;
 
 impl RootSpanBuilder for SqlPageRootSpanBuilder {
@@ -362,7 +386,7 @@ impl RootSpanBuilder for SqlPageRootSpanBuilder {
             "sqlpage.exception.details" = tracing::field::Empty,
         );
         std::mem::drop(connection_info);
-        tracing_actix_web::root_span_macro::private::set_otel_parent(request, &span);
+        set_otel_parent(request, &span);
         span
     }