Merge branch 'main' into refactor/metric-exporters-non-plural

Author: cijothomas

opentelemetry-proto/src/transform/metrics.rs

@@ -8,7 +8,7 @@ pub mod tonic {
     use std::any::Any;
     use std::fmt;
 
-    use opentelemetry::{global, metrics::MetricError, Key, Value};
+    use opentelemetry::{otel_debug, Key, Value};
     use opentelemetry_sdk::metrics::data::{
         self, Exemplar as SdkExemplar, ExponentialHistogram as SdkExponentialHistogram,
         Gauge as SdkGauge, Histogram as SdkHistogram, Metric as SdkMetric,
@@ -97,10 +97,12 @@ pub mod tonic {
                 Temporality::Cumulative => AggregationTemporality::Cumulative,
                 Temporality::Delta => AggregationTemporality::Delta,
                 other => {
-                    opentelemetry::global::handle_error(MetricError::Other(format!(
-                        "Unknown temporality {:?}, using default instead.",
-                        other
-                    )));
+                    otel_debug!(
+                        name: "AggregationTemporality::Unknown",
+                        message = "Unknown temporality,using default instead.",
+                        unknown_temporality = format!("{:?}", other),
+                        default_temporality = format!("{:?}", Temporality::Cumulative)
+                    );
                     AggregationTemporality::Cumulative
                 }
             }
@@ -184,7 +186,11 @@ pub mod tonic {
             } else if let Some(gauge) = data.downcast_ref::<SdkGauge<f64>>() {
                 Ok(TonicMetricData::Gauge(gauge.into()))
             } else {
-                global::handle_error(MetricError::Other("unknown aggregator".into()));
+                otel_debug!(
+                    name: "TonicMetricData::UnknownAggregator",
+                    message= "Unknown aggregator type",
+                    unknown_type= format!("{:?}", data),
+                );
                 Err(())
             }
         }

opentelemetry-sdk/src/metrics/view.rs

@@ -1,9 +1,6 @@
 use super::instrument::{Instrument, Stream};
 use glob::Pattern;
-use opentelemetry::{
-    global,
-    metrics::{MetricError, MetricResult},
-};
+use opentelemetry::metrics::{MetricError, MetricResult};
 
 fn empty_view(_inst: &Instrument) -> Option<Stream> {
     None
@@ -102,19 +99,14 @@ impl View for Box<dyn View> {
 /// ```
 pub fn new_view(criteria: Instrument, mask: Stream) -> MetricResult<Box<dyn View>> {
     if criteria.is_empty() {
-        global::handle_error(MetricError::Config(format!(
-            "no criteria provided, dropping view. mask: {mask:?}"
-        )));
+        // TODO - The error is getting lost here. Need to return or log.
         return Ok(Box::new(empty_view));
     }
     let contains_wildcard = criteria.name.contains(['*', '?']);
-    let err_msg_criteria = criteria.clone();
 
     let match_fn: Box<dyn Fn(&Instrument) -> bool + Send + Sync> = if contains_wildcard {
         if mask.name != "" {
-            global::handle_error(MetricError::Config(format!(
-				"name replacement for multiple instruments, dropping view, criteria: {criteria:?}, mask: {mask:?}"
-			)));
+            // TODO - The error is getting lost here. Need to return or log.
             return Ok(Box::new(empty_view));
         }
 
@@ -137,11 +129,8 @@ pub fn new_view(criteria: Instrument, mask: Stream) -> MetricResult<Box<dyn View
     if let Some(ma) = &mask.aggregation {
         match ma.validate() {
             Ok(_) => agg = Some(ma.clone()),
-            Err(err) => {
-                global::handle_error(MetricError::Other(format!(
-                    "{}, proceeding as if view did not exist. criteria: {:?}, mask: {:?}",
-                    err, err_msg_criteria, mask
-                )));
+            Err(_) => {
+                // TODO - The error is getting lost here. Need to return or log.
                 return Ok(Box::new(empty_view));
             }
         }

opentelemetry-sdk/src/propagation/baggage.rs

@@ -1,8 +1,7 @@
 use once_cell::sync::Lazy;
-use opentelemetry::propagation::PropagationError;
 use opentelemetry::{
     baggage::{BaggageExt, KeyValueMetadata},
-    global,
+    otel_warn,
     propagation::{text_map_propagator::FieldIter, Extractor, Injector, TextMapPropagator},
     Context,
 };
@@ -120,24 +119,26 @@ impl TextMapPropagator for BaggagePropagator {
                                 decoded_props.as_str(),
                             ))
                         } else {
-                            global::handle_error(PropagationError::extract(
-                                "invalid UTF8 string in key values",
-                                "BaggagePropagator",
-                            ));
+                            otel_warn!(
+                                name: "BaggagePropagator.Extract.InvalidUTF8",
+                                message = "Invalid UTF8 string in key values",
+                                baggage_header = header_value,
+                            );
                             None
                         }
                     } else {
-                        global::handle_error(PropagationError::extract(
-                            "invalid baggage key-value format",
-                            "BaggagePropagator",
-                        ));
+                        otel_warn!(
+                            name: "BaggagePropagator.Extract.InvalidKeyValueFormat",
+                            message = "Invalid baggage key-value format",
+                            baggage_header = header_value,
+                        );
                         None
                     }
                 } else {
-                    global::handle_error(PropagationError::extract(
-                        "invalid baggage format",
-                        "BaggagePropagator",
-                    ));
+                    otel_warn!(
+                        name: "BaggagePropagator.Extract.InvalidFormat",
+                        message = "Invalid baggage format",
+                        baggage_header = header_value);
                     None
                 }
             });