Merge branch 'main' into zhongyang/add-propagation-errors

Author: TommyCpp

Cargo.toml

@@ -1,31 +1,14 @@
 [workspace]
 members = [
     "opentelemetry",
-    "opentelemetry-http",
-    "opentelemetry-jaeger",
-    "opentelemetry-jaeger/examples/actix-udp",
-    "opentelemetry-jaeger/examples/remote-sampler",
-    "opentelemetry-jaeger-propagator",
-    "opentelemetry-appender-log",
-    "opentelemetry-appender-tracing",
-    "opentelemetry-otlp",
-    "opentelemetry-prometheus",
-    "opentelemetry-proto",
-    "opentelemetry-sdk",
-    "opentelemetry-semantic-conventions",
-    "opentelemetry-stdout",
-    "opentelemetry-zipkin",
-    "opentelemetry-otlp/examples/basic-otlp",
-    "opentelemetry-otlp/examples/basic-otlp-http",
-    "opentelemetry-otlp/tests/integration_test",
-    "examples/metrics-basic",
-    "examples/metrics-advanced",
-    "examples/logs-basic",
-    "examples/tracing-grpc",
-    "examples/tracing-http-propagator",
-    "examples/tracing-jaeger",
+    "opentelemetry-*",
+    "opentelemetry-*/examples/*",
+    "opentelemetry-otlp/tests/*",
+    "examples/*",
     "stress",
 ]
+# Any deleted crates with remaining README
+exclude = []
 resolver = "2"
 
 [profile.bench]

examples/logs-basic/Cargo.toml

@@ -10,5 +10,6 @@ opentelemetry = { path = "../../opentelemetry", features = ["logs"] }
 opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["logs"] }
 opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["logs"]}
 opentelemetry-appender-log = { path = "../../opentelemetry-appender-log", default-features = false}
+opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" }
 log = { workspace = true }
 serde_json = { workspace = true }

examples/logs-basic/src/main.rs

@@ -3,6 +3,7 @@ use opentelemetry::KeyValue;
 use opentelemetry_appender_log::OpenTelemetryLogBridge;
 use opentelemetry_sdk::logs::{Config, LoggerProvider};
 use opentelemetry_sdk::Resource;
+use opentelemetry_semantic_conventions::resource::SERVICE_NAME;
 
 fn main() {
     // Setup LoggerProvider with a stdout exporter
@@ -14,7 +15,7 @@ fn main() {
     let logger_provider = LoggerProvider::builder()
         .with_config(
             Config::default().with_resource(Resource::new(vec![KeyValue::new(
-                "service.name",
+                SERVICE_NAME,
                 "logs-basic-example",
             )])),
         )

examples/metrics-advanced/src/main.rs

@@ -1,7 +1,7 @@
 use opentelemetry::global;
 use opentelemetry::metrics::Unit;
 use opentelemetry::Key;
-use opentelemetry::{metrics::MeterProvider as _, KeyValue};
+use opentelemetry::KeyValue;
 use opentelemetry_sdk::metrics::{
     Aggregation, Instrument, PeriodicReader, SdkMeterProvider, Stream,
 };

examples/metrics-basic/src/main.rs

@@ -1,6 +1,6 @@
 use opentelemetry::global;
 use opentelemetry::metrics::Unit;
-use opentelemetry::{metrics::MeterProvider as _, KeyValue};
+use opentelemetry::KeyValue;
 use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider};
 use opentelemetry_sdk::{runtime, Resource};
 use std::error::Error;

examples/tracing-jaeger/Cargo.toml

@@ -9,4 +9,5 @@ publish = false
 opentelemetry = { path = "../../opentelemetry" }
 opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] }
 opentelemetry-otlp = { path = "../../opentelemetry-otlp", features = ["tonic"] }
+opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" }
 tokio = { workspace = true, features = ["full"] }

examples/tracing-jaeger/src/main.rs

@@ -6,6 +6,8 @@ use opentelemetry::{
 };
 use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::{runtime, trace as sdktrace, Resource};
+use opentelemetry_semantic_conventions::resource::SERVICE_NAME;
+
 use std::error::Error;
 
 fn init_tracer() -> Result<opentelemetry_sdk::trace::Tracer, TraceError> {
@@ -18,7 +20,7 @@ fn init_tracer() -> Result<opentelemetry_sdk::trace::Tracer, TraceError> {
         )
         .with_trace_config(
             sdktrace::config().with_resource(Resource::new(vec![KeyValue::new(
-                "service.name",
+                SERVICE_NAME,
                 "tracing-jaeger",
             )])),
         )

opentelemetry-appender-tracing/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## vNext
 
+- Removed unwanted dependency on opentelemetry-sdk.
+
 ## v0.3.0
 
 ### Added

opentelemetry-appender-tracing/Cargo.toml

@@ -14,7 +14,6 @@ rust-version = "1.65"
 log = { workspace = true, optional = true }
 once_cell = { workspace = true }
 opentelemetry = { version = "0.22", path = "../opentelemetry", features = ["logs"] }
-opentelemetry_sdk = { version = "0.22", path = "../opentelemetry-sdk", features = ["logs"] }
 tracing = { workspace = true, features = ["std"]}
 tracing-core = { workspace = true }
 tracing-log = { version = "0.2", optional = true }

opentelemetry-sdk/CHANGELOG.md

@@ -7,8 +7,11 @@
   [1612](https://github.com/open-telemetry/opentelemetry-rust/pull/1612/files)
 - [#1422](https://github.com/open-telemetry/opentelemetry-rust/pull/1422)
   Fix metrics aggregation bug when using Views to drop attributes.
-- [#1623](https://github.com/open-telemetry/opentelemetry-rust/pull/1623) Add Drop implementation for SdkMeterProvider, which shuts down
-metricreaders, thereby allowing metrics still in memory to be flushed out.
+- [#1623](https://github.com/open-telemetry/opentelemetry-rust/pull/1623) Add Drop implementation for SdkMeterProvider,
+  which shuts down metricreaders, thereby allowing metrics still in memory to be flushed out.
+- **Breaking** [#1624](https://github.com/open-telemetry/opentelemetry-rust/pull/1624) Remove `OsResourceDetector` and
+  `ProcessResourceDetector` resource detectors, use the
+  [`opentelemetry-resource-detector`](https://crates.io/crates/opentelemetry-resource-detectors) instead.
 
 ## v0.22.1
 

opentelemetry-sdk/src/metrics/internal/aggregate.rs

@@ -93,7 +93,7 @@ impl<T: Number<T>> AggregateBuilder<T> {
 
     /// Wraps the passed in measure with an attribute filtering function.
     fn filter(&self, f: impl Measure<T>) -> impl Measure<T> {
-        let filter = self.filter.as_ref().map(Arc::clone);
+        let filter = self.filter.clone();
         move |n, mut attrs: AttributeSet| {
             if let Some(filter) = &filter {
                 attrs.retain(filter.as_ref());

opentelemetry-sdk/src/metrics/pipeline.rs

@@ -386,8 +386,7 @@ where
         let cached = cache.entry(id).or_insert_with(|| {
             let filter = stream
                 .allowed_attribute_keys
-                .as_ref()
-                .map(Arc::clone)
+                .clone()
                 .map(|allowed| Arc::new(move |kv: &KeyValue| allowed.contains(&kv.key)) as Arc<_>);
 
             let b = AggregateBuilder::new(Some(self.pipeline.reader.temporality(kind)), filter);
@@ -409,10 +408,10 @@ where
             Ok(Some(m))
         });
 
-        cached
-            .as_ref()
-            .map(|o| o.as_ref().map(Arc::clone))
-            .map_err(|e| MetricsError::Other(e.to_string()))
+        match cached {
+            Ok(opt) => Ok(opt.clone()),
+            Err(err) => Err(MetricsError::Other(err.to_string())),
+        }
     }
 
     /// Validates if an instrument with the same name as id has already been created.

opentelemetry-sdk/src/resource/attributes.rs

@@ -0,0 +1,32 @@
+/// Logical name of the service.
+///
+/// MUST be the same for all instances of horizontally scaled services. If the value was not specified, SDKs MUST fallback to `unknown_service:` concatenated with [`process.executable.name`](process.md#process), e.g. `unknown_service:bash`. If `process.executable.name` is not available, the value MUST be set to `unknown_service`.
+///
+/// # Examples
+///
+/// - `shoppingcart`
+pub(crate) const SERVICE_NAME: &str = "service.name";
+
+/// The language of the telemetry SDK.
+pub(crate) const TELEMETRY_SDK_LANGUAGE: &str = "telemetry.sdk.language";
+
+/// The name of the telemetry SDK as defined above.
+///
+/// The OpenTelemetry SDK MUST set the `telemetry.sdk.name` attribute to `opentelemetry`.
+/// If another SDK, like a fork or a vendor-provided implementation, is used, this SDK MUST set the
+/// `telemetry.sdk.name` attribute to the fully-qualified class or module name of this SDK's main entry point
+/// or another suitable identifier depending on the language.
+/// The identifier `opentelemetry` is reserved and MUST NOT be used in this case.
+/// All custom identifiers SHOULD be stable across different versions of an implementation.
+///
+/// # Examples
+///
+/// - `opentelemetry`
+pub(crate) const TELEMETRY_SDK_NAME: &str = "telemetry.sdk.name";
+
+/// The version string of the telemetry SDK.
+///
+/// # Examples
+///
+/// - `1.2.3`
+pub(crate) const TELEMETRY_SDK_VERSION: &str = "telemetry.sdk.version";

opentelemetry-sdk/src/resource/env.rs

@@ -76,15 +76,15 @@ pub struct SdkProvidedResourceDetector;
 impl ResourceDetector for SdkProvidedResourceDetector {
     fn detect(&self, _timeout: Duration) -> Resource {
         Resource::new(vec![KeyValue::new(
-            "service.name",
+            super::SERVICE_NAME,
             env::var(OTEL_SERVICE_NAME)
                 .ok()
                 .filter(|s| !s.is_empty())
                 .map(Value::from)
                 .or_else(|| {
                     EnvResourceDetector::new()
                         .detect(Duration::from_secs(0))
-                        .get(Key::new("service.name"))
+                        .get(Key::new(super::SERVICE_NAME))
                 })
                 .unwrap_or_else(|| "unknown_service".into()),
         )])
@@ -132,18 +132,17 @@ mod tests {
 
     #[test]
     fn test_sdk_provided_resource_detector() {
-        const SERVICE_NAME: &str = "service.name";
         // Ensure no env var set
         let no_env = SdkProvidedResourceDetector.detect(Duration::from_secs(1));
         assert_eq!(
-            no_env.get(Key::from_static_str(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(Duration::from_secs(1));
             assert_eq!(
-                with_service.get(Key::from_static_str(SERVICE_NAME)),
+                with_service.get(Key::from_static_str(crate::resource::SERVICE_NAME)),
                 Some(Value::from("test service")),
             )
         });
@@ -154,7 +153,7 @@ mod tests {
             || {
                 let with_service = SdkProvidedResourceDetector.detect(Duration::from_secs(1));
                 assert_eq!(
-                    with_service.get(Key::from_static_str(SERVICE_NAME)),
+                    with_service.get(Key::from_static_str(crate::resource::SERVICE_NAME)),
                     Some(Value::from("test service1")),
                 )
             },
@@ -169,7 +168,7 @@ mod tests {
             || {
                 let with_service = SdkProvidedResourceDetector.detect(Duration::from_secs(1));
                 assert_eq!(
-                    with_service.get(Key::from_static_str(SERVICE_NAME)),
+                    with_service.get(Key::from_static_str(crate::resource::SERVICE_NAME)),
                     Some(Value::from("test service"))
                 );
             },

opentelemetry-sdk/src/resource/mod.rs

@@ -16,18 +16,17 @@
 //! SDK.
 //!
 //! - [`EnvResourceDetector`] - detect resource from environmental variables.
-//! - [`OsResourceDetector`] - detect OS from runtime.
-//! - [`ProcessResourceDetector`] - detect process information.
 //! - [`TelemetryResourceDetector`] - detect telemetry SDK's information.
+//!
+//! The OS and Process resource detectors are now packaged separately in the `opentelemetry-resource-detector` [crate](https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-resource-detectors).
 mod env;
-mod os;
-mod process;
 mod telemetry;
 
+mod attributes;
+pub(crate) use attributes::*;
+
 pub use env::EnvResourceDetector;
 pub use env::SdkProvidedResourceDetector;
-pub use os::OsResourceDetector;
-pub use process::ProcessResourceDetector;
 pub use telemetry::TelemetryResourceDetector;
 
 use opentelemetry::{Key, KeyValue, Value};

opentelemetry-sdk/src/resource/os.rs

@@ -19,9 +19,9 @@ pub struct TelemetryResourceDetector;
 impl ResourceDetector for TelemetryResourceDetector {
     fn detect(&self, _timeout: Duration) -> Resource {
         Resource::new(vec![
-            KeyValue::new("telemetry.sdk.name", "opentelemetry"),
-            KeyValue::new("telemetry.sdk.language", "rust"),
-            KeyValue::new("telemetry.sdk.version", env!("CARGO_PKG_VERSION")),
+            KeyValue::new(super::TELEMETRY_SDK_NAME, "opentelemetry"),
+            KeyValue::new(super::TELEMETRY_SDK_LANGUAGE, "rust"),
+            KeyValue::new(super::TELEMETRY_SDK_VERSION, env!("CARGO_PKG_VERSION")),
         ])
     }
 }

opentelemetry-sdk/src/resource/process.rs

@@ -29,3 +29,9 @@ impl IntoIterator for SpanLinks {
         self.links.into_iter()
     }
 }
+
+impl SpanLinks {
+    pub(crate) fn add_link(&mut self, link: Link) {
+        self.links.push(link);
+    }
+}