From ab2c2c1caaa352f15bf5485aa0e9f6134b5b21ec Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 11 Feb 2025 19:40:49 +0800 Subject: [PATCH 1/4] build: upgrade for opentelemetry 0.28 Signed-off-by: tison --- fastrace-opentelemetry/Cargo.toml | 8 ++++---- fastrace/Cargo.toml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fastrace-opentelemetry/Cargo.toml b/fastrace-opentelemetry/Cargo.toml index c3dfd90..2542767 100644 --- a/fastrace-opentelemetry/Cargo.toml +++ b/fastrace-opentelemetry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastrace-opentelemetry" -version = "0.8.1" +version = "0.9.0" categories = ["development-tools::debugging"] description = "Opentelemetry reporter for fastrace" @@ -16,9 +16,9 @@ rust-version.workspace = true [dependencies] fastrace = { workspace = true } log = { workspace = true } -opentelemetry = { version = "0.27", features = ["trace"] } -opentelemetry_sdk = { version = "0.27", features = ["trace"] } +opentelemetry = { version = "0.28", features = ["trace"] } +opentelemetry_sdk = { version = "0.28", features = ["trace"] } pollster = { version = "0.4.0" } [dev-dependencies] -opentelemetry-otlp = { version = "0.27", features = ["trace"] } +opentelemetry-otlp = { version = "0.28", features = ["trace"] } diff --git a/fastrace/Cargo.toml b/fastrace/Cargo.toml index 8e3111b..b9ec32b 100644 --- a/fastrace/Cargo.toml +++ b/fastrace/Cargo.toml @@ -41,9 +41,9 @@ log = { workspace = true } logcall = "0.1" logforth = { version = "0.19.2", features = ["fastrace"] } mockall = "0.13" -opentelemetry = { version = "0.27", features = ["trace"] } -opentelemetry-otlp = { version = "0.27", features = ["trace"] } -opentelemetry_sdk = { version = "0.27", features = ["trace"] } +opentelemetry = { version = "0.28", features = ["trace"] } +opentelemetry-otlp = { version = "0.28", features = ["trace"] } +opentelemetry_sdk = { version = "0.28", features = ["trace"] } pollster = { version = "0.4.0" } rand = "0.9" rustracing = "0.6" From 89be82b890d7eca196309b965b791a91fd054d19 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 11 Feb 2025 19:53:47 +0800 Subject: [PATCH 2/4] fixup dep Signed-off-by: tison --- fastrace-opentelemetry/CHANGELOG.md | 4 ++++ fastrace-opentelemetry/src/lib.rs | 4 ++-- fastrace/Cargo.toml | 4 ++-- fastrace/examples/asynchronous.rs | 11 ++++++++--- fastrace/examples/synchronous.rs | 11 ++++++++--- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/fastrace-opentelemetry/CHANGELOG.md b/fastrace-opentelemetry/CHANGELOG.md index 52dd783..440535b 100644 --- a/fastrace-opentelemetry/CHANGELOG.md +++ b/fastrace-opentelemetry/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## v0.9.0 + +- Upgrade opentelemtry to 0.28.0. + ## v0.8.1 - Reduce dependencies to futures 0.3. diff --git a/fastrace-opentelemetry/src/lib.rs b/fastrace-opentelemetry/src/lib.rs index 2446ff6..fcf2f09 100644 --- a/fastrace-opentelemetry/src/lib.rs +++ b/fastrace-opentelemetry/src/lib.rs @@ -34,9 +34,9 @@ use opentelemetry::trace::Status; use opentelemetry::trace::TraceFlags; use opentelemetry::trace::TraceState; use opentelemetry_sdk::Resource; -use opentelemetry_sdk::export::trace::SpanData; -use opentelemetry_sdk::export::trace::SpanExporter; +use opentelemetry_sdk::trace::SpanData; use opentelemetry_sdk::trace::SpanEvents; +use opentelemetry_sdk::trace::SpanExporter; use opentelemetry_sdk::trace::SpanLinks; /// [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-rust) reporter for `fastrace`. diff --git a/fastrace/Cargo.toml b/fastrace/Cargo.toml index b9ec32b..6861fcf 100644 --- a/fastrace/Cargo.toml +++ b/fastrace/Cargo.toml @@ -42,7 +42,7 @@ logcall = "0.1" logforth = { version = "0.19.2", features = ["fastrace"] } mockall = "0.13" opentelemetry = { version = "0.28", features = ["trace"] } -opentelemetry-otlp = { version = "0.28", features = ["trace"] } +opentelemetry-otlp = { version = "0.28", features = ["trace", "grpc-tonic"] } opentelemetry_sdk = { version = "0.28", features = ["trace"] } pollster = { version = "0.4.0" } rand = "0.9" @@ -56,7 +56,7 @@ tokio = { version = "1.38", features = [ "rt-multi-thread", ] } tracing = "0.1" -tracing-opentelemetry = "0.27" +tracing-opentelemetry = "0.28.0" tracing-subscriber = "0.3" [[bench]] diff --git a/fastrace/examples/asynchronous.rs b/fastrace/examples/asynchronous.rs index 5a453fc..c8a1b2e 100644 --- a/fastrace/examples/asynchronous.rs +++ b/fastrace/examples/asynchronous.rs @@ -112,9 +112,14 @@ impl ReportAll { .build() .expect("initialize oltp exporter"), opentelemetry::trace::SpanKind::Server, - Cow::Owned(opentelemetry_sdk::Resource::new([ - opentelemetry::KeyValue::new("service.name", "asynchronous(opentelemetry)"), - ])), + Cow::Owned( + opentelemetry_sdk::Resource::builder() + .with_attributes([opentelemetry::KeyValue::new( + "service.name", + "asynchronous(opentelemetry)", + )]) + .build(), + ), opentelemetry::InstrumentationScope::builder("example-crate") .with_version(env!("CARGO_PKG_VERSION")) .build(), diff --git a/fastrace/examples/synchronous.rs b/fastrace/examples/synchronous.rs index 78a6ccf..334213b 100644 --- a/fastrace/examples/synchronous.rs +++ b/fastrace/examples/synchronous.rs @@ -86,9 +86,14 @@ impl ReportAll { .build() .expect("initialize oltp exporter"), opentelemetry::trace::SpanKind::Server, - Cow::Owned(opentelemetry_sdk::Resource::new([ - opentelemetry::KeyValue::new("service.name", "synchronous(opentelemetry)"), - ])), + Cow::Owned( + opentelemetry_sdk::Resource::builder() + .with_attributes([opentelemetry::KeyValue::new( + "service.name", + "synchronous(opentelemetry)", + )]) + .build(), + ), opentelemetry::InstrumentationScope::builder("example-crate") .with_version(env!("CARGO_PKG_VERSION")) .build(), From 8663e3c156db48af5c167263cf1d2340789d4e97 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 11 Feb 2025 19:55:04 +0800 Subject: [PATCH 3/4] exclude default-features Signed-off-by: tison --- fastrace-opentelemetry/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastrace-opentelemetry/Cargo.toml b/fastrace-opentelemetry/Cargo.toml index 2542767..3ffd0d8 100644 --- a/fastrace-opentelemetry/Cargo.toml +++ b/fastrace-opentelemetry/Cargo.toml @@ -16,8 +16,8 @@ rust-version.workspace = true [dependencies] fastrace = { workspace = true } log = { workspace = true } -opentelemetry = { version = "0.28", features = ["trace"] } -opentelemetry_sdk = { version = "0.28", features = ["trace"] } +opentelemetry = { version = "0.28", default-features = false, features = ["trace"] } +opentelemetry_sdk = { version = "0.28", default-features = false, features = ["trace"] } pollster = { version = "0.4.0" } [dev-dependencies] From 36716200365de8e1dcb2682ebba7331cd104ac5c Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 11 Feb 2025 20:03:15 +0800 Subject: [PATCH 4/4] fixup Signed-off-by: tison --- fastrace-opentelemetry/README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fastrace-opentelemetry/README.md b/fastrace-opentelemetry/README.md index 3e0d2a1..0356c69 100644 --- a/fastrace-opentelemetry/README.md +++ b/fastrace-opentelemetry/README.md @@ -11,7 +11,7 @@ ```toml [dependencies] fastrace = "0.7" -fastrace-opentelemetry = "0.7" +fastrace-opentelemetry = "0.9" ``` ## Setup OpenTelemetry Collector @@ -62,7 +62,11 @@ let reporter = OpenTelemetryReporter::new( .build() .expect("initialize oltp exporter"), SpanKind::Server, - Cow::Owned(Resource::new([KeyValue::new("service.name", "asynchronous")])), + Cow::Owned( + Resource::builder() + .with_attributes([KeyValue::new("service.name", "asynchronous")]) + .build() + ), InstrumentationScope::builder("example-crate").with_version(env!("CARGO_PKG_VERSION")).build(), ); fastrace::set_reporter(reporter, Config::default());