Merge branch 'msrv-check-v1.70.0' of github.com:lalitb/opentelemetry-rust into msrv-check-v1.70.0

Author: lalitb

.github/workflows/semver.yml

@@ -19,4 +19,4 @@ jobs:
         with:
           components: rustfmt
       - name: cargo-semver-checks
-        uses: obi1kenobi/cargo-semver-checks-action@v2.3
+        uses: obi1kenobi/cargo-semver-checks-action@v2.4

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

@@ -7,7 +7,7 @@ use opentelemetry::{
 };
 use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
 use opentelemetry_otlp::WithExportConfig;
-use opentelemetry_sdk::trace as sdktrace;
+use opentelemetry_sdk::trace::{self as sdktrace, Config};
 use opentelemetry_sdk::{
     logs::{self as sdklogs},
     Resource,
@@ -45,7 +45,7 @@ fn init_tracer_provider() -> Result<sdktrace::TracerProvider, TraceError> {
                 .http()
                 .with_endpoint("http://localhost:4318/v1/traces"),
         )
-        .with_trace_config(sdktrace::config().with_resource(RESOURCE.clone()))
+        .with_trace_config(Config::default().with_resource(RESOURCE.clone()))
         .install_batch(opentelemetry_sdk::runtime::Tokio)
 }
 

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

@@ -9,6 +9,7 @@ use opentelemetry::{
 };
 use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
 use opentelemetry_otlp::{ExportConfig, WithExportConfig};
+use opentelemetry_sdk::trace::Config;
 use opentelemetry_sdk::{runtime, trace as sdktrace, Resource};
 use std::error::Error;
 use tracing::info;
@@ -30,7 +31,7 @@ fn init_tracer_provider() -> Result<sdktrace::TracerProvider, TraceError> {
                 .tonic()
                 .with_endpoint("http://localhost:4317"),
         )
-        .with_trace_config(sdktrace::config().with_resource(RESOURCE.clone()))
+        .with_trace_config(Config::default().with_resource(RESOURCE.clone()))
         .install_batch(runtime::Tokio)
 }
 

opentelemetry-sdk/CHANGELOG.md

@@ -41,7 +41,11 @@
     - `SpanData` doesn't have the resource attributes. The `SpanExporter::export()` method needs to merge it 
       with the earlier preserved resource before export.
 
-- **Breaking** [1836](https://github.com/open-telemetry/opentelemetry-rust/pull/1836) `SpanProcessor::shutdown` now takes an immutable reference to self. Any reference can call shutdown on the processor. After the first call to `shutdown` the processor will not process any new spans. 
+- **Breaking** [1836](https://github.com/open-telemetry/opentelemetry-rust/pull/1836) `SpanProcessor::shutdown` now takes an immutable reference to self. Any reference can call shutdown on the processor. After the first call to `shutdown` the processor will not process any new spans.
+
+- **Breaking** [1850] (https://github.com/open-telemetry/opentelemetry-rust/pull/1850) `LoggerProvider::log_processors()` and `LoggerProvider::resource()` are not public methods anymore. They are only used within the `opentelemetry-sdk` crate.
+
+- [1857](https://github.com/open-telemetry/opentelemetry-rust/pull/1857) Fixed an issue in Metrics SDK which prevented export errors from being send to global error handler. With the fix, errors occurring during export like OTLP Endpoint unresponsive shows up in stderr by default.
 
 ## v0.23.0
 

opentelemetry-sdk/benches/attribute_set.rs

@@ -3,7 +3,7 @@ use opentelemetry::KeyValue;
 use opentelemetry_sdk::metrics::AttributeSet;
 
 // Run this benchmark with:
-// cargo bench --bench attribute_set --features=metrics
+// cargo bench --bench attribute_set
 
 fn criterion_benchmark(c: &mut Criterion) {
     attribute_set(c);

opentelemetry-sdk/benches/log.rs

@@ -1,6 +1,6 @@
-//! run with `$ cargo bench --bench log --features=logs -- --exact <test_name>` to run specific test for logs
-//! So to run test named "full-log-with-attributes/with-context" you would run `$ cargo bench --bench log --features=logs -- --exact full-log-with-attributes/with-context`
-//! To run all tests for logs you would run `$ cargo bench --bench log --features=logs`
+//! run with `$ cargo bench --bench log -- --exact <test_name>` to run specific test for logs
+//! So to run test named "full-log-with-attributes/with-context" you would run `$ cargo bench --bench log -- --exact full-log-with-attributes/with-context`
+//! To run all tests for logs you would run `$ cargo bench --bench log`
 //!
 
 use std::collections::HashMap;

opentelemetry-sdk/benches/metric_counter.rs

@@ -30,7 +30,7 @@ thread_local! {
 }
 
 // Run this benchmark with:
-// cargo bench --bench metric_counter --features=metrics
+// cargo bench --bench metric_counter
 fn create_counter() -> Counter<u64> {
     let meter_provider: SdkMeterProvider = SdkMeterProvider::builder()
         .with_reader(ManualReader::builder().build())

opentelemetry-sdk/src/logs/log_emitter.rs

@@ -90,14 +90,12 @@ impl LoggerProvider {
         Builder::default()
     }
 
-    /// Resource associated with this provider.
-    pub fn resource(&self) -> &Resource {
-        &self.inner.resource
+    pub(crate) fn log_processors(&self) -> &[Box<dyn LogProcessor>] {
+        &self.inner.processors
     }
 
-    /// Log processors associated with this provider.
-    pub fn log_processors(&self) -> &[Box<dyn LogProcessor>] {
-        &self.inner.processors
+    pub(crate) fn resource(&self) -> &Resource {
+        &self.inner.resource
     }
 
     /// Force flush all remaining logs in log processors and return results.
@@ -196,17 +194,20 @@ impl Builder {
     /// Create a new provider from this configuration.
     pub fn build(self) -> LoggerProvider {
         let resource = self.resource.unwrap_or_default();
-        // invoke set_resource on all the processors
-        for processor in &self.processors {
-            processor.set_resource(&resource);
-        }
-        LoggerProvider {
+
+        let logger_provider = LoggerProvider {
             inner: Arc::new(LoggerProviderInner {
                 processors: self.processors,
                 resource,
             }),
             is_shutdown: Arc::new(AtomicBool::new(false)),
+        };
+
+        // invoke set_resource on all the processors
+        for processor in logger_provider.log_processors() {
+            processor.set_resource(logger_provider.resource());
         }
+        logger_provider
     }
 }
 
@@ -511,7 +512,7 @@ mod tests {
 
     #[test]
     fn global_shutdown_test() {
-        // cargo test shutdown_test --features=logs
+        // cargo test global_shutdown_test --features=testing
 
         // Arrange
         let shutdown_called = Arc::new(Mutex::new(false));

opentelemetry-sdk/src/logs/log_processor.rs

@@ -536,7 +536,7 @@ mod tests {
 
     #[derive(Debug, Clone)]
     struct MockLogExporter {
-        resource: Arc<Option<Resource>>,
+        resource: Arc<Mutex<Option<Resource>>>,
     }
 
     #[async_trait]
@@ -548,15 +548,19 @@ mod tests {
         fn shutdown(&mut self) {}
 
         fn set_resource(&mut self, resource: &Resource) {
-            let res = Arc::make_mut(&mut self.resource);
-            *res = Some(resource.clone());
+            self.resource
+                .lock()
+                .map(|mut res_opt| {
+                    res_opt.replace(resource.clone());
+                })
+                .expect("mock log exporter shouldn't error when setting resource");
         }
     }
 
     // Implementation specific to the MockLogExporter, not part of the LogExporter trait
     impl MockLogExporter {
         fn get_resource(&self) -> Option<Resource> {
-            (*self.resource).clone()
+            (*self.resource).lock().unwrap().clone()
         }
     }
 
@@ -713,7 +717,7 @@ mod tests {
     #[test]
     fn test_set_resource_simple_processor() {
         let exporter = MockLogExporter {
-            resource: Arc::new(Some(Resource::default())),
+            resource: Arc::new(Mutex::new(None)),
         };
         let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
         let _ = LoggerProvider::builder()
@@ -723,15 +727,16 @@ mod tests {
                 KeyValue::new("k2", "v3"),
                 KeyValue::new("k3", "v3"),
                 KeyValue::new("k4", "v4"),
+                KeyValue::new("k5", "v5"),
             ]))
             .build();
-        assert_eq!(exporter.get_resource().unwrap().into_iter().count(), 4);
+        assert_eq!(exporter.get_resource().unwrap().into_iter().count(), 5);
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
     async fn test_set_resource_batch_processor() {
         let exporter = MockLogExporter {
-            resource: Arc::new(Some(Resource::default())),
+            resource: Arc::new(Mutex::new(None)),
         };
         let processor = BatchLogProcessor::new(
             Box::new(exporter.clone()),
@@ -745,9 +750,11 @@ mod tests {
                 KeyValue::new("k2", "v3"),
                 KeyValue::new("k3", "v3"),
                 KeyValue::new("k4", "v4"),
+                KeyValue::new("k5", "v5"),
             ]))
             .build();
-        assert_eq!(exporter.get_resource().unwrap().into_iter().count(), 4);
+        tokio::time::sleep(Duration::from_secs(2)).await; // set resource in batch span processor is not blocking. Should we make it blocking?
+        assert_eq!(exporter.get_resource().unwrap().into_iter().count(), 5);
         let _ = provider.shutdown();
     }