Merge branch 'main' into utpilla/Update-OTLP-Exporter-Trace-Pipeline

Author: utpilla

.cspell.json

@@ -32,8 +32,10 @@
         "Cijo",
         "clippy",
         "codecov",
+        "datapoint",
         "deque",
         "Dirkjan",
+        "EPYC",
         "hasher",
         "isahc",
         "Isobel",
@@ -43,6 +45,9 @@
         "Lalit",
         "LIBCLANG",
         "msrv",
+        "mykey",
+        "myvalue",
+        "nocapture",
         "Ochtman",
         "opentelemetry",
         "OTLP",
@@ -53,8 +58,10 @@
         "runtimes",
         "rustc",
         "shoppingcart",
+        "struct",
         "Tescher",
         "tracerprovider",
+        "updown",
         "Zhongyang",
         "zipkin"
     ],

Cargo.toml

@@ -19,7 +19,6 @@ debug = 1
 async-std = "1.10"
 async-trait = "0.1"
 bytes = "1"
-env_logger = { version = "0.10", default-features = false } # env_logger requires a newer MSRV
 futures-core = "0.3"
 futures-executor = "0.3"
 futures-util = { version = "0.3", default-features = false }

examples/metrics-advanced/src/main.rs

@@ -1,5 +1,4 @@
 use opentelemetry::global;
-use opentelemetry::metrics::Unit;
 use opentelemetry::Key;
 use opentelemetry::KeyValue;
 use opentelemetry_sdk::metrics::{
@@ -15,7 +14,7 @@ fn init_meter_provider() -> opentelemetry_sdk::metrics::SdkMeterProvider {
             Some(
                 Stream::new()
                     .name("my_histogram_renamed")
-                    .unit(Unit::new("milliseconds")),
+                    .unit("milliseconds"),
             )
         } else {
             None
@@ -76,7 +75,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     // using view.
     let histogram = meter
         .f64_histogram("my_histogram")
-        .with_unit(Unit::new("ms"))
+        .with_unit("ms")
         .with_description("My histogram example description")
         .init();
 
@@ -114,7 +113,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     // use a custom set of boundaries, and min/max values will not be recorded.
     let histogram2 = meter
         .f64_histogram("my_second_histogram")
-        .with_unit(Unit::new("ms"))
+        .with_unit("ms")
         .with_description("My histogram example description")
         .init();
 

examples/metrics-basic/src/main.rs

@@ -1,5 +1,4 @@
 use opentelemetry::global;
-use opentelemetry::metrics::Unit;
 use opentelemetry::KeyValue;
 use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider};
 use opentelemetry_sdk::{runtime, Resource};
@@ -47,7 +46,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     let _observable_counter = meter
         .u64_observable_counter("my_observable_counter")
         .with_description("My observable counter example description")
-        .with_unit(Unit::new("myunit"))
+        .with_unit("myunit")
         .with_callback(|observer| {
             observer.observe(
                 100,
@@ -75,7 +74,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     let _observable_up_down_counter = meter
         .i64_observable_up_down_counter("my_observable_updown_counter")
         .with_description("My observable updown counter example description")
-        .with_unit(Unit::new("myunit"))
+        .with_unit("myunit")
         .with_callback(|observer| {
             observer.observe(
                 100,
@@ -108,7 +107,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     let gauge = meter
         .f64_gauge("my_gauge")
         .with_description("A gauge set to 1.0")
-        .with_unit(Unit::new("myunit"))
+        .with_unit("myunit")
         .init();
 
     gauge.record(
@@ -123,7 +122,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     let _observable_gauge = meter
         .f64_observable_gauge("my_observable_gauge")
         .with_description("An observable gauge set to 1.0")
-        .with_unit(Unit::new("myunit"))
+        .with_unit("myunit")
         .with_callback(|observer| {
             observer.observe(
                 1.0,

opentelemetry-otlp/examples/basic-otlp-http/src/main.rs

@@ -1,7 +1,7 @@
 use once_cell::sync::Lazy;
 use opentelemetry::{
     global,
-    metrics::{MetricsError, Unit},
+    metrics::MetricsError,
     trace::{TraceContextExt, TraceError, Tracer, TracerProvider as _},
     Key, KeyValue,
 };
@@ -128,7 +128,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     let counter = meter
         .u64_counter("test_counter")
         .with_description("a simple counter for demo purposes.")
-        .with_unit(Unit::new("my_unit"))
+        .with_unit("my_unit")
         .init();
     for _ in 0..10 {
         counter.add(1, &[KeyValue::new("test_key", "test_value")]);

opentelemetry-otlp/examples/basic-otlp/src/main.rs

@@ -1,7 +1,7 @@
 use once_cell::sync::Lazy;
 use opentelemetry::global;
 use opentelemetry::logs::LogError;
-use opentelemetry::metrics::{MetricsError, Unit};
+use opentelemetry::metrics::MetricsError;
 use opentelemetry::trace::{TraceError, TracerProvider};
 use opentelemetry::{
     trace::{TraceContextExt, Tracer},
@@ -129,7 +129,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     let counter = meter
         .u64_counter("test_counter")
         .with_description("a simple counter for demo purposes.")
-        .with_unit(Unit::new("my_unit"))
+        .with_unit("my_unit")
         .init();
     for _ in 0..10 {
         counter.add(1, &[KeyValue::new("test_key", "test_value")]);

opentelemetry-proto/src/transform/metrics.rs

@@ -148,7 +148,7 @@ pub mod tonic {
             TonicMetric {
                 name: metric.name.to_string(),
                 description: metric.description.to_string(),
-                unit: metric.unit.as_str().to_string(),
+                unit: metric.unit.to_string(),
                 metadata: vec![], // internal and currently unused
                 data: metric.data.as_any().try_into().ok(),
             }

opentelemetry-sdk/CHANGELOG.md

@@ -10,18 +10,21 @@
   must now use `.with_resource(RESOURCE::default())` to configure Resource on
   logger provider.
 - Removed dependency on `ordered-float`.
+- Removed `XrayIdGenerator`, which was marked deprecated since 0.21.3. Use
+  [`opentelemetry-aws`](https://crates.io/crates/opentelemetry-aws), version
+  0.10.0 or newer.
 
 - **Breaking** [1726](https://github.com/open-telemetry/opentelemetry-rust/pull/1726)
   Update `LogProcessor::emit() method to take mutable reference to LogData. This is breaking
-  change for LogProcessor developers. If the processor needs to invoke the exporter 
-  asynchronously, it should clone the data to ensure it can be safely processed without 
+  change for LogProcessor developers. If the processor needs to invoke the exporter
+  asynchronously, it should clone the data to ensure it can be safely processed without
   lifetime issues. Any changes made to the log data before cloning in this method will be
   reflected in the next log processor in the chain, as well as to the exporter.
 - **Breaking** [1726](https://github.com/open-telemetry/opentelemetry-rust/pull/1726)
- Update `LogExporter::export() method to accept a batch of log data, which can be either a 
- reference or owned `LogData`. If the exporter needs to process the log data
- asynchronously, it should clone the log data to ensure it can be safely processed without 
- lifetime issues. 
+ Update `LogExporter::export() method to accept a batch of log data, which can be either a
+ reference or owned`LogData`. If the exporter needs to process the log data
+ asynchronously, it should clone the log data to ensure it can be safely processed without
+ lifetime issues.
 
 ## v0.23.0
 

opentelemetry-sdk/src/metrics/data/mod.rs

@@ -2,7 +2,7 @@
 
 use std::{any, borrow::Cow, fmt, time::SystemTime};
 
-use opentelemetry::{metrics::Unit, KeyValue};
+use opentelemetry::KeyValue;
 
 use crate::{instrumentation::Scope, Resource};
 
@@ -38,7 +38,7 @@ pub struct Metric {
     /// The description of the instrument, which can be used in documentation.
     pub description: Cow<'static, str>,
     /// The unit in which the instrument reports.
-    pub unit: Unit,
+    pub unit: Cow<'static, str>,
     /// The aggregated data from an instrument.
     pub data: Box<dyn Aggregation>,
 }

opentelemetry-sdk/src/metrics/instrument.rs

@@ -3,7 +3,7 @@ use std::{any::Any, borrow::Cow, collections::HashSet, hash::Hash, marker, sync:
 use opentelemetry::{
     metrics::{
         AsyncInstrument, MetricsError, Result, SyncCounter, SyncGauge, SyncHistogram,
-        SyncUpDownCounter, Unit,
+        SyncUpDownCounter,
     },
     Key, KeyValue,
 };
@@ -69,7 +69,7 @@ pub struct Instrument {
     /// The functional group of the instrument.
     pub kind: Option<InstrumentKind>,
     /// Unit is the unit of measurement recorded by the instrument.
-    pub unit: Unit,
+    pub unit: Cow<'static, str>,
     /// The instrumentation that created the instrument.
     pub scope: Scope,
 }
@@ -93,8 +93,8 @@ impl Instrument {
     }
 
     /// Set the instrument unit.
-    pub fn unit(mut self, unit: Unit) -> Self {
-        self.unit = unit;
+    pub fn unit(mut self, unit: impl Into<Cow<'static, str>>) -> Self {
+        self.unit = unit.into();
         self
     }
 
@@ -109,7 +109,7 @@ impl Instrument {
         self.name == ""
             && self.description == ""
             && self.kind.is_none()
-            && self.unit.as_str() == ""
+            && self.unit == ""
             && self.scope == Scope::default()
     }
 
@@ -134,7 +134,7 @@ impl Instrument {
     }
 
     pub(crate) fn matches_unit(&self, other: &Instrument) -> bool {
-        self.unit.as_str() == "" || self.unit == other.unit
+        self.unit.is_empty() || self.unit.as_ref() == other.unit.as_ref()
     }
 
     pub(crate) fn matches_scope(&self, other: &Instrument) -> bool {
@@ -171,7 +171,7 @@ pub struct Stream {
     /// Describes the purpose of the data.
     pub description: Cow<'static, str>,
     /// the unit of measurement recorded.
-    pub unit: Unit,
+    pub unit: Cow<'static, str>,
     /// Aggregation the stream uses for an instrument.
     pub aggregation: Option<Aggregation>,
     /// An allow-list of attribute keys that will be preserved for the stream.
@@ -201,8 +201,8 @@ impl Stream {
     }
 
     /// Set the stream unit.
-    pub fn unit(mut self, unit: Unit) -> Self {
-        self.unit = unit;
+    pub fn unit(mut self, unit: impl Into<Cow<'static, str>>) -> Self {
+        self.unit = unit.into();
         self
     }
 
@@ -233,7 +233,7 @@ pub(crate) struct InstrumentId {
     /// Defines the functional group of the instrument.
     pub(crate) kind: InstrumentKind,
     /// The unit of measurement recorded.
-    pub(crate) unit: Unit,
+    pub(crate) unit: Cow<'static, str>,
     /// Number is the underlying data type of the instrument.
     pub(crate) number: Cow<'static, str>,
 }
@@ -306,7 +306,7 @@ pub(crate) struct IdInner {
     /// The functional group of the instrument.
     kind: InstrumentKind,
     /// The unit of measurement recorded by the instrument.
-    pub(crate) unit: Unit,
+    pub(crate) unit: Cow<'static, str>,
     /// The instrumentation that created the instrument.
     scope: Scope,
 }
@@ -337,7 +337,7 @@ impl<T> Observable<T> {
         kind: InstrumentKind,
         name: Cow<'static, str>,
         description: Cow<'static, str>,
-        unit: Unit,
+        unit: Cow<'static, str>,
         measures: Vec<Arc<dyn Measure<T>>>,
     ) -> Self {
         Self {