fix: MSRV (bump to 1.88) & api changes in dependencies, reformat (#325)

Author: davidB

.mise.toml

@@ -5,16 +5,21 @@ OTEL_TRACES_SAMPLER = "always_on"
 # RUST_LOG = "warn,otel::setup=debug"
 
 [tools]
-rust = { version = "1.87.0", profile = "minimal", components = "rustfmt,clippy" } # the rust tool stack (with cargo, fmt, clippy) to build source
-grpcurl = '1.9'
-protoc = '34.0'
+rust = { version = "1.88.0", profile = "minimal", components = "rustfmt,clippy" }  # the rust tool stack (with cargo, fmt, clippy) to build source
+grpcurl = "1.9"
+protoc = "34.0"
 # grpc-health-probe = "*"
 # sccache = "0.5"
 # cargo-binstall allow to download (insteal of build) "cargo:*"
 # - do not use cargo-binstall" (it's a special name used by mise)
 # - "aqua:cargo-bins/cargo-binstall" allow to download the binary
 "aqua:cargo-bins/cargo-binstall" = "1"
 
+[tasks.autofix]
+description = "Automatically fix some linting issues & format code"
+depends_post = ["format"]
+run = "cargo clippy --all-features --fix --allow-dirty"
+
 [tasks.format]
 alias = "fmt"
 description = "Format the code and sort dependencies"
@@ -86,39 +91,38 @@ release-plz set-version tracing-opentelemetry-instrumentation-sdk@"$version"
 [tasks."install:cargo-deny"]
 hide = true
 description = "Install cargo-deny"
-run = 'cargo binstall -y cargo-deny || cargo install --locked cargo-deny'
+run = "cargo binstall -y cargo-deny || cargo install --locked cargo-deny"
 
 [tasks."install:cargo-nextest"]
 hide = true
 description = "Install cargo-nextest"
-run = 'cargo binstall -y cargo-nextest || cargo install --locked cargo-nextest'
+run = "cargo binstall -y cargo-nextest || cargo install --locked cargo-nextest"
 
 [tasks."install:cargo-insta"]
 hide = true
 description = "Install cargo-insta"
-run = 'cargo binstall -y cargo-insta || cargo install --locked cargo-insta'
+run = "cargo binstall -y cargo-insta || cargo install --locked cargo-insta"
 
 [tasks."install:cargo-release"]
 hide = true
 description = "Install cargo-release"
-run = 'cargo binstall -y cargo-release || cargo install --locked cargo-release'
+run = "cargo binstall -y cargo-release || cargo install --locked cargo-release"
 
 [tasks."install:git-cliff"]
 hide = true
 description = "Install git-cliff"
-run = 'cargo binstall -y git-cliff || cargo install --locked git-cliff'
+run = "cargo binstall -y git-cliff || cargo install --locked git-cliff"
 
 [tasks."install:cargo-hack"]
 hide = true
 description = "Install cargo-hack"
-run = 'cargo binstall -y cargo-hack || cargo install --locked cargo-hack'
-
+run = "cargo binstall -y cargo-hack || cargo install --locked cargo-hack"
 
 [tasks.run-otel-desktop-viewer]
 description = "Run otel-desktop-viewer as receiver and viewer of otel trace"
 run = [
-  '# Viewer: open http://localhost:8000',
-  'docker run -p 8000:8000 -p 4317:4317 -p 4318:4318 ghcr.io/ctrlspice/otel-desktop-viewer:latest-amd64',
+  "# Viewer: open http://localhost:8000",
+  "docker run -p 8000:8000 -p 4317:4317 -p 4318:4318 ghcr.io/ctrlspice/otel-desktop-viewer:latest-amd64",
 ]
 
 [tasks.run-jaeger]
@@ -138,7 +142,7 @@ run = [
 
 [tasks.run-example-grpc-server]
 description = "Run gRPC server example"
-run = 'cd examples/grpc && OTEL_SERVICE_NAME=grpc-server cargo run --bin server'
+run = "cd examples/grpc && OTEL_SERVICE_NAME=grpc-server cargo run --bin server"
 
 [tasks.run-example-grpc-client]
 description = "Run gRPC client example"
@@ -149,7 +153,7 @@ cd examples/grpc && OTEL_SERVICE_NAME=grpc-client cargo run --bin client
 
 [tasks.run-example-axum-otlp-server]
 description = "Run axum-otlp server example"
-run = 'cd examples/axum-otlp && OTEL_SERVICE_NAME=axum-otlp-4317 cargo run'
+run = "cd examples/axum-otlp && OTEL_SERVICE_NAME=axum-otlp-4317 cargo run"
 
 [tasks.run-example-axum-otlp-server-http]
 description = "Run axum-otlp server example over HTTP"
@@ -168,7 +172,7 @@ curl -i http://127.0.0.1:3003/
 
 [tasks.run-example-load]
 description = "Run load test example"
-run = 'cd examples/load && cargo run --release 2>/dev/null'
+run = "cd examples/load && cargo run --release 2>/dev/null"
 
 [tasks.ci]
 depends = ["check", "lint", "test", "deny"]

Cargo.toml

@@ -12,47 +12,47 @@ members = [
 exclude = ["target"]
 
 [workspace.package]
-edition = "2024"
 version = "0.32.0"
-license = "CC0-1.0"
+edition = "2024"
+rust-version = "1.88.0"
 homepage = "https://github.com/davidB/tracing-opentelemetry-instrumentation-sdk"
 repository = "https://github.com/davidB/tracing-opentelemetry-instrumentation-sdk"
-rust-version = "1.87.0"
-
-[workspace.metadata.release]
-pre-release-commit-message = "🚀 (cargo-release) version {{version}}"
-tag-prefix = ""
-tag-name = "{{prefix}}{{version}}"
-tag-message = "🔖 {{version}}"
+license = "CC0-1.0"
 
 [workspace.dependencies]
 assert2 = "0.4"
 axum = { version = "0.8", default-features = false }
 http = "^1"
 hyper = "1"
 insta = { version = "^1", features = ["redactions", "yaml"] }
-opentelemetry = { version = "0.31", features = [
+opentelemetry = { version = "0.31", default-features = false, features = [
   "trace",
-], default-features = false }
-opentelemetry_sdk = { version = "0.31", default-features = false, features = [
-  "rt-tokio",
 ] }
 opentelemetry-aws = { version = "0.19", default-features = false }
 opentelemetry-jaeger-propagator = { version = "0.31", default-features = false }
-opentelemetry-resource-detectors = { version = "0.10", default-features = false }
-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-resource-detectors = { version = "0.10", default-features = false }
+opentelemetry_sdk = { version = "0.31", default-features = false, features = [
+  "rt-tokio",
+] }
+opentelemetry-semantic-conventions = { version = "0.31", default-features = false }
 opentelemetry-stdout = { version = "0.31" }
+opentelemetry-zipkin = { version = "0.31", default-features = false }
 rstest = "0.26"
 tokio = { version = "1", default-features = false }
 tokio-stream = { version = "0.1", default-features = false }
-tonic = { version = "0.14", 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.32"
 
+[workspace.metadata.release]
+pre-release-commit-message = "🚀 (cargo-release) version {{version}}"
+tag-prefix = ""
+tag-name = "{{prefix}}{{version}}"
+tag-message = "🔖 {{version}}"
+
 [profile.dev.package.insta]
 opt-level = 3
 

examples/grpc/src/client.rs

@@ -31,7 +31,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
         let response = client.say_hello(request).await?;
 
-        println!("RESPONSE={:?}", response);
+        println!("RESPONSE={response:?}");
     }
     {
         let request = tonic::Request::new(StatusRequest {
@@ -41,7 +41,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
         let response = client.say_status(request).await;
 
-        println!("RESPONSE={:?}", response);
+        println!("RESPONSE={response:?}");
     }
     {
         let request = tonic::Request::new(StatusRequest {
@@ -51,7 +51,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
         let response = client.say_status(request).await;
 
-        println!("RESPONSE={:?}", response);
+        println!("RESPONSE={response:?}");
     }
 
     Ok(())

examples/grpc/src/server.rs

@@ -60,7 +60,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .register_encoded_file_descriptor_set(generated::FILE_DESCRIPTOR_SET)
         .build_v1()?;
 
-    println!("GreeterServer listening on {}", addr);
+    println!("GreeterServer listening on {addr}");
 
     Server::builder()
         .timeout(std::time::Duration::from_secs(10))

fake-opentelemetry-collector/README.md

@@ -48,19 +48,19 @@ async fn demo_fake_tracer_and_collector() {
         "[].end_time_unix_nano" => "[timestamp]",
         "[].events[].time_unix_nano" => "[timestamp]",
         "[].trace_id" => insta::dynamic_redaction(|value, _path| {
-            assert2::let_assert!(Some(trace_id) = value.as_str());
+            assert2::assert!(let Some(trace_id) = value.as_str());
             format!("[trace_id:lg{}]", trace_id.len())
         }),
         "[].span_id" => insta::dynamic_redaction(|value, _path| {
-            assert2::let_assert!(Some(span_id) = value.as_str());
+            assert2::assert!(let Some(span_id) = value.as_str());
             format!("[span_id:lg{}]", span_id.len())
         }),
         "[].links[].trace_id" => insta::dynamic_redaction(|value, _path| {
-            assert2::let_assert!(Some(trace_id) = value.as_str());
+            assert2::assert!(let Some(trace_id) = value.as_str());
             format!("[trace_id:lg{}]", trace_id.len())
         }),
         "[].links[].span_id" => insta::dynamic_redaction(|value, _path| {
-            assert2::let_assert!(Some(span_id) = value.as_str());
+            assert2::assert!(let Some(span_id) = value.as_str());
             format!("[span_id:lg{}]", span_id.len())
         }),
     });

fake-opentelemetry-collector/src/logs.rs

@@ -28,7 +28,7 @@ impl From<opentelemetry_proto::tonic::logs::v1::LogRecord> for ExportedLog {
             observed_time_unix_nano: value.observed_time_unix_nano,
             severity_number: value.severity_number,
             severity_text: value.severity_text,
-            body: value.body.map(|value| format!("{:?}", value)),
+            body: value.body.map(|value| format!("{value:?}")),
             attributes: cnv_attributes(&value.attributes),
             dropped_attributes_count: value.dropped_attributes_count,
             flags: value.flags,

fake-opentelemetry-collector/tests/demo_log.rs

@@ -36,11 +36,11 @@ async fn demo_fake_logger_and_collector() {
 
     insta::assert_yaml_snapshot!(otel_logs, {
         "[].trace_id" => insta::dynamic_redaction(|value, _path| {
-            assert2::let_assert!(Some(trace_id) = value.as_str());
+            assert2::assert!(let Some(trace_id) = value.as_str());
             format!("[trace_id:lg{}]", trace_id.len())
         }),
         "[].span_id" => insta::dynamic_redaction(|value, _path| {
-            assert2::let_assert!(Some(span_id) = value.as_str());
+            assert2::assert!(let Some(span_id) = value.as_str());
             format!("[span_id:lg{}]", span_id.len())
         }),
         "[].observed_time_unix_nano" => "[timestamp]",