From 6ff2149d689eb13889383616e2d466dfafaf4dc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 19:19:51 +0000 Subject: [PATCH 1/4] Update opentelemetry_sdk requirement from 0.26 to 0.27 Updates the requirements on [opentelemetry_sdk](https://github.com/open-telemetry/opentelemetry-rust) to permit the latest version. - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry_sdk-0.26.0...opentelemetry_sdk-0.27.1) --- updated-dependencies: - dependency-name: opentelemetry_sdk dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1a396272..c0a14130 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ clap = { version = "4.5.21", features = ["derive", "cargo", "env"] } sysinfo = "0.27" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } opentelemetry = "0.26" -opentelemetry_sdk = "0.26" +opentelemetry_sdk = "0.27" tracing-opentelemetry = "0.27" uuid = { version = "1.2", features = ["v4"] } chrono = "0.4" From 5c333633a2fefc0a4adb9222022f2733132ab4ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 19:20:10 +0000 Subject: [PATCH 2/4] Update opentelemetry requirement from 0.26 to 0.27 Updates the requirements on [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust) to permit the latest version. - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry-0.26.0...opentelemetry-0.27.1) --- updated-dependencies: - dependency-name: opentelemetry dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c0a14130..fc524f12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ tracing = "0.1.40" clap = { version = "4.5.21", features = ["derive", "cargo", "env"] } sysinfo = "0.27" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } -opentelemetry = "0.26" +opentelemetry = "0.27" opentelemetry_sdk = "0.27" tracing-opentelemetry = "0.27" uuid = { version = "1.2", features = ["v4"] } From 3318eb76103c0ae565442a40a1232551af4fadca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 19:20:05 +0000 Subject: [PATCH 3/4] Update tracing-opentelemetry requirement from 0.27 to 0.28 Updates the requirements on [tracing-opentelemetry](https://github.com/tokio-rs/tracing-opentelemetry) to permit the latest version. - [Release notes](https://github.com/tokio-rs/tracing-opentelemetry/releases) - [Changelog](https://github.com/tokio-rs/tracing-opentelemetry/blob/v0.1.x/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/tracing-opentelemetry/compare/v0.27.0...v0.28.0) --- updated-dependencies: - dependency-name: tracing-opentelemetry dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index fc524f12..75c05192 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ sysinfo = "0.27" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } opentelemetry = "0.27" opentelemetry_sdk = "0.27" -tracing-opentelemetry = "0.27" +tracing-opentelemetry = "0.28" uuid = { version = "1.2", features = ["v4"] } chrono = "0.4" From cf8feba0c4670bd5deb03bfb0fdd958522013722 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 4 Feb 2025 14:54:38 +0100 Subject: [PATCH 4/4] Do not use with_config for opentelemetry 0.27 As opentelemetry 0.27 or newer does not have a method `with_config` for TraceBuilder, it is necessary to call `with_sampler` directly from TraceBuilder without `with_config`. Needed to fix build issues with opentelemetry(_sdk) 0.27 or newer as well as tracing_opentelemetry 0.28 or newer. See also https://github.com/open-telemetry/opentelemetry-rust/pull/2303. --- src/logging.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/logging.rs b/src/logging.rs index 73c1e126..8e5b9754 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -3,7 +3,7 @@ use opentelemetry::{global, trace::TracerProvider}; use opentelemetry_sdk::trace::{ - self as sdktrace, Config, Sampler, TracerProvider as SdkTracerProvider, + self as sdktrace, Sampler, TracerProvider as SdkTracerProvider, }; use tracing::{event, Level}; use tracing_opentelemetry::OpenTelemetryLayer; @@ -15,9 +15,9 @@ use tracing_subscriber::{ use crate::kvp::EmitKVPLayer; pub fn initialize_tracing() -> sdktrace::Tracer { - let config = Config::default().with_sampler(Sampler::AlwaysOn); - - let provider = SdkTracerProvider::builder().with_config(config).build(); + let provider = SdkTracerProvider::builder() + .with_sampler(Sampler::AlwaysOn) + .build(); global::set_tracer_provider(provider.clone()); provider.tracer("azure-kvp")