diff --git a/Cargo.toml b/Cargo.toml index 3f8d68e3..285391ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,10 +12,10 @@ resolver = "2" debug = 1 [workspace.dependencies] -opentelemetry = "0.25" -opentelemetry-appender-tracing = "0.25" -opentelemetry-http = "0.25" -opentelemetry-proto = { version = "0.25", default-features = false } -opentelemetry_sdk = { version = "0.25", default-features = false } -opentelemetry-stdout = "0.25" -opentelemetry-semantic-conventions = "0.25" +opentelemetry = "0.26" +opentelemetry-appender-tracing = "0.26" +opentelemetry-http = "0.26" +opentelemetry-proto = { version = "0.26", default-features = false } +opentelemetry_sdk = { version = "0.26", default-features = false } +opentelemetry-stdout = "0.26" +opentelemetry-semantic-conventions = { version = "0.26", features = ["semconv_experimental"] } diff --git a/opentelemetry-etw-logs/src/logs/exporter.rs b/opentelemetry-etw-logs/src/logs/exporter.rs index e07fbd20..2c203f14 100644 --- a/opentelemetry-etw-logs/src/logs/exporter.rs +++ b/opentelemetry-etw-logs/src/logs/exporter.rs @@ -283,7 +283,7 @@ impl ETWExporter { event: &mut tld::EventBuilder, log_record: &'a opentelemetry_sdk::logs::LogRecord, field_tag: u32, - ) -> (Option, Option<&str>) { + ) -> (Option, Option<&'a str>) { //populate CS PartC let mut event_id: Option = None; let mut event_name: Option<&str> = None; diff --git a/opentelemetry-resource-detectors/src/host.rs b/opentelemetry-resource-detectors/src/host.rs index f595c954..64aeff36 100644 --- a/opentelemetry-resource-detectors/src/host.rs +++ b/opentelemetry-resource-detectors/src/host.rs @@ -30,13 +30,13 @@ impl ResourceDetector for HostResourceDetector { // Get host.id (self.host_id_detect)().map(|host_id| { KeyValue::new( - opentelemetry_semantic_conventions::resource::HOST_ID, + opentelemetry_semantic_conventions::attribute::HOST_ID, host_id, ) }), // Get host.arch Some(KeyValue::new( - opentelemetry_semantic_conventions::resource::HOST_ARCH, + opentelemetry_semantic_conventions::attribute::HOST_ARCH, ARCH, )), ] @@ -99,12 +99,12 @@ mod tests { assert_eq!(resource.len(), 2); assert!(resource .get(Key::from_static_str( - opentelemetry_semantic_conventions::resource::HOST_ID + opentelemetry_semantic_conventions::attribute::HOST_ID )) .is_some()); assert!(resource .get(Key::from_static_str( - opentelemetry_semantic_conventions::resource::HOST_ARCH + opentelemetry_semantic_conventions::attribute::HOST_ARCH )) .is_some()) } @@ -117,12 +117,12 @@ mod tests { assert_eq!(resource.len(), 2); assert!(resource .get(Key::from_static_str( - opentelemetry_semantic_conventions::resource::HOST_ID + opentelemetry_semantic_conventions::attribute::HOST_ID )) .is_some()); assert!(resource .get(Key::from_static_str( - opentelemetry_semantic_conventions::resource::HOST_ARCH + opentelemetry_semantic_conventions::attribute::HOST_ARCH )) .is_some()) } @@ -133,14 +133,14 @@ mod tests { assert!(resource .get(Key::from_static_str( - opentelemetry_semantic_conventions::resource::HOST_ARCH + opentelemetry_semantic_conventions::attribute::HOST_ARCH )) .is_some()); #[cfg(target_arch = "x86_64")] assert_eq!( resource.get(Key::from_static_str( - opentelemetry_semantic_conventions::resource::HOST_ARCH + opentelemetry_semantic_conventions::attribute::HOST_ARCH )), Some(Value::from("x86_64")) ); @@ -148,7 +148,7 @@ mod tests { #[cfg(target_arch = "aarch64")] assert_eq!( resource.get(Key::from_static_str( - opentelemetry_semantic_conventions::resource::HOST_ARCH + opentelemetry_semantic_conventions::attribute::HOST_ARCH )), Some(Value::from("aarch64")) ) diff --git a/opentelemetry-resource-detectors/src/os.rs b/opentelemetry-resource-detectors/src/os.rs index d405c0a9..7dc37b69 100644 --- a/opentelemetry-resource-detectors/src/os.rs +++ b/opentelemetry-resource-detectors/src/os.rs @@ -19,7 +19,7 @@ pub struct OsResourceDetector; impl ResourceDetector for OsResourceDetector { fn detect(&self, _timeout: Duration) -> Resource { Resource::new(vec![KeyValue::new( - opentelemetry_semantic_conventions::resource::OS_TYPE, + opentelemetry_semantic_conventions::attribute::OS_TYPE, OS, )]) } @@ -39,7 +39,7 @@ mod tests { assert_eq!(resource.len(), 1); assert_eq!( resource.get(Key::from_static_str( - opentelemetry_semantic_conventions::resource::OS_TYPE + opentelemetry_semantic_conventions::attribute::OS_TYPE )), Some(Value::from("linux")) ) diff --git a/opentelemetry-resource-detectors/src/process.rs b/opentelemetry-resource-detectors/src/process.rs index 496ba403..cafd8e24 100644 --- a/opentelemetry-resource-detectors/src/process.rs +++ b/opentelemetry-resource-detectors/src/process.rs @@ -27,11 +27,11 @@ impl ResourceDetector for ProcessResourceDetector { .collect::>(); Resource::new(vec![ KeyValue::new( - opentelemetry_semantic_conventions::resource::PROCESS_COMMAND_ARGS, + opentelemetry_semantic_conventions::attribute::PROCESS_COMMAND_ARGS, Value::Array(cmd_arg_val.into()), ), KeyValue::new( - opentelemetry_semantic_conventions::resource::PROCESS_PID, + opentelemetry_semantic_conventions::attribute::PROCESS_PID, id() as i64, ), ]) diff --git a/opentelemetry-user-events-metrics/src/exporter/mod.rs b/opentelemetry-user-events-metrics/src/exporter/mod.rs index 75d5828a..72bc9304 100644 --- a/opentelemetry-user-events-metrics/src/exporter/mod.rs +++ b/opentelemetry-user-events-metrics/src/exporter/mod.rs @@ -4,8 +4,8 @@ use opentelemetry_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequ use opentelemetry_sdk::metrics::{ data::{ResourceMetrics, Temporality}, exporter::PushMetricsExporter, - reader::{AggregationSelector, DefaultAggregationSelector, TemporalitySelector}, - Aggregation, InstrumentKind, + reader::TemporalitySelector, + InstrumentKind, }; use crate::tracepoint; @@ -52,14 +52,6 @@ impl TemporalitySelector for MetricsExporter { } } -impl AggregationSelector for MetricsExporter { - // TODO: this should ideally be done at SDK level by default - // without exporters having to do it. - fn aggregation(&self, kind: InstrumentKind) -> Aggregation { - DefaultAggregationSelector::new().aggregation(kind) - } -} - impl Debug for MetricsExporter { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { f.write_str("user_events metrics exporter")