Skip to content

Commit 7e1c53a

Browse files
authored
Fix CI lint errors from new stable toolchain v1.83 (#136)
1 parent 0c3771a commit 7e1c53a

File tree

7 files changed

+9
-10
lines changed

7 files changed

+9
-10
lines changed

opentelemetry-contrib/benches/new_span.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use opentelemetry_contrib::trace::{
1313
};
1414
use opentelemetry_sdk::{
1515
export::trace::{ExportResult, SpanData, SpanExporter},
16-
trace::{Config, Sampler, TracerProvider},
16+
trace::{Sampler, TracerProvider},
1717
};
1818
#[cfg(not(target_os = "windows"))]
1919
use pprof::criterion::{Output, PProfProfiler};
@@ -152,7 +152,7 @@ impl Display for Environment {
152152

153153
fn parent_sampled_tracer(inner_sampler: Sampler) -> (TracerProvider, BoxedTracer) {
154154
let provider = TracerProvider::builder()
155-
.with_config(Config::default().with_sampler(Sampler::ParentBased(Box::new(inner_sampler))))
155+
.with_sampler(Sampler::ParentBased(Box::new(inner_sampler)))
156156
.with_simple_exporter(NoopExporter)
157157
.build();
158158
let tracer = provider.tracer(module_path!());

opentelemetry-contrib/src/trace/context.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ pub fn new_span_if_recording(
9191
/// ```
9292
/// use opentelemetry::trace::{SpanBuilder, TraceContextExt as _};
9393
/// use opentelemetry_contrib::trace::{new_span_if_parent_sampled, Contextualized, TracerSource};
94-
9594
/// enum Message{Command};
9695
/// let (tx, rx) = std::sync::mpsc::channel();
9796
///

opentelemetry-contrib/src/trace/tracer_source.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ impl<'a> TracerSource<'a> {
4747
}
4848
}
4949

50-
impl<'a> Debug for Variant<'a> {
50+
impl Debug for Variant<'_> {
5151
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
5252
use Variant::*;
5353
match self {

opentelemetry-datadog/examples/agent_sampling.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ impl ShouldSample for AgentBasedSampler {
5656
}
5757

5858
fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
59+
#[allow(deprecated)]
5960
let tracer = new_pipeline()
6061
.with_service_name("agent-sampling-demo")
6162
.with_api_version(ApiVersion::Version05)

opentelemetry-datadog/src/exporter/intern.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub(crate) enum InternValue<'a> {
1818
OpenTelemetryValue(&'a Value),
1919
}
2020

21-
impl<'a> Hash for InternValue<'a> {
21+
impl Hash for InternValue<'_> {
2222
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
2323
match &self {
2424
InternValue::RegularString(s) => s.hash(state),
@@ -44,7 +44,7 @@ impl<'a> Hash for InternValue<'a> {
4444
}
4545
}
4646

47-
impl<'a> Eq for InternValue<'a> {}
47+
impl Eq for InternValue<'_> {}
4848

4949
const BOOLEAN_TRUE: &str = "true";
5050
const BOOLEAN_FALSE: &str = "false";
@@ -84,7 +84,7 @@ impl WriteAsLiteral for StringValue {
8484
}
8585
}
8686

87-
impl<'a> InternValue<'a> {
87+
impl InternValue<'_> {
8888
pub(crate) fn write_as_str<W: RmpWrite>(
8989
&self,
9090
payload: &mut W,

opentelemetry-datadog/src/exporter/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ impl DatadogPipelineBuilder {
287287
let (config, service_name) = self.build_config_and_service_name();
288288
let exporter = self.build_exporter_with_service_name(service_name)?;
289289
let mut provider_builder = TracerProvider::builder().with_simple_exporter(exporter);
290-
provider_builder = provider_builder.with_config(config);
290+
provider_builder = provider_builder.with_resource(config.resource.into_owned());
291291
let provider = provider_builder.build();
292292
let scope = InstrumentationScope::builder("opentelemetry-datadog")
293293
.with_version(env!("CARGO_PKG_VERSION"))
@@ -305,7 +305,7 @@ impl DatadogPipelineBuilder {
305305
let (config, service_name) = self.build_config_and_service_name();
306306
let exporter = self.build_exporter_with_service_name(service_name)?;
307307
let mut provider_builder = TracerProvider::builder().with_batch_exporter(exporter, runtime);
308-
provider_builder = provider_builder.with_config(config);
308+
provider_builder = provider_builder.with_resource(config.resource.into_owned());
309309
let provider = provider_builder.build();
310310
let scope = InstrumentationScope::builder("opentelemetry-datadog")
311311
.with_version(env!("CARGO_PKG_VERSION"))

opentelemetry-datadog/src/exporter/model/unified_tags.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// Unified tags - See: https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging
2-
32
pub struct UnifiedTags {
43
pub service: UnifiedTagField,
54
pub env: UnifiedTagField,

0 commit comments

Comments
 (0)