From 09d9418889d55abf73d2abcf4af59a864521e7f9 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 23 Jul 2024 12:05:14 -0700 Subject: [PATCH 1/2] fix ci --- Cargo.toml | 2 +- opentelemetry-sdk/src/trace/sampler/jaeger_remote/mod.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4ae28e5821..812497f61a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ temp-env = "0.3.6" thiserror = { version = "1", default-features = false } tonic = { version = "0.12", default-features = false } tonic-build = "0.12" -tokio = { version = "1", default-features = false } +tokio = { version = "1.38.0", default-features = false } #1.39 needs msrv bump to rustc 1.70 tokio-stream = "0.1.1" tracing = { version = "0.1", default-features = false } tracing-core = { version = "0.1", default-features = false } diff --git a/opentelemetry-sdk/src/trace/sampler/jaeger_remote/mod.rs b/opentelemetry-sdk/src/trace/sampler/jaeger_remote/mod.rs index 619fd40b08..5ee09940ea 100644 --- a/opentelemetry-sdk/src/trace/sampler/jaeger_remote/mod.rs +++ b/opentelemetry-sdk/src/trace/sampler/jaeger_remote/mod.rs @@ -1,4 +1,5 @@ mod rate_limit; +#[allow(dead_code)] mod remote; mod sampler; mod sampling_strategy; From 9cd042aa5c3b3e3b85f725b80f7a0e317d9fe929 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Tue, 23 Jul 2024 12:13:50 -0700 Subject: [PATCH 2/2] update version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 812497f61a..eb33ddfe42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ temp-env = "0.3.6" thiserror = { version = "1", default-features = false } tonic = { version = "0.12", default-features = false } tonic-build = "0.12" -tokio = { version = "1.38.0", default-features = false } #1.39 needs msrv bump to rustc 1.70 +tokio = { version = "~1.38.0", default-features = false } #1.39 needs msrv bump to rustc 1.70 tokio-stream = "0.1.1" tracing = { version = "0.1", default-features = false } tracing-core = { version = "0.1", default-features = false }