chore(deps): update opentelemetry stack to 0.31 and tonic to 0.14 (#266)

also update code, and snapshot tests

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Bernard <david.bernard.31@gmail.com>

Author: renovate[bot]

.mise.toml

@@ -60,13 +60,21 @@ fi
 
 [tasks.test]
 description = "Launch tests"
-depends = ["install:cargo-nextest", "install:cargo-insta"]
+depends = ["install:cargo-nextest"]
 run = [
   "cargo nextest run",
   "cargo test --doc",
 ]
 wait_for = ["lint"]
 
+[tasks."test:review"]
+description = "Launch snapshot test and review result (accept or reject)"
+depends = ["install:cargo-insta"]
+run = [
+  "cargo insta review",
+]
+wait_for = ["lint"]
+
 [tasks.test-each-feature]
 description = "Test each feature separately"
 depends = ["install:cargo-hack"]

Cargo.toml

@@ -27,27 +27,27 @@ axum = { version = "0.8", default-features = false }
 http = "^1"
 hyper = "1"
 insta = { version = "^1", features = ["redactions", "yaml"] }
-opentelemetry = { version = "0.30", features = [
+opentelemetry = { version = "0.31", features = [
   "trace",
 ], default-features = false }
-opentelemetry_sdk = { version = "0.30", default-features = false, features = [
+opentelemetry_sdk = { version = "0.31", default-features = false, features = [
   "rt-tokio",
 ] }
 opentelemetry-aws = { version = "0.18", default-features = false }
-opentelemetry-jaeger-propagator = { version = "0.30", default-features = false }
+opentelemetry-jaeger-propagator = { version = "0.31", default-features = false }
 opentelemetry-resource-detectors = { version = "0.9", default-features = false }
-opentelemetry-semantic-conventions = { version = "0.30", default-features = false }
-opentelemetry-zipkin = { version = "0.30", default-features = false }
-opentelemetry-otlp = { version = "0.30", default-features = false }
-opentelemetry-proto = { version = "0.30", default-features = false }
-opentelemetry-stdout = { version = "0.30" }
+opentelemetry-semantic-conventions = { version = "0.31", default-features = false }
+opentelemetry-zipkin = { version = "0.31", default-features = false }
+opentelemetry-otlp = { version = "0.31", default-features = false }
+opentelemetry-proto = { version = "0.31", default-features = false }
+opentelemetry-stdout = { version = "0.31" }
 rstest = "0.26"
 tokio = { version = "1", default-features = false }
 tokio-stream = { version = "0.1", default-features = false }
-tonic = { version = "0.13", default-features = false } #should be sync with opentelemetry-proto
+tonic = { version = "0.14", default-features = false } #should be sync with opentelemetry-proto
 tower = { version = "0.5", default-features = false }
 tracing = "0.1"
-tracing-opentelemetry = "0.31"
+tracing-opentelemetry = "0.32"
 
 [profile.dev.package.insta]
 opt-level = 3

axum-tracing-opentelemetry/src/middleware/trace_extractor.rs

@@ -160,7 +160,9 @@ where
             if let Some(client_ip) = client_ip {
                 span.record("client.address", client_ip);
             }
-            span.set_parent(otel_http::extract_context(req.headers()));
+            if let Err(error) = span.set_parent(otel_http::extract_context(req.headers())) {
+                tracing::warn!(?error, "can not set parent trace_id to span");
+            }
             span
         } else {
             tracing::Span::none()

deny.toml

@@ -223,7 +223,7 @@ skip = [
   # "rand", # until tonic & tower upgrade
   # "rand_chacha", # until tonic & tower upgrade
   # "rand_core", # until tonic & tower upgrade
-  "socket2",
+  # "socket2",
   "wasi",
 ]
 # Similarly to `skip` allows you to skip certain crates during duplicate

examples/grpc/Cargo.toml

@@ -14,18 +14,19 @@ init-tracing-opentelemetry = { path = "../../init-tracing-opentelemetry", featur
   "logfmt",
 ] }
 opentelemetry = { workspace = true }
-prost = "0.13"
+prost = "0.14"
 tokio = { workspace = true, features = ["full"] }
 tonic = { workspace = true, features = ["transport", "router"] }
-tonic-health = "0.13"
-tonic-reflection = "0.13"
+tonic-health = "0.14"
+tonic-prost = "0.14"
+tonic-reflection = "0.14"
 tonic-tracing-opentelemetry = { path = "../../tonic-tracing-opentelemetry" }
 tower = { workspace = true }
 tracing = { workspace = true }
 tracing-opentelemetry-instrumentation-sdk = { path = "../../tracing-opentelemetry-instrumentation-sdk" }
 
 [build-dependencies]
-tonic-build = "0.13"
+tonic-prost-build = "0.14"
 
 [[bin]]
 name = "server"

examples/grpc/build.rs

@@ -1,16 +1,17 @@
 use std::path::PathBuf;
 
 fn main() {
-    // trigger rebuild if "proto" folder change
+    // trigger rebuild if "proto" folder change or empty
     print!("cargo:rerun-if-changed=./proto");
+    print!("cargo:rerun-if-changed=./src/generated");
 
     //let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
     let out_dir = PathBuf::from(std::env!("CARGO_MANIFEST_DIR"))
         .join("src")
         .join("generated");
     std::fs::create_dir_all(&out_dir).unwrap();
 
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .build_client(true)
         .build_server(true)
         .file_descriptor_set_path(out_dir.join("helloworld_descriptor.bin"))

examples/grpc/src/generated/helloworld.rs

@@ -1,15 +1,15 @@
 // This file is @generated by prost-build.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct HelloRequest {
     #[prost(string, tag = "1")]
     pub name: ::prost::alloc::string::String,
 }
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct HelloReply {
     #[prost(string, tag = "1")]
     pub message: ::prost::alloc::string::String,
 }
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct StatusRequest {
     /// <https://github.com/grpc/grpc/blob/master/doc/statuscodes.md#status-codes-and-their-use-in-grpc>
     #[prost(int32, tag = "1")]
@@ -120,7 +120,7 @@ pub mod greeter_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/helloworld.Greeter/SayHello",
             );
@@ -141,7 +141,7 @@ pub mod greeter_client {
                         format!("Service was not ready: {}", e.into()),
                     )
                 })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/helloworld.Greeter/SayStatus",
             );
@@ -278,7 +278,7 @@ pub mod greeter_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SayHelloSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -321,7 +321,7 @@ pub mod greeter_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = SayStatusSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,

init-tracing-opentelemetry/src/tracing_subscriber_ext.rs

@@ -124,7 +124,8 @@ where
 }
 
 #[cfg(feature = "metrics")]
-pub fn build_metrics_layer<S>() -> Result<(MetricsLayer<S>, SdkMeterProvider), Error>
+pub fn build_metrics_layer<S>(
+) -> Result<(MetricsLayer<S, SdkMeterProvider>, SdkMeterProvider), Error>
 where
     S: Subscriber + for<'a> LookupSpan<'a>,
 {

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__call_with_w3c_trace_otel_spans.snap

@@ -1,7 +1,6 @@
 ---
 source: testing-tracing-opentelemetry/src/lib.rs
 expression: otel_spans
-snapshot_kind: text
 ---
 - trace_id: "[trace_id:lg32]"
   span_id: "[span_id:lg16]"
@@ -13,16 +12,17 @@ snapshot_kind: text
   end_time_unix_nano: "[timestamp]"
   attributes:
     busy_ns: ignore
-    code.filepath: ignore
-    code.lineno: ignore
-    code.namespace: "Some(AnyValue { value: Some(StringValue(\"tracing_opentelemetry_instrumentation_sdk::http::http_server\")) })"
+    code.file.path: "Some(AnyValue { value: Some(StringValue(\"tracing-opentelemetry-instrumentation-sdk/src/http/http_server.rs\")) })"
+    code.line.number: "Some(AnyValue { value: Some(IntValue(13)) })"
+    code.module.name: "Some(AnyValue { value: Some(StringValue(\"tracing_opentelemetry_instrumentation_sdk::http::http_server\")) })"
     http.request.method: "Some(AnyValue { value: Some(StringValue(\"GET\")) })"
     http.response.status_code: "Some(AnyValue { value: Some(StringValue(\"200\")) })"
     http.route: "Some(AnyValue { value: Some(StringValue(\"/users/{id}\")) })"
     idle_ns: ignore
     network.protocol.version: "Some(AnyValue { value: Some(StringValue(\"1.1\")) })"
     server.address: "Some(AnyValue { value: Some(StringValue(\"\")) })"
     span.type: "Some(AnyValue { value: Some(StringValue(\"web\")) })"
+    target: "Some(AnyValue { value: Some(StringValue(\"otel::tracing\")) })"
     thread.id: ignore
     thread.name: "Some(AnyValue { value: Some(StringValue(\"middleware::trace_extractor::tests::check_span_event::case_6\")) })"
     url.path: "Some(AnyValue { value: Some(StringValue(\"/users/123\")) })"

testing-tracing-opentelemetry/src/snapshots/testing_tracing_opentelemetry__empty_http_route_for_nonexisting_route_otel_spans.snap

@@ -12,16 +12,17 @@ expression: otel_spans
   end_time_unix_nano: "[timestamp]"
   attributes:
     busy_ns: ignore
-    code.filepath: ignore
-    code.lineno: ignore
-    code.namespace: "Some(AnyValue { value: Some(StringValue(\"tracing_opentelemetry_instrumentation_sdk::http::http_server\")) })"
+    code.file.path: "Some(AnyValue { value: Some(StringValue(\"tracing-opentelemetry-instrumentation-sdk/src/http/http_server.rs\")) })"
+    code.line.number: "Some(AnyValue { value: Some(IntValue(13)) })"
+    code.module.name: "Some(AnyValue { value: Some(StringValue(\"tracing_opentelemetry_instrumentation_sdk::http::http_server\")) })"
     http.request.method: "Some(AnyValue { value: Some(StringValue(\"GET\")) })"
     http.response.status_code: "Some(AnyValue { value: Some(StringValue(\"404\")) })"
     http.route: "Some(AnyValue { value: Some(StringValue(\"\")) })"
     idle_ns: ignore
     network.protocol.version: "Some(AnyValue { value: Some(StringValue(\"1.1\")) })"
     server.address: "Some(AnyValue { value: Some(StringValue(\"\")) })"
     span.type: "Some(AnyValue { value: Some(StringValue(\"web\")) })"
+    target: "Some(AnyValue { value: Some(StringValue(\"otel::tracing\")) })"
     thread.id: ignore
     thread.name: "Some(AnyValue { value: Some(StringValue(\"middleware::trace_extractor::tests::check_span_event::case_2\")) })"
     url.path: "Some(AnyValue { value: Some(StringValue(\"/idontexist/123\")) })"
@@ -35,4 +36,3 @@ expression: otel_spans
   status:
     message: ""
     code: STATUS_CODE_UNSET
-