Merge branch 'main' into cijothomas/batch-log-env-var-tes

Author: cijothomas

opentelemetry-otlp/tests/integration_test/Cargo.toml

@@ -29,6 +29,7 @@ reqwest-client = ["opentelemetry-otlp/reqwest-client", "opentelemetry-otlp/http-
 reqwest-blocking-client = ["opentelemetry-otlp/reqwest-blocking-client", "opentelemetry-otlp/http-proto", "opentelemetry-otlp/trace","opentelemetry-otlp/logs", "opentelemetry-otlp/metrics", "internal-logs"]
 tonic-client = ["opentelemetry-otlp/grpc-tonic", "opentelemetry-otlp/trace", "opentelemetry-otlp/logs", "opentelemetry-otlp/metrics", "internal-logs"]
 internal-logs = ["opentelemetry-otlp/internal-logs"]
+experimental_metadata_attributes = ["opentelemetry-appender-tracing/experimental_metadata_attributes"]
 
 # Keep tonic as the default client
 default = ["tonic-client", "internal-logs"]

opentelemetry-otlp/tests/integration_test/src/logs_asserter.rs

@@ -1,5 +1,8 @@
 use anyhow::Result;
-use opentelemetry_proto::tonic::logs::v1::{LogRecord, LogsData, ResourceLogs};
+use opentelemetry_proto::tonic::{
+    common::v1::KeyValue,
+    logs::v1::{LogRecord, LogsData, ResourceLogs},
+};
 use std::fs::File;
 
 // Given two ResourceLogs, assert that they are equal except for the timestamps
@@ -75,8 +78,22 @@ impl PartialEq for LogRecordWrapper {
             a.severity_text, b.severity_text,
             "severity_text does not match"
         );
+        let a_attrs = a.attributes.clone();
+        #[cfg(feature = "experimental_metadata_attributes")]
+        let a_attrs: Vec<_> = a_attrs
+            .into_iter()
+            .filter(|KeyValue { key, .. }| !key.as_str().starts_with("code."))
+            .collect();
+
+        let b_attrs = b.attributes.clone();
+        #[cfg(feature = "experimental_metadata_attributes")]
+        let b_attrs: Vec<_> = b_attrs
+            .into_iter()
+            .filter(|KeyValue { key, .. }| !key.as_str().starts_with("code."))
+            .collect();
+
         assert_eq!(a.body, b.body, "body does not match");
-        assert_eq!(a.attributes, b.attributes, "attributes do not match");
+        assert_eq!(a_attrs, b_attrs, "attributes do not match");
         assert_eq!(
             a.dropped_attributes_count, b.dropped_attributes_count,
             "dropped_attributes_count does not match"

opentelemetry-otlp/tests/integration_test/tests/logs.rs

@@ -255,6 +255,7 @@ mod logtests {
     // current thread
     #[test]
     #[cfg(feature = "reqwest-blocking-client")]
+    #[cfg(not(feature = "tonic-client"))]
     pub fn logs_batch_non_tokio_main_with_init_logs_outside_rt() -> Result<()> {
         logs_non_tokio_helper(false, false)
     }
@@ -295,7 +296,8 @@ mod logtests {
     // Client - Reqwest-blocking
     #[test]
     #[cfg(feature = "reqwest-blocking-client")]
-    pub fn logs_simple_non_tokio_main_with_init_logs_outsie_rt_blocking() -> Result<()> {
+    #[cfg(not(feature = "tonic-client"))]
+    pub fn logs_simple_non_tokio_main_with_init_logs_outside_rt_blocking() -> Result<()> {
         logs_non_tokio_helper(true, false)
     }
 
@@ -309,7 +311,7 @@ mod logtests {
         feature = "tonic-client",
         feature = "reqwest-client"
     ))]
-    pub fn logs_simple_non_tokio_main_with_init_logs_outsie_rt() -> Result<()> {
+    pub fn logs_simple_non_tokio_main_with_init_logs_outside_rt() -> Result<()> {
         logs_non_tokio_helper(true, false)
     }
 

opentelemetry-otlp/tests/integration_test/tests/logs_serialize_deserialize.rs

@@ -37,7 +37,7 @@ pub async fn test_logs() -> Result<()> {
         info!(target: "my-target", "hello from {}. My price is {}.", "banana", 2.99);
     }
 
-    let _ = logger_provider.shutdown();
+    logger_provider.shutdown().unwrap();
     tokio::time::sleep(std::time::Duration::from_secs(5)).await;
     assert_logs_results(test_utils::LOGS_FILE, "expected/logs.json")?;
     Ok(())