Merge branch 'main' into appender-tracing-fix-trace-context

Author: cijothomas

.cspell.json

@@ -26,6 +26,7 @@
     // workspace dictionary.
     "words": [
         "actix",
+        "anyvalue",
         "appender",
         "appenders",
         "Bhasin",
@@ -37,6 +38,7 @@
         "deque",
         "Dirkjan",
         "EPYC",
+        "flamegraph",
         "hasher",
         "Isobel",
         "jaegertracing",
@@ -53,6 +55,7 @@
         "OTELCOL",
         "OTLP",
         "periodicreader",
+        "pprof",
         "prost",
         "protoc",
         "quantile",

.github/workflows/integration_tests.yml

@@ -9,7 +9,6 @@ jobs:
   integration_tests:
     runs-on: ubuntu-latest
     timeout-minutes: 10
-    if: ${{ github.event.label.name == 'integration tests' || contains(github.event.pull_request.labels.*.name, 'integration tests') }}
     steps:
       - name: Free disk space
         run: |

opentelemetry-appender-tracing/Cargo.toml

@@ -29,7 +29,7 @@ criterion = { workspace = true }
 tokio = { workspace = true, features = ["full"]}
 
 [target.'cfg(not(target_os = "windows"))'.dev-dependencies]
-pprof = { version = "0.13", features = ["flamegraph", "criterion"] }
+pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
 
 [features]
 experimental_metadata_attributes = ["dep:tracing-log"]

opentelemetry-sdk/CHANGELOG.md

@@ -212,6 +212,9 @@ metadata, a feature introduced in version 0.1.40. [#2418](https://github.com/ope
         .build();
       ```
 
+      This implementation does not support multiple concurrent exports
+      (`with_max_concurrent_exports` is not supported).
+
     The new BatchLogProcessor can be used with OTLP Exporter, and supports
     following exporter features:
     - `grpc-tonic`: This requires `MeterProvider` to be created within a tokio
@@ -269,6 +272,8 @@ re-introduced in a future date, along with the ability to change the cardinality
 limit.
 
 - *Breaking* Removed unused `opentelemetry_sdk::Error` enum.
+- *Breaking* Resource.get() modified to require reference to Key instead of owned.
+  Replace `get(Key::from_static_str("key"))` with `get(&Key::from_static_str("key"))`
 - *Breaking* (Affects custom Exporter authors only) Moved `ExportError` trait from `opentelemetry::export::ExportError` to `opentelemetry_sdk::ExportError`
 - *Breaking (Affects custom SpanExporter, SpanProcessor authors only)*: Rename namespaces for Span exporter structs/traits
   before:
@@ -283,9 +288,12 @@ limit.
   `opentelemetry_sdk::logs::{ExportResult, LogBatch, LogExporter};`
 
 - *Breaking* `opentelemetry_sdk::LogRecord::default()` method is removed.
-  The only way to create log record outside opentelemetry_sdk crate is using 
+  The only way to create log record outside opentelemetry_sdk crate is using
   `Logger::create_log_record()` method.
 
+- Rename `opentelemetry_sdk::logs::Builder` to `opentelemetry_sdk::logs::LoggerProviderBuilder`.
+- Rename `opentelemetry_sdk::trace::Builder` to  `opentelemetry_sdk::trace::TracerProviderBuilder`.
+
 - *Breaking*: Rename namespaces for InMemoryExporters. (The module is still under "testing" feature flag)
   before:
   `opentelemetry_sdk::testing::logs::{InMemoryLogExporter, InMemoryLogExporterBuilder};`

opentelemetry-sdk/Cargo.toml

@@ -39,7 +39,7 @@ rstest = "0.23.0"
 temp-env = { workspace = true }
 
 [target.'cfg(not(target_os = "windows"))'.dev-dependencies]
-pprof = { version = "0.13", features = ["flamegraph", "criterion"] }
+pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
 
 [features]
 default = ["trace", "metrics", "logs", "internal-logs"]

opentelemetry-sdk/src/logs/log_emitter.rs renamed to opentelemetry-sdk/src/logs/logger_provider.rs

@@ -6,7 +6,7 @@ use opentelemetry::{otel_debug, otel_info, trace::TraceContextExt, Context, Inst
 #[cfg(feature = "spec_unstable_logs_enabled")]
 use opentelemetry::logs::Severity;
 
-use std::time::SystemTime;
+use opentelemetry::time::now;
 use std::{
     borrow::Cow,
     sync::{
@@ -78,8 +78,8 @@ impl opentelemetry::logs::LoggerProvider for LoggerProvider {
 
 impl LoggerProvider {
     /// Create a new `LoggerProvider` builder.
-    pub fn builder() -> Builder {
-        Builder::default()
+    pub fn builder() -> LoggerProviderBuilder {
+        LoggerProviderBuilder::default()
     }
 
     pub(crate) fn log_processors(&self) -> &[Box<dyn LogProcessor>] {
@@ -179,12 +179,12 @@ impl Drop for LoggerProviderInner {
 
 #[derive(Debug, Default)]
 /// Builder for provider attributes.
-pub struct Builder {
+pub struct LoggerProviderBuilder {
     processors: Vec<Box<dyn LogProcessor>>,
     resource: Option<Resource>,
 }
 
-impl Builder {
+impl LoggerProviderBuilder {
     /// Adds a [SimpleLogProcessor] with the configured exporter to the pipeline.
     ///
     /// # Arguments
@@ -200,7 +200,7 @@ impl Builder {
         let mut processors = self.processors;
         processors.push(Box::new(SimpleLogProcessor::new(exporter)));
 
-        Builder { processors, ..self }
+        LoggerProviderBuilder { processors, ..self }
     }
 
     /// Adds a [BatchLogProcessor] with the configured exporter to the pipeline.
@@ -234,12 +234,12 @@ impl Builder {
         let mut processors = self.processors;
         processors.push(Box::new(processor));
 
-        Builder { processors, ..self }
+        LoggerProviderBuilder { processors, ..self }
     }
 
     /// The `Resource` to be associated with this Provider.
     pub fn with_resource(self, resource: Resource) -> Self {
-        Builder {
+        LoggerProviderBuilder {
             resource: Some(resource),
             ..self
         }
@@ -313,7 +313,7 @@ impl opentelemetry::logs::Logger for Logger {
             }
         }
         if record.observed_timestamp.is_none() {
-            record.observed_timestamp = Some(SystemTime::now());
+            record.observed_timestamp = Some(now());
         }
 
         for p in processors {
@@ -403,22 +403,22 @@ mod tests {
             assert_eq!(
                 provider
                     .resource()
-                    .get(Key::from_static_str(resource_key))
+                    .get(&Key::from_static_str(resource_key))
                     .map(|v| v.to_string()),
                 expect.map(|s| s.to_string())
             );
         };
         let assert_telemetry_resource = |provider: &super::LoggerProvider| {
             assert_eq!(
-                provider.resource().get(TELEMETRY_SDK_LANGUAGE.into()),
+                provider.resource().get(&TELEMETRY_SDK_LANGUAGE.into()),
                 Some(Value::from("rust"))
             );
             assert_eq!(
-                provider.resource().get(TELEMETRY_SDK_NAME.into()),
+                provider.resource().get(&TELEMETRY_SDK_NAME.into()),
                 Some(Value::from("opentelemetry"))
             );
             assert_eq!(
-                provider.resource().get(TELEMETRY_SDK_VERSION.into()),
+                provider.resource().get(&TELEMETRY_SDK_VERSION.into()),
                 Some(Value::from(env!("CARGO_PKG_VERSION")))
             );
         };

opentelemetry-sdk/src/logs/mod.rs

@@ -1,8 +1,8 @@
 //! # OpenTelemetry Log SDK
 mod error;
 mod export;
-mod log_emitter;
 mod log_processor;
+mod logger_provider;
 pub(crate) mod record;
 
 /// In-Memory log exporter for testing purpose.
@@ -15,11 +15,11 @@ pub use in_memory_exporter::{InMemoryLogExporter, InMemoryLogExporterBuilder};
 
 pub use error::{LogError, LogResult};
 pub use export::{ExportResult, LogBatch, LogExporter};
-pub use log_emitter::{Builder, Logger, LoggerProvider};
 pub use log_processor::{
     BatchConfig, BatchConfigBuilder, BatchLogProcessor, BatchLogProcessorBuilder, LogProcessor,
     SimpleLogProcessor,
 };
+pub use logger_provider::{Logger, LoggerProvider, LoggerProviderBuilder};
 pub use record::{LogRecord, TraceContext};
 
 #[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]

opentelemetry-sdk/src/metrics/meter_provider.rs

@@ -319,7 +319,7 @@ mod tests {
             assert_eq!(
                 provider.inner.pipes.0[0]
                     .resource
-                    .get(Key::from_static_str(resource_key))
+                    .get(&Key::from_static_str(resource_key))
                     .map(|v| v.to_string()),
                 expect.map(|s| s.to_string())
             );
@@ -328,19 +328,19 @@ mod tests {
             assert_eq!(
                 provider.inner.pipes.0[0]
                     .resource
-                    .get(TELEMETRY_SDK_LANGUAGE.into()),
+                    .get(&TELEMETRY_SDK_LANGUAGE.into()),
                 Some(Value::from("rust"))
             );
             assert_eq!(
                 provider.inner.pipes.0[0]
                     .resource
-                    .get(TELEMETRY_SDK_NAME.into()),
+                    .get(&TELEMETRY_SDK_NAME.into()),
                 Some(Value::from("opentelemetry"))
             );
             assert_eq!(
                 provider.inner.pipes.0[0]
                     .resource
-                    .get(TELEMETRY_SDK_VERSION.into()),
+                    .get(&TELEMETRY_SDK_VERSION.into()),
                 Some(Value::from(env!("CARGO_PKG_VERSION")))
             );
         };

opentelemetry-sdk/src/resource/env.rs

@@ -84,7 +84,7 @@ impl ResourceDetector for SdkProvidedResourceDetector {
                     .or_else(|| {
                         EnvResourceDetector::new()
                             .detect()
-                            .get(Key::new(super::SERVICE_NAME))
+                            .get(&Key::new(super::SERVICE_NAME))
                     })
                     .unwrap_or_else(|| "unknown_service".into()),
             )])
@@ -138,14 +138,14 @@ mod tests {
         // Ensure no env var set
         let no_env = SdkProvidedResourceDetector.detect();
         assert_eq!(
-            no_env.get(Key::from_static_str(crate::resource::SERVICE_NAME)),
+            no_env.get(&Key::from_static_str(crate::resource::SERVICE_NAME)),
             Some(Value::from("unknown_service")),
         );
 
         temp_env::with_var(OTEL_SERVICE_NAME, Some("test service"), || {
             let with_service = SdkProvidedResourceDetector.detect();
             assert_eq!(
-                with_service.get(Key::from_static_str(crate::resource::SERVICE_NAME)),
+                with_service.get(&Key::from_static_str(crate::resource::SERVICE_NAME)),
                 Some(Value::from("test service")),
             )
         });
@@ -156,7 +156,7 @@ mod tests {
             || {
                 let with_service = SdkProvidedResourceDetector.detect();
                 assert_eq!(
-                    with_service.get(Key::from_static_str(crate::resource::SERVICE_NAME)),
+                    with_service.get(&Key::from_static_str(crate::resource::SERVICE_NAME)),
                     Some(Value::from("test service1")),
                 )
             },
@@ -171,7 +171,7 @@ mod tests {
             || {
                 let with_service = SdkProvidedResourceDetector.detect();
                 assert_eq!(
-                    with_service.get(Key::from_static_str(crate::resource::SERVICE_NAME)),
+                    with_service.get(&Key::from_static_str(crate::resource::SERVICE_NAME)),
                     Some(Value::from("test service"))
                 );
             },

opentelemetry-sdk/src/resource/mod.rs

@@ -54,10 +54,11 @@ pub struct Resource {
 impl Resource {
     /// Creates a [ResourceBuilder] that allows you to configure multiple aspects of the Resource.
     ///
-    /// This [ResourceBuilder] will always include the following [ResourceDetector]s:
+    /// This [ResourceBuilder] will include the following [ResourceDetector]s:
     /// - [SdkProvidedResourceDetector]
     /// - [TelemetryResourceDetector]
     /// - [EnvResourceDetector]
+    ///   If you'd like to start from an empty resource, use [Resource::builder_empty].
     pub fn builder() -> ResourceBuilder {
         ResourceBuilder {
             resource: Self::from_detectors(&[
@@ -138,8 +139,6 @@ impl Resource {
     }
 
     /// Create a new `Resource` from resource detectors.
-    ///
-    /// timeout will be applied to each detector.
     fn from_detectors(detectors: &[Box<dyn ResourceDetector>]) -> Self {
         let mut resource = Resource::empty();
         for detector in detectors {
@@ -227,8 +226,8 @@ impl Resource {
     }
 
     /// Retrieve the value from resource associate with given key.
-    pub fn get(&self, key: Key) -> Option<Value> {
-        self.inner.attrs.get(&key).cloned()
+    pub fn get(&self, key: &Key) -> Option<Value> {
+        self.inner.attrs.get(key).cloned()
     }
 }
 
@@ -260,8 +259,6 @@ impl<'a> IntoIterator for &'a Resource {
 pub trait ResourceDetector {
     /// detect returns an initialized Resource based on gathered information.
     ///
-    /// timeout is used in case the detection operation takes too much time.
-    ///
     /// If source information to construct a Resource is inaccessible, an empty Resource should be returned
     ///
     /// If source information to construct a Resource is invalid, for example,