Merge branch 'main' into func-test-http

cijothomas · web-flow · commit 48bd999e6ed3 · 2024-12-02T13:58:28.000-08:00
diff --git a/opentelemetry-appender-tracing/src/layer.rs b/opentelemetry-appender-tracing/src/layer.rs
@@ -69,7 +69,7 @@ impl<'a, LR: LogRecord> EventVisitor<'a, LR> {
     }
 }
 
-impl<'a, LR: LogRecord> tracing::field::Visit for EventVisitor<'a, LR> {
+impl<LR: LogRecord> tracing::field::Visit for EventVisitor<'_, LR> {
     fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {
         #[cfg(feature = "experimental_metadata_attributes")]
         if is_duplicated_metadata(field.name()) {
diff --git a/opentelemetry-http/src/lib.rs b/opentelemetry-http/src/lib.rs
@@ -13,7 +13,7 @@ use opentelemetry::propagation::{Extractor, Injector};
 /// for example usage.
 pub struct HeaderInjector<'a>(pub &'a mut http::HeaderMap);
 
-impl<'a> Injector for HeaderInjector<'a> {
+impl Injector for HeaderInjector<'_> {
     /// Set a key and value in the HeaderMap.  Does nothing if the key or value are not valid inputs.
     fn set(&mut self, key: &str, value: String) {
         if let Ok(name) = http::header::HeaderName::from_bytes(key.as_bytes()) {
@@ -30,7 +30,7 @@ impl<'a> Injector for HeaderInjector<'a> {
 /// for example usage.
 pub struct HeaderExtractor<'a>(pub &'a http::HeaderMap);
 
-impl<'a> Extractor for HeaderExtractor<'a> {
+impl Extractor for HeaderExtractor<'_> {
     /// Get a value for a key from the HeaderMap.  If the value is not valid ASCII, returns None.
     fn get(&self, key: &str) -> Option<&str> {
         self.0.get(key).and_then(|value| value.to_str().ok())
diff --git a/opentelemetry-proto/src/transform/metrics.rs b/opentelemetry-proto/src/transform/metrics.rs
@@ -295,8 +295,8 @@ pub mod tonic {
                     .iter()
                     .map(|dp| TonicNumberDataPoint {
                         attributes: dp.attributes.iter().map(Into::into).collect(),
-                        start_time_unix_nano: dp.start_time.map(to_nanos).unwrap_or_default(),
-                        time_unix_nano: dp.time.map(to_nanos).unwrap_or_default(),
+                        start_time_unix_nano: to_nanos(dp.start_time),
+                        time_unix_nano: to_nanos(dp.time),
                         exemplars: dp.exemplars.iter().map(Into::into).collect(),
                         flags: TonicDataPointFlags::default() as u32,
                         value: Some(dp.value.into()),
@@ -319,8 +319,8 @@ pub mod tonic {
                     .iter()
                     .map(|dp| TonicNumberDataPoint {
                         attributes: dp.attributes.iter().map(Into::into).collect(),
-                        start_time_unix_nano: dp.start_time.map(to_nanos).unwrap_or_default(),
-                        time_unix_nano: dp.time.map(to_nanos).unwrap_or_default(),
+                        start_time_unix_nano: to_nanos(dp.start_time),
+                        time_unix_nano: to_nanos(dp.time),
                         exemplars: dp.exemplars.iter().map(Into::into).collect(),
                         flags: TonicDataPointFlags::default() as u32,
                         value: Some(dp.value.into()),
diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## vNext
 
+- *Breaking* SimpleLogProcessor modified to be generic over `LogExporter` to
+  avoid dynamic dispatch to invoke exporter. If you were using
+  `with_simple_exporter` to add `LogExporter` with SimpleLogProcessor, this is a
+  transparent change.
+  [#2338](https://github.com/open-telemetry/opentelemetry-rust/pull/2338)
+
 ## 0.27.1
 
 Released 2024-Nov-27
diff --git a/opentelemetry-sdk/src/export/logs/mod.rs b/opentelemetry-sdk/src/export/logs/mod.rs
@@ -39,7 +39,6 @@ impl<'a> LogBatch<'a> {
     ///
     /// Note - this is not a public function, and should not be used directly. This would be
     /// made private in the future.
-
     pub fn new(data: &'a [(&'a LogRecord, &'a InstrumentationScope)]) -> LogBatch<'a> {
         LogBatch { data }
     }
diff --git a/opentelemetry-sdk/src/logs/log_emitter.rs b/opentelemetry-sdk/src/logs/log_emitter.rs
@@ -188,7 +188,7 @@ impl Builder {
     /// The `LogExporter` that this provider should use.
     pub fn with_simple_exporter<T: LogExporter + 'static>(self, exporter: T) -> Self {
         let mut processors = self.processors;
-        processors.push(Box::new(SimpleLogProcessor::new(Box::new(exporter))));
+        processors.push(Box::new(SimpleLogProcessor::new(exporter)));
 
         Builder { processors, ..self }
     }
diff --git a/opentelemetry-sdk/src/logs/log_processor.rs b/opentelemetry-sdk/src/logs/log_processor.rs
@@ -77,21 +77,21 @@ pub trait LogProcessor: Send + Sync + Debug {
 /// debugging and testing. For scenarios requiring higher
 /// performance/throughput, consider using [BatchLogProcessor].
 #[derive(Debug)]
-pub struct SimpleLogProcessor {
-    exporter: Mutex<Box<dyn LogExporter>>,
+pub struct SimpleLogProcessor<T: LogExporter> {
+    exporter: Mutex<T>,
     is_shutdown: AtomicBool,
 }
 
-impl SimpleLogProcessor {
-    pub(crate) fn new(exporter: Box<dyn LogExporter>) -> Self {
+impl<T: LogExporter> SimpleLogProcessor<T> {
+    pub(crate) fn new(exporter: T) -> Self {
         SimpleLogProcessor {
             exporter: Mutex::new(exporter),
             is_shutdown: AtomicBool::new(false),
         }
     }
 }
 
-impl LogProcessor for SimpleLogProcessor {
+impl<T: LogExporter> LogProcessor for SimpleLogProcessor<T> {
     fn emit(&self, record: &mut LogRecord, instrumentation: &InstrumentationScope) {
         // noop after shutdown
         if self.is_shutdown.load(std::sync::atomic::Ordering::Relaxed) {
@@ -764,7 +764,7 @@ mod tests {
         let exporter = MockLogExporter {
             resource: Arc::new(Mutex::new(None)),
         };
-        let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
+        let processor = SimpleLogProcessor::new(exporter.clone());
         let _ = LoggerProvider::builder()
             .with_log_processor(processor)
             .with_resource(Resource::new(vec![
@@ -832,7 +832,7 @@ mod tests {
         let exporter = InMemoryLogExporterBuilder::default()
             .keep_records_on_shutdown()
             .build();
-        let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
+        let processor = SimpleLogProcessor::new(exporter.clone());
 
         let mut record: LogRecord = Default::default();
         let instrumentation: InstrumentationScope = Default::default();
@@ -1013,7 +1013,7 @@ mod tests {
     #[test]
     fn test_simple_processor_sync_exporter_without_runtime() {
         let exporter = InMemoryLogExporterBuilder::default().build();
-        let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
+        let processor = SimpleLogProcessor::new(exporter.clone());
 
         let mut record: LogRecord = Default::default();
         let instrumentation: InstrumentationScope = Default::default();
@@ -1026,7 +1026,7 @@ mod tests {
     #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
     async fn test_simple_processor_sync_exporter_with_runtime() {
         let exporter = InMemoryLogExporterBuilder::default().build();
-        let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
+        let processor = SimpleLogProcessor::new(exporter.clone());
 
         let mut record: LogRecord = Default::default();
         let instrumentation: InstrumentationScope = Default::default();
@@ -1039,7 +1039,7 @@ mod tests {
     #[tokio::test(flavor = "multi_thread")]
     async fn test_simple_processor_sync_exporter_with_multi_thread_runtime() {
         let exporter = InMemoryLogExporterBuilder::default().build();
-        let processor = Arc::new(SimpleLogProcessor::new(Box::new(exporter.clone())));
+        let processor = Arc::new(SimpleLogProcessor::new(exporter.clone()));
 
         let mut handles = vec![];
         for _ in 0..10 {
@@ -1062,7 +1062,7 @@ mod tests {
     #[tokio::test(flavor = "current_thread")]
     async fn test_simple_processor_sync_exporter_with_current_thread_runtime() {
         let exporter = InMemoryLogExporterBuilder::default().build();
-        let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
+        let processor = SimpleLogProcessor::new(exporter.clone());
 
         let mut record: LogRecord = Default::default();
         let instrumentation: InstrumentationScope = Default::default();
@@ -1109,7 +1109,7 @@ mod tests {
         // Use `catch_unwind` to catch the panic caused by missing Tokio runtime
         let result = std::panic::catch_unwind(|| {
             let exporter = LogExporterThatRequiresTokio::new();
-            let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
+            let processor = SimpleLogProcessor::new(exporter.clone());
 
             let mut record: LogRecord = Default::default();
             let instrumentation: InstrumentationScope = Default::default();
@@ -1158,7 +1158,7 @@ mod tests {
     // tasks nor the exporter can proceed.
     async fn test_simple_processor_async_exporter_with_all_runtime_worker_threads_blocked() {
         let exporter = LogExporterThatRequiresTokio::new();
-        let processor = Arc::new(SimpleLogProcessor::new(Box::new(exporter.clone())));
+        let processor = Arc::new(SimpleLogProcessor::new(exporter.clone()));
 
         let concurrent_emit = 4; // number of worker threads
 
@@ -1189,7 +1189,7 @@ mod tests {
     // tasks occupy the runtime.
     async fn test_simple_processor_async_exporter_with_runtime() {
         let exporter = LogExporterThatRequiresTokio::new();
-        let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
+        let processor = SimpleLogProcessor::new(exporter.clone());
 
         let mut record: LogRecord = Default::default();
         let instrumentation: InstrumentationScope = Default::default();
@@ -1208,7 +1208,7 @@ mod tests {
     async fn test_simple_processor_async_exporter_with_multi_thread_runtime() {
         let exporter = LogExporterThatRequiresTokio::new();
 
-        let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
+        let processor = SimpleLogProcessor::new(exporter.clone());
 
         let mut record: LogRecord = Default::default();
         let instrumentation: InstrumentationScope = Default::default();
@@ -1228,7 +1228,7 @@ mod tests {
     async fn test_simple_processor_async_exporter_with_current_thread_runtime() {
         let exporter = LogExporterThatRequiresTokio::new();
 
-        let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
+        let processor = SimpleLogProcessor::new(exporter.clone());
 
         let mut record: LogRecord = Default::default();
         let instrumentation: InstrumentationScope = Default::default();
diff --git a/opentelemetry-sdk/src/logs/mod.rs b/opentelemetry-sdk/src/logs/mod.rs
@@ -49,7 +49,7 @@ mod tests {
         let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
         let logger_provider = LoggerProvider::builder()
             .with_resource(resource.clone())
-            .with_log_processor(SimpleLogProcessor::new(Box::new(exporter.clone())))
+            .with_log_processor(SimpleLogProcessor::new(exporter.clone()))
             .build();
 
         // Act
diff --git a/opentelemetry-sdk/src/metrics/data/mod.rs b/opentelemetry-sdk/src/metrics/data/mod.rs
@@ -97,9 +97,9 @@ pub struct DataPoint<T> {
     /// time series.
     pub attributes: Vec<KeyValue>,
     /// The time when the time series was started.
-    pub start_time: Option<SystemTime>,
+    pub start_time: SystemTime,
     /// The time when the time series was recorded.
-    pub time: Option<SystemTime>,
+    pub time: SystemTime,
     /// The value of this data point.
     pub value: T,
     /// The sampled [Exemplar]s collected during the time series.
@@ -338,8 +338,8 @@ mod tests {
     fn validate_cloning_data_points() {
         let data_type = DataPoint {
             attributes: vec![KeyValue::new("key", "value")],
-            start_time: Some(std::time::SystemTime::now()),
-            time: Some(std::time::SystemTime::now()),
+            start_time: std::time::SystemTime::now(),
+            time: std::time::SystemTime::now(),
             value: 0u32,
             exemplars: vec![Exemplar {
                 filtered_attributes: vec![],
diff --git a/opentelemetry-sdk/src/metrics/internal/aggregate.rs b/opentelemetry-sdk/src/metrics/internal/aggregate.rs
@@ -224,8 +224,8 @@ mod tests {
         let mut a = Gauge {
             data_points: vec![DataPoint {
                 attributes: vec![KeyValue::new("a", 1)],
-                start_time: Some(SystemTime::now()),
-                time: Some(SystemTime::now()),
+                start_time: SystemTime::now(),
+                time: SystemTime::now(),
                 value: 1u64,
                 exemplars: vec![],
             }],
@@ -251,15 +251,15 @@ mod tests {
                 data_points: vec![
                     DataPoint {
                         attributes: vec![KeyValue::new("a1", 1)],
-                        start_time: Some(SystemTime::now()),
-                        time: Some(SystemTime::now()),
+                        start_time: SystemTime::now(),
+                        time: SystemTime::now(),
                         value: 1u64,
                         exemplars: vec![],
                     },
                     DataPoint {
                         attributes: vec![KeyValue::new("a2", 1)],
-                        start_time: Some(SystemTime::now()),
-                        time: Some(SystemTime::now()),
+                        start_time: SystemTime::now(),
+                        time: SystemTime::now(),
                         value: 2u64,
                         exemplars: vec![],
                     },
@@ -294,15 +294,15 @@ mod tests {
                 data_points: vec![
                     DataPoint {
                         attributes: vec![KeyValue::new("a1", 1)],
-                        start_time: Some(SystemTime::now()),
-                        time: Some(SystemTime::now()),
+                        start_time: SystemTime::now(),
+                        time: SystemTime::now(),
                         value: 1u64,
                         exemplars: vec![],
                     },
                     DataPoint {
                         attributes: vec![KeyValue::new("a2", 1)],
-                        start_time: Some(SystemTime::now()),
-                        time: Some(SystemTime::now()),
+                        start_time: SystemTime::now(),
+                        time: SystemTime::now(),
                         value: 2u64,
                         exemplars: vec![],
                     },
diff --git a/opentelemetry-sdk/src/metrics/internal/last_value.rs b/opentelemetry-sdk/src/metrics/internal/last_value.rs
@@ -66,8 +66,8 @@ impl<T: Number> LastValue<T> {
         self.value_map
             .collect_and_reset(dest, |attributes, aggr| DataPoint {
                 attributes,
-                start_time: Some(prev_start),
-                time: Some(t),
+                start_time: prev_start,
+                time: t,
                 value: aggr.value.get_value(),
                 exemplars: vec![],
             });
@@ -79,8 +79,8 @@ impl<T: Number> LastValue<T> {
         self.value_map
             .collect_readonly(dest, |attributes, aggr| DataPoint {
                 attributes,
-                start_time: Some(prev_start),
-                time: Some(t),
+                start_time: prev_start,
+                time: t,
                 value: aggr.value.get_value(),
                 exemplars: vec![],
             });
diff --git a/opentelemetry-sdk/src/metrics/internal/precomputed_sum.rs b/opentelemetry-sdk/src/metrics/internal/precomputed_sum.rs
@@ -68,8 +68,8 @@ impl<T: Number> PrecomputedSum<T> {
                 let delta = value - *reported.get(&attributes).unwrap_or(&T::default());
                 DataPoint {
                     attributes,
-                    start_time: Some(prev_start),
-                    time: Some(t),
+                    start_time: prev_start,
+                    time: t,
                     value: delta,
                     exemplars: vec![],
                 }
@@ -109,8 +109,8 @@ impl<T: Number> PrecomputedSum<T> {
         self.value_map
             .collect_readonly(&mut s_data.data_points, |attributes, aggr| DataPoint {
                 attributes,
-                start_time: Some(prev_start),
-                time: Some(t),
+                start_time: prev_start,
+                time: t,
                 value: aggr.value.get_value(),
                 exemplars: vec![],
             });
diff --git a/opentelemetry-sdk/src/metrics/internal/sum.rs b/opentelemetry-sdk/src/metrics/internal/sum.rs
@@ -95,8 +95,8 @@ impl<T: Number> Sum<T> {
         self.value_map
             .collect_and_reset(&mut s_data.data_points, |attributes, aggr| DataPoint {
                 attributes,
-                start_time: Some(prev_start),
-                time: Some(t),
+                start_time: prev_start,
+                time: t,
                 value: aggr.value.get_value(),
                 exemplars: vec![],
             });
@@ -132,8 +132,8 @@ impl<T: Number> Sum<T> {
         self.value_map
             .collect_readonly(&mut s_data.data_points, |attributes, aggr| DataPoint {
                 attributes,
-                start_time: Some(prev_start),
-                time: Some(t),
+                start_time: prev_start,
+                time: t,
                 value: aggr.value.get_value(),
                 exemplars: vec![],
             });
diff --git a/opentelemetry-sdk/src/metrics/meter_provider.rs b/opentelemetry-sdk/src/metrics/meter_provider.rs
@@ -256,7 +256,6 @@ impl MeterProviderBuilder {
     }
 
     /// Construct a new [MeterProvider] with this configuration.
-
     pub fn build(self) -> SdkMeterProvider {
         otel_debug!(
             name: "MeterProvider.Building",
diff --git a/opentelemetry-sdk/src/testing/logs/in_memory_exporter.rs b/opentelemetry-sdk/src/testing/logs/in_memory_exporter.rs
@@ -29,7 +29,6 @@ use std::sync::{Arc, Mutex};
 ///        .build();
 ///    // Setup Log Appenders and emit logs. (Not shown here)
 ///    logger_provider.force_flush();
-
 ///    let emitted_logs = exporter.get_emitted_logs().unwrap();
 ///    for log in emitted_logs {
 ///        println!("{:?}", log);
diff --git a/opentelemetry-sdk/src/trace/sampler/jaeger_remote/remote.rs b/opentelemetry-sdk/src/trace/sampler/jaeger_remote/remote.rs
@@ -1,5 +1,4 @@
 /// Generate types based on proto
-
 /// ProbabilisticSamplingStrategy samples traces with a fixed probability.
 #[derive(serde::Serialize, serde::Deserialize, PartialOrd, PartialEq)]
 #[serde(rename_all = "camelCase")]
diff --git a/opentelemetry-sdk/src/trace/span_limit.rs b/opentelemetry-sdk/src/trace/span_limit.rs
@@ -12,7 +12,6 @@
 ///
 /// If the limit has been breached. The attributes, events or links will be dropped based on their
 /// index in the collection. The one added to collections later will be dropped first.
-
 pub(crate) const DEFAULT_MAX_EVENT_PER_SPAN: u32 = 128;
 pub(crate) const DEFAULT_MAX_ATTRIBUTES_PER_SPAN: u32 = 128;
 pub(crate) const DEFAULT_MAX_LINKS_PER_SPAN: u32 = 128;
diff --git a/opentelemetry-semantic-conventions/scripts/templates/registry/rust/metric.rs.j2 b/opentelemetry-semantic-conventions/scripts/templates/registry/rust/metric.rs.j2
@@ -57,7 +57,7 @@
                 {% set req_level = "Unspecified" %}
                 {% set req_message = '' %}
             {% endif %}
-/// | [`crate::attribute::{{ attribute.name | screaming_snake_case }}`] | `{{ req_level }}`{{ (': ' + req_message if req_message else '') }}
+/// | [`crate::attribute::{{ attribute.name | screaming_snake_case }}`] | `{{ req_level }}`{{ (': ' + req_message.replace('\n', ' ') if req_message else '') }}
         {% endfor %}
         {% if metric.examples %}
 ///
diff --git a/opentelemetry-semantic-conventions/src/lib.rs b/opentelemetry-semantic-conventions/src/lib.rs
diff --git a/opentelemetry-semantic-conventions/src/metric.rs b/opentelemetry-semantic-conventions/src/metric.rs
diff --git a/opentelemetry-stdout/src/metrics/exporter.rs b/opentelemetry-stdout/src/metrics/exporter.rs
diff --git a/opentelemetry/src/global/internal_logging.rs b/opentelemetry/src/global/internal_logging.rs
diff --git a/opentelemetry/src/logs/logger.rs b/opentelemetry/src/logs/logger.rs
diff --git a/opentelemetry/src/metrics/instruments/mod.rs b/opentelemetry/src/metrics/instruments/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ impl<'a, LR: LogRecord> EventVisitor<'a, LR> {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-impl<'a, LR: LogRecord> tracing::field::Visit for EventVisitor<'a, LR> {`
	`72`	`+impl<LR: LogRecord> tracing::field::Visit for EventVisitor<'_, LR> {`
`73`	`73`	`fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {`
`74`	`74`	`#[cfg(feature = "experimental_metadata_attributes")]`
`75`	`75`	`if is_duplicated_metadata(field.name()) {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ impl<'a> LogBatch<'a> {`
`39`	`39`	`///`
`40`	`40`	`/// Note - this is not a public function, and should not be used directly. This would be`
`41`	`41`	`/// made private in the future.`
`42`		`-`
`43`	`42`	`pub fn new(data: &'a [(&'a LogRecord, &'a InstrumentationScope)]) -> LogBatch<'a> {`
`44`	`43`	`LogBatch { data }`
`45`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ impl Builder {`
`188`	`188`	/// The `LogExporter` that this provider should use.
`189`	`189`	`pub fn with_simple_exporter<T: LogExporter + 'static>(self, exporter: T) -> Self {`
`190`	`190`	`let mut processors = self.processors;`
`191`		`- processors.push(Box::new(SimpleLogProcessor::new(Box::new(exporter))));`
	`191`	`+ processors.push(Box::new(SimpleLogProcessor::new(exporter)));`
`192`	`192`
`193`	`193`	`Builder { processors, ..self }`
`194`	`194`	`}`