From 2941d601d9f532ee9be26caa354e63c061a86063 Mon Sep 17 00:00:00 2001 From: Lalit Date: Thu, 24 Oct 2024 22:41:22 -0700 Subject: [PATCH 1/2] initial commit --- opentelemetry-proto/src/transform/metrics.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/opentelemetry-proto/src/transform/metrics.rs b/opentelemetry-proto/src/transform/metrics.rs index f718c96280..bf566e79a6 100644 --- a/opentelemetry-proto/src/transform/metrics.rs +++ b/opentelemetry-proto/src/transform/metrics.rs @@ -8,7 +8,7 @@ pub mod tonic { use std::any::Any; use std::fmt; - use opentelemetry::{global, metrics::MetricsError, Key, Value}; + use opentelemetry::{otel_debug, otel_warn, 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(MetricsError::Other(format!( - "Unknown temporality {:?}, using default instead.", - other - ))); + otel_warn!( + 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::>() { Ok(TonicMetricData::Gauge(gauge.into())) } else { - global::handle_error(MetricsError::Other("unknown aggregator".into())); + otel_debug!( + name: "TonicMetricData::UnknownAggregator", + message= "Unknown aggregator type", + unknown_type= format!("{:?}", data), + ); Err(()) } } From 1e7bef7a7affb8b4ae77b5336c039beabe1140fd Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Sat, 26 Oct 2024 12:38:37 -0700 Subject: [PATCH 2/2] use otel_debug --- opentelemetry-proto/src/transform/metrics.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry-proto/src/transform/metrics.rs b/opentelemetry-proto/src/transform/metrics.rs index bf566e79a6..df3e105803 100644 --- a/opentelemetry-proto/src/transform/metrics.rs +++ b/opentelemetry-proto/src/transform/metrics.rs @@ -8,7 +8,7 @@ pub mod tonic { use std::any::Any; use std::fmt; - use opentelemetry::{otel_debug, otel_warn, 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,7 +97,7 @@ pub mod tonic { Temporality::Cumulative => AggregationTemporality::Cumulative, Temporality::Delta => AggregationTemporality::Delta, other => { - otel_warn!( + otel_debug!( name: "AggregationTemporality::Unknown", message = "Unknown temporality,using default instead.", unknown_temporality = format!("{:?}", other),