From 877a4ccf4167ce342d3bb7d3de370134df740554 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 01:29:06 +0000 Subject: [PATCH 1/3] fix(deps): update opentelemetry-rust monorepo to 0.27.0 --- Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4c2b877..78712e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,10 +9,10 @@ repository = "https://github.com/philipcristiano/rust_service_conventions" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -opentelemetry = { version = "0.26.0", optional = true } -opentelemetry-otlp = { version = "0.26.0", features = ["trace", "grpc-tonic", "http-proto", "reqwest-rustls", "tls", "tls-roots"], optional = true } -opentelemetry-semantic-conventions = { version = "0.26.0", optional = true} -opentelemetry_sdk = { version = "0.26.0", features = ["rt-tokio"], optional = true } +opentelemetry = { version = "0.27.0", optional = true } +opentelemetry-otlp = { version = "0.27.0", features = ["trace", "grpc-tonic", "http-proto", "reqwest-rustls", "tls", "tls-roots"], optional = true } +opentelemetry-semantic-conventions = { version = "0.27.0", optional = true} +opentelemetry_sdk = { version = "0.27.0", features = ["rt-tokio"], optional = true } tonic = { version = "0.12.0", features = ["tls", "tls-roots"], optional = true} tracing-subscriber = { version = "0.3.18", features = ["fmt", "json", "env-filter", "std", "registry"], optional = true } From 1968f1b097f4ce1a4695de7e041bcbde3bedde6f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 01:29:10 +0000 Subject: [PATCH 2/3] fix(deps): update rust crate tracing-opentelemetry to 0.28.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4c2b877..a016be1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ tonic = { version = "0.12.0", features = ["tls", "tls-roots"], optional = true} tracing-subscriber = { version = "0.3.18", features = ["fmt", "json", "env-filter", "std", "registry"], optional = true } tracing = { version = "0.1.40", optional = true} -tracing-opentelemetry = { version = "0.27.0", optional = true} +tracing-opentelemetry = { version = "0.28.0", optional = true} anyhow = {version = "1.0.82", optional = true} once_cell = { version = "1.19.0", optional = true} From b9319a4303303b9a4808acdb5e103104235f4a2f Mon Sep 17 00:00:00 2001 From: Philip Cristiano Date: Sun, 1 Dec 2024 18:25:46 -0500 Subject: [PATCH 3/3] fix: otel 0.27 tls_config setting https://github.com/open-telemetry/opentelemetry-rust/pull/2221 Need a trait to access this now So import it --- src/tracing.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tracing.rs b/src/tracing.rs index 5ac7a4a..c24aeca 100644 --- a/src/tracing.rs +++ b/src/tracing.rs @@ -6,6 +6,8 @@ use tracing_subscriber::registry; use opentelemetry_sdk::trace::Tracer; use tracing_opentelemetry::OpenTelemetryLayer; +use opentelemetry_otlp::TonicExporterBuilder; +use opentelemetry_otlp::WithTonicConfig; use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt; pub fn setup(level: Level) { @@ -30,13 +32,13 @@ pub fn setup(level: Level) { // Construct Tracer for OpenTelemetryLayer fn init_tracer() -> Tracer { use opentelemetry::trace::TracerProvider as _; - use opentelemetry_otlp::TonicExporterBuilder; use opentelemetry_sdk::trace::TracerProvider; let tls_config = tonic::transport::ClientTlsConfig::new().with_native_roots(); - let exporter = TonicExporterBuilder::default() + let exporter = opentelemetry_otlp::SpanExporter::builder() + .with_tonic() .with_tls_config(tls_config) - .build_span_exporter() - .expect("Init"); + .build() + .expect("Init Exporter"); let provider = TracerProvider::builder() .with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio) .build();