Merge branch 'main' into cijothomas/periodicreader-defaults

Author: cijothomas

Cargo.toml

@@ -39,7 +39,7 @@ reqwest = { version = "0.12", default-features = false }
 serde = { version = "1.0", default-features = false }
 serde_json = "1.0"
 temp-env = "0.3.6"
-thiserror = { version = "1", default-features = false }
+thiserror = { version = "2", default-features = false }
 tonic = { version = "0.12.3", default-features = false }
 tonic-build = "0.12"
 tokio = { version = "1", default-features = false }

examples/README.md

@@ -7,7 +7,7 @@ This directory contains some examples that should help you get start crates from
 This example uses following crates from this repo:
 
 - opentelemetry(log)
-- opentelemetry-appender-log
+- opentelemetry-appender-tracing
 - opentelemetry-stdout
 
 Check this example if you want to understand *how to instrument logs using opentelemetry*.

examples/self-diagnostics/Cargo.toml

@@ -35,6 +35,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [dev-dependencies]
 criterion = { workspace = true, features = ["html_reports"] }
+rstest = "0.23.0"
 temp-env = { workspace = true }
 
 [target.'cfg(not(target_os = "windows"))'.dev-dependencies]

examples/self-diagnostics/README.md

@@ -11,7 +11,7 @@ pub type LogResult<T> = Result<T, LogError>;
 /// Errors returned by the log SDK.
 pub enum LogError {
     /// Export failed with the error returned by the exporter.
-    #[error("Exporter {} encountered the following errors: {0}", .0.exporter_name())]
+    #[error("Exporter {0} encountered the following errors: {name}", name = .0.exporter_name())]
     ExportFailed(Box<dyn ExportError>),
 
     /// Export failed to finish after certain period and processor stopped the export.

examples/self-diagnostics/src/main.rs

@@ -18,7 +18,7 @@ pub enum MetricError {
     #[error("Config error {0}")]
     Config(String),
     /// Fail to export metrics
-    #[error("Metrics exporter {} failed with {0}", .0.exporter_name())]
+    #[error("Metrics exporter {0} failed with {name}", name = .0.exporter_name())]
     ExportErr(Box<dyn ExportError>),
     /// Invalid instrument configuration such invalid instrument name, invalid instrument description, invalid instrument unit, etc.
     /// See [spec](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#general-characteristics)

opentelemetry-sdk/Cargo.toml

@@ -263,6 +263,8 @@ pub trait ResourceDetector {
 
 #[cfg(test)]
 mod tests {
+    use rstest::rstest;
+
     use super::*;
 
     #[test]
@@ -308,47 +310,55 @@ mod tests {
         assert_eq!(resource_a.merge(&resource_b), expected_resource);
     }
 
-    #[test]
-    fn merge_resource_schema_url() {
-        // if both resources contains key value pairs
-        let test_cases = vec![
-            (Some("http://schema/a"), None, Some("http://schema/a")),
-            (Some("http://schema/a"), Some("http://schema/b"), None),
-            (None, Some("http://schema/b"), Some("http://schema/b")),
-            (
-                Some("http://schema/a"),
-                Some("http://schema/a"),
-                Some("http://schema/a"),
-            ),
-            (None, None, None),
-        ];
-
-        for (schema_url_a, schema_url_b, expected_schema_url) in test_cases.into_iter() {
-            let resource_a = Resource::from_schema_url(
-                vec![KeyValue::new("key", "")],
-                schema_url_a.unwrap_or(""),
-            );
-            let resource_b = Resource::from_schema_url(
-                vec![KeyValue::new("key", "")],
-                schema_url_b.unwrap_or(""),
-            );
-
-            let merged_resource = resource_a.merge(&resource_b);
-            let result_schema_url = merged_resource.schema_url();
-
-            assert_eq!(
-                result_schema_url.map(|s| s as &str),
-                expected_schema_url,
-                "Merging schema_url_a {:?} with schema_url_b {:?} did not yield expected result {:?}",
-                schema_url_a, schema_url_b, expected_schema_url
-            );
-        }
-
-        // if only one resource contains key value pairs
-        let resource = Resource::from_schema_url(vec![], "http://schema/a");
-        let other_resource = Resource::new(vec![KeyValue::new("key", "")]);
+    #[rstest]
+    #[case(Some("http://schema/a"), None, Some("http://schema/a"))]
+    #[case(Some("http://schema/a"), Some("http://schema/b"), None)]
+    #[case(None, Some("http://schema/b"), Some("http://schema/b"))]
+    #[case(
+        Some("http://schema/a"),
+        Some("http://schema/a"),
+        Some("http://schema/a")
+    )]
+    #[case(None, None, None)]
+    fn merge_resource_schema_url(
+        #[case] schema_url_a: Option<&'static str>,
+        #[case] schema_url_b: Option<&'static str>,
+        #[case] expected_schema_url: Option<&'static str>,
+    ) {
+        let resource_a =
+            Resource::from_schema_url(vec![KeyValue::new("key", "")], schema_url_a.unwrap_or(""));
+        let resource_b =
+            Resource::from_schema_url(vec![KeyValue::new("key", "")], schema_url_b.unwrap_or(""));
+
+        let merged_resource = resource_a.merge(&resource_b);
+        let result_schema_url = merged_resource.schema_url();
+
+        assert_eq!(
+            result_schema_url.map(|s| s as &str),
+            expected_schema_url,
+            "Merging schema_url_a {:?} with schema_url_b {:?} did not yield expected result {:?}",
+            schema_url_a,
+            schema_url_b,
+            expected_schema_url
+        );
+    }
 
-        assert_eq!(resource.merge(&other_resource).schema_url(), None);
+    #[rstest]
+    #[case(vec![], vec![KeyValue::new("key", "b")], "http://schema/a", None)]
+    #[case(vec![KeyValue::new("key", "a")], vec![KeyValue::new("key", "b")], "http://schema/a", Some("http://schema/a"))]
+    fn merge_resource_with_missing_attribtes(
+        #[case] key_values_a: Vec<KeyValue>,
+        #[case] key_values_b: Vec<KeyValue>,
+        #[case] schema_url: &'static str,
+        #[case] expected_schema_url: Option<&'static str>,
+    ) {
+        let resource = Resource::from_schema_url(key_values_a, schema_url);
+        let other_resource = Resource::new(key_values_b);
+
+        assert_eq!(
+            resource.merge(&other_resource).schema_url(),
+            expected_schema_url
+        );
     }
 
     #[test]

opentelemetry-sdk/src/logs/error.rs

@@ -336,7 +336,7 @@ impl Builder {
 
     /// Specify the number of events to be recorded per span.
     pub fn with_max_events_per_span(mut self, max_events: u32) -> Self {
-        self.config.span_limits.max_attributes_per_span = max_events;
+        self.config.span_limits.max_events_per_span = max_events;
         self
     }