Skip to content

Commit

Permalink
Fix some deprecated api calls and clippy reports (#74)
Browse files Browse the repository at this point in the history
  • Loading branch information
funArash committed May 25, 2024
1 parent 6457627 commit 086961e
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 29 deletions.
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ members = [
]
exclude = [
"opentelemetry-dynatrace",
"opentelemetry-datadog",
"opentelemetry-zpages"
]
resolver = "2"

Expand Down
1 change: 1 addition & 0 deletions opentelemetry-datadog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ rustdoc-args = ["--cfg", "docsrs"]
agent-sampling = []
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest"]
reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]
surf-client = ["dep:surf"]

[dependencies]
indexmap = "2.0"
Expand Down
8 changes: 2 additions & 6 deletions opentelemetry-datadog/benches/datadog_exporter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ fn get_span(trace_id: u128, parent_span_id: u64, span_id: u64, rng: &mut ThreadR
let events = SpanEvents::default();
let links = SpanLinks::default();
let resource = Resource::new(vec![KeyValue::new("host.name", "test")]);
let instrumentation_lib = InstrumentationLibrary::builder("component").build();

SpanData {
span_context,
Expand All @@ -169,12 +170,7 @@ fn get_span(trace_id: u128, parent_span_id: u64, span_id: u64, rng: &mut ThreadR
links,
status: Status::Ok,
resource: Cow::Owned(resource),
instrumentation_lib: InstrumentationLibrary::new(
"component",
None::<&'static str>,
None::<&'static str>,
None,
),
instrumentation_lib,
}
}

Expand Down
44 changes: 32 additions & 12 deletions opentelemetry-datadog/src/exporter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -287,13 +287,14 @@ impl DatadogPipelineBuilder {
let mut provider_builder = TracerProvider::builder().with_simple_exporter(exporter);
provider_builder = provider_builder.with_config(config);
let provider = provider_builder.build();
let tracer = opentelemetry::trace::TracerProvider::versioned_tracer(
let tracer = opentelemetry::trace::TracerProvider::tracer_builder(
&provider,
"opentelemetry-datadog",
Some(env!("CARGO_PKG_VERSION")),
Some(semcov::SCHEMA_URL),
None,
);
"opentelemyietry-datadog",
)
.with_version(env!("CARGO_PKG_VERSION"))
.with_schema_url(semcov::SCHEMA_URL)
.with_attributes(None)
.build();
let _ = global::set_tracer_provider(provider);
Ok(tracer)
}
Expand All @@ -306,13 +307,14 @@ impl DatadogPipelineBuilder {
let mut provider_builder = TracerProvider::builder().with_batch_exporter(exporter, runtime);
provider_builder = provider_builder.with_config(config);
let provider = provider_builder.build();
let tracer = opentelemetry::trace::TracerProvider::versioned_tracer(
let tracer = opentelemetry::trace::TracerProvider::tracer_builder(
&provider,
"opentelemetry-datadog",
Some(env!("CARGO_PKG_VERSION")),
Some(semcov::SCHEMA_URL),
None,
);
"opentelemyietry-datadog",
)
.with_version(env!("CARGO_PKG_VERSION"))
.with_schema_url(semcov::SCHEMA_URL)
.with_attributes(None)
.build();
let _ = global::set_tracer_provider(provider);
Ok(tracer)
}
Expand Down Expand Up @@ -511,4 +513,22 @@ mod tests {
.build_exporter()
.unwrap();
}

#[test]
fn test_install_simple() {
new_pipeline()
.with_service_name("test_service")
.with_http_client(DummyClient)
.install_simple()
.unwrap();
}

#[test]
fn test_install_batch() {
new_pipeline()
.with_service_name("test_service")
.with_http_client(DummyClient)
.install_batch(opentelemetry_sdk::runtime::AsyncStd {})
.unwrap();
}
}
8 changes: 2 additions & 6 deletions opentelemetry-datadog/src/exporter/model/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ pub(crate) mod tests {
let events = SpanEvents::default();
let links = SpanLinks::default();
let resource = Resource::new(vec![KeyValue::new("host.name", "test")]);
let instrumentation_lib = InstrumentationLibrary::builder("component").build();

trace::SpanData {
span_context,
Expand All @@ -238,12 +239,7 @@ pub(crate) mod tests {
links,
status: Status::Ok,
resource: Cow::Owned(resource),
instrumentation_lib: InstrumentationLibrary::new(
"component",
None::<&'static str>,
None::<&'static str>,
None,
),
instrumentation_lib,
}
}

Expand Down
1 change: 1 addition & 0 deletions opentelemetry-datadog/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ mod propagator {
value == TRACE_STATE_TRUE_VALUE
}

#[allow(clippy::needless_update)]
impl DatadogTraceStateBuilder {
#[cfg(feature = "agent-sampling")]
pub fn with_priority_sampling(self, enabled: bool) -> Self {
Expand Down
3 changes: 3 additions & 0 deletions opentelemetry-zpages/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ rust-version = "1.65"
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[features]
with-serde = []

[dependencies]
opentelemetry = { workspace = true }
opentelemetry_sdk = { workspace = true, default-features = false, features = ["trace"] }
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-zpages/src/trace/aggregator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ mod tests {
assert_ne!(aggregator.summaries.len(), 0);
let summary = aggregator
.summaries
.get::<String>(&"test-service".to_string())
.get::<String>(&"test-service".into())
.unwrap();

assert_span_queue(
Expand Down
2 changes: 0 additions & 2 deletions opentelemetry-zpages/src/trace/span_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

use opentelemetry::trace::SpanContext;
use opentelemetry_sdk::export::trace::SpanData;
#[cfg(feature = "serialize")]
use serde::{Deserialize, Serialize};
use std::collections::HashMap;

/// This queue maintains an ordered list of elements, Elements are
Expand Down

0 comments on commit 086961e

Please sign in to comment.