From 64aa5061b8c621b15f9e16112cb3c6f4c8f77af2 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Thu, 13 Jun 2024 11:21:33 -0700 Subject: [PATCH 1/2] fix msrv (#1877) --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5f16c4957d..7864f2b31e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,4 +45,4 @@ tokio-stream = "0.1.1" tracing = { version = "0.1", default-features = false } tracing-core = { version = "0.1", default-features = false } tracing-subscriber = { version = "0.3", default-features = false } -url = { version = "2.2", default-features = false } +url = { version = "=2.5.0", default-features = false } #pinning the version supporting rustc 1.65 From 66e3ea5335e883b0f9d8fb8659a01d55d37ff433 Mon Sep 17 00:00:00 2001 From: Mark Ingram Date: Thu, 13 Jun 2024 21:02:26 +0100 Subject: [PATCH 2/2] [opentelemetry-otlp] basic-otlp-http example - trivial cleanup (#1878) Co-authored-by: Cijo Thomas --- opentelemetry-otlp/examples/basic-otlp-http/src/main.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/opentelemetry-otlp/examples/basic-otlp-http/src/main.rs b/opentelemetry-otlp/examples/basic-otlp-http/src/main.rs index 205ac0362a..4e73537ce8 100644 --- a/opentelemetry-otlp/examples/basic-otlp-http/src/main.rs +++ b/opentelemetry-otlp/examples/basic-otlp-http/src/main.rs @@ -50,7 +50,7 @@ fn init_tracer_provider() -> Result { } fn init_metrics() -> Result { - let provider = opentelemetry_otlp::new_pipeline() + opentelemetry_otlp::new_pipeline() .metrics(opentelemetry_sdk::runtime::Tokio) .with_exporter( opentelemetry_otlp::new_exporter() @@ -58,11 +58,7 @@ fn init_metrics() -> Result Ok(provider), - Err(err) => Err(err), - } + .build() } #[tokio::main] @@ -85,6 +81,7 @@ async fn main() -> Result<(), Box> { ); let meter_provider = result.unwrap(); + global::set_meter_provider(meter_provider.clone()); // Opentelemetry will not provide a global API to manage the logger // provider. Application users must manage the lifecycle of the logger