Update opentelemtry dependencies for version bump

mobilecoinfoundation · Nov 7, 2023 · 816f079 · 816f079
1 parent deaa135
commit 816f079
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/util/telemetry/Cargo.toml b/util/telemetry/Cargo.toml
@@ -18,4 +18,5 @@ cfg-if = "1.0"
 displaydoc = "0.2"
 hostname = "0.3.1"
 opentelemetry = "0.21.0"
-opentelemetry-jaeger = { version = "0.19.0", features = ["reqwest_rustls_collector_client"], optional = true }
+opentelemetry-jaeger = { version = "0.20.0", features = ["reqwest_rustls_collector_client"], optional = true }
+opentelemetry_sdk = "0.21.0"
diff --git a/util/telemetry/src/jaeger.rs b/util/telemetry/src/jaeger.rs
@@ -1,5 +1,6 @@
 use displaydoc::Display;
-use opentelemetry::{sdk, trace::TraceError, KeyValue};
+use opentelemetry::{trace::TraceError, KeyValue};
+use opentelemetry_sdk::{trace, Resource};
 
 #[derive(Debug, Display)]
 pub enum Error {
@@ -15,7 +16,7 @@ pub enum Error {
 
 /// Set up a default tracer with no additional tags.
 /// Telemetry is enabled iff env.MC_TELEMETRY is set to "1" or "true".
-pub fn setup_default_tracer(service_name: &str) -> Result<Option<sdk::trace::Tracer>, Error> {
+pub fn setup_default_tracer(service_name: &str) -> Result<Option<trace::Tracer>, Error> {
     setup_default_tracer_with_tags(service_name, &[])
 }
 
@@ -24,7 +25,7 @@ pub fn setup_default_tracer(service_name: &str) -> Result<Option<sdk::trace::Tra
 pub fn setup_default_tracer_with_tags(
     service_name: &str,
     extra_tags: &[(&'static str, String)],
-) -> Result<Option<sdk::trace::Tracer>, Error> {
+) -> Result<Option<trace::Tracer>, Error> {
     let telemetry_enabled = std::env::var("MC_TELEMETRY")
         .map(|val| val == "1" || val.to_lowercase() == "true")
         .unwrap_or(false);
@@ -47,7 +48,7 @@ pub fn setup_default_tracer_with_tags(
 
     opentelemetry_jaeger::new_agent_pipeline()
         .with_service_name(service_name)
-        .with_trace_config(sdk::trace::Config::default().with_resource(sdk::Resource::new(tags)))
+        .with_trace_config(trace::Config::default().with_resource(Resource::new(tags)))
         .install_simple()
         .map_err(Error::Trace)
         .map(Some)