diff --git a/opentelemetry-contrib/benches/new_span.rs b/opentelemetry-contrib/benches/new_span.rs index d8a20e293..6b1e2ec5f 100644 --- a/opentelemetry-contrib/benches/new_span.rs +++ b/opentelemetry-contrib/benches/new_span.rs @@ -13,7 +13,7 @@ use opentelemetry_contrib::trace::{ }; use opentelemetry_sdk::{ export::trace::{ExportResult, SpanData, SpanExporter}, - trace::{Config, Sampler, TracerProvider}, + trace::{Sampler, TracerProvider}, }; #[cfg(not(target_os = "windows"))] use pprof::criterion::{Output, PProfProfiler}; @@ -152,7 +152,7 @@ impl Display for Environment { fn parent_sampled_tracer(inner_sampler: Sampler) -> (TracerProvider, BoxedTracer) { let provider = TracerProvider::builder() - .with_config(Config::default().with_sampler(Sampler::ParentBased(Box::new(inner_sampler)))) + .with_sampler(Sampler::ParentBased(Box::new(inner_sampler))) .with_simple_exporter(NoopExporter) .build(); let tracer = provider.tracer(module_path!()); diff --git a/opentelemetry-contrib/src/trace/context.rs b/opentelemetry-contrib/src/trace/context.rs index f196f559b..bddae8844 100644 --- a/opentelemetry-contrib/src/trace/context.rs +++ b/opentelemetry-contrib/src/trace/context.rs @@ -91,7 +91,6 @@ pub fn new_span_if_recording( /// ``` /// use opentelemetry::trace::{SpanBuilder, TraceContextExt as _}; /// use opentelemetry_contrib::trace::{new_span_if_parent_sampled, Contextualized, TracerSource}; - /// enum Message{Command}; /// let (tx, rx) = std::sync::mpsc::channel(); /// diff --git a/opentelemetry-contrib/src/trace/tracer_source.rs b/opentelemetry-contrib/src/trace/tracer_source.rs index fdef67a13..8b89c35ba 100644 --- a/opentelemetry-contrib/src/trace/tracer_source.rs +++ b/opentelemetry-contrib/src/trace/tracer_source.rs @@ -47,7 +47,7 @@ impl<'a> TracerSource<'a> { } } -impl<'a> Debug for Variant<'a> { +impl Debug for Variant<'_> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { use Variant::*; match self { diff --git a/opentelemetry-datadog/examples/agent_sampling.rs b/opentelemetry-datadog/examples/agent_sampling.rs index d86de67a4..65b9fac9f 100644 --- a/opentelemetry-datadog/examples/agent_sampling.rs +++ b/opentelemetry-datadog/examples/agent_sampling.rs @@ -56,6 +56,7 @@ impl ShouldSample for AgentBasedSampler { } fn main() -> Result<(), Box> { + #[allow(deprecated)] let tracer = new_pipeline() .with_service_name("agent-sampling-demo") .with_api_version(ApiVersion::Version05) diff --git a/opentelemetry-datadog/src/exporter/intern.rs b/opentelemetry-datadog/src/exporter/intern.rs index 61defaa62..772cf21d4 100644 --- a/opentelemetry-datadog/src/exporter/intern.rs +++ b/opentelemetry-datadog/src/exporter/intern.rs @@ -18,7 +18,7 @@ pub(crate) enum InternValue<'a> { OpenTelemetryValue(&'a Value), } -impl<'a> Hash for InternValue<'a> { +impl Hash for InternValue<'_> { fn hash(&self, state: &mut H) { match &self { InternValue::RegularString(s) => s.hash(state), @@ -44,7 +44,7 @@ impl<'a> Hash for InternValue<'a> { } } -impl<'a> Eq for InternValue<'a> {} +impl Eq for InternValue<'_> {} const BOOLEAN_TRUE: &str = "true"; const BOOLEAN_FALSE: &str = "false"; @@ -84,7 +84,7 @@ impl WriteAsLiteral for StringValue { } } -impl<'a> InternValue<'a> { +impl InternValue<'_> { pub(crate) fn write_as_str( &self, payload: &mut W, diff --git a/opentelemetry-datadog/src/exporter/mod.rs b/opentelemetry-datadog/src/exporter/mod.rs index 7e490c7a8..f6efb4bfe 100644 --- a/opentelemetry-datadog/src/exporter/mod.rs +++ b/opentelemetry-datadog/src/exporter/mod.rs @@ -287,7 +287,7 @@ impl DatadogPipelineBuilder { let (config, service_name) = self.build_config_and_service_name(); let exporter = self.build_exporter_with_service_name(service_name)?; let mut provider_builder = TracerProvider::builder().with_simple_exporter(exporter); - provider_builder = provider_builder.with_config(config); + provider_builder = provider_builder.with_resource(config.resource.into_owned()); let provider = provider_builder.build(); let scope = InstrumentationScope::builder("opentelemetry-datadog") .with_version(env!("CARGO_PKG_VERSION")) @@ -305,7 +305,7 @@ impl DatadogPipelineBuilder { let (config, service_name) = self.build_config_and_service_name(); let exporter = self.build_exporter_with_service_name(service_name)?; let mut provider_builder = TracerProvider::builder().with_batch_exporter(exporter, runtime); - provider_builder = provider_builder.with_config(config); + provider_builder = provider_builder.with_resource(config.resource.into_owned()); let provider = provider_builder.build(); let scope = InstrumentationScope::builder("opentelemetry-datadog") .with_version(env!("CARGO_PKG_VERSION")) diff --git a/opentelemetry-datadog/src/exporter/model/unified_tags.rs b/opentelemetry-datadog/src/exporter/model/unified_tags.rs index e4e835c55..49bd446b4 100644 --- a/opentelemetry-datadog/src/exporter/model/unified_tags.rs +++ b/opentelemetry-datadog/src/exporter/model/unified_tags.rs @@ -1,5 +1,4 @@ /// Unified tags - See: https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging - pub struct UnifiedTags { pub service: UnifiedTagField, pub env: UnifiedTagField,