remove formatting in wrapper macros

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

@@ -148,8 +148,8 @@
             trackers.insert(STREAM_OVERFLOW_ATTRIBUTES.clone(), Arc::new(new_tracker));
             //TODO -  include name of meter, instrument
             otel_warn!( name: "MetricCardinalityLimitReached",
-                error = MetricsError::Other("Maximum data points for metric stream exceeded. Entry added to overflow. Subsequent overflows to same metric until next collect will not be logged.".into()),
-                cardinality_limit = cardinality_limit()
+                error = format!("{}", MetricsError::Other("Maximum data points for metric stream exceeded. Entry added to overflow. Subsequent overflows to same metric until next collect will not be logged.".into())),
+                cardinality_limit = cardinality_limit() as u64,
             );
         }
     }

opentelemetry-sdk/src/metrics/meter.rs

@@ -74,7 +74,7 @@
     {
         let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
         if let Err(err) = validation_result {
-            otel_error!(name: "SdkMeter.CreateCounter.ValidationError", error = err);
+            otel_error!(name: "SdkMeter.CreateCounter.ValidationError", error = format!("{}", err));
             return Ok(Counter::new(Arc::new(NoopSyncInstrument::new())));
         }
 
@@ -90,7 +90,7 @@
         {
             Ok(counter) => Ok(counter),
             Err(err) => {
-                otel_error!(name: "SdkMeter.CreateCounter.Error", error = err);
+                otel_error!(name: "SdkMeter.CreateCounter.Error", error = format!("{}", err));
                 Ok(Counter::new(Arc::new(NoopSyncInstrument::new())))
             }
         }
@@ -106,7 +106,7 @@
     {
         let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
         if let Err(err) = validation_result {
-            otel_error!(name: "SdkMeter.CreateObservableCounter.ValidationError", error = err);
+            otel_error!(name: "SdkMeter.CreateObservableCounter.ValidationError", error = format!("{}", err));
             return Ok(ObservableCounter::new(Arc::new(NoopAsyncInstrument::new())));
         }
 
@@ -119,7 +119,7 @@
         )?;
 
         if ms.is_empty() {
-            otel_error!(name: "SdkMeter.CreateObservableCounter.Error", error = MetricsError::Other("no measures found".into()));
+            otel_error!(name: "SdkMeter.CreateObservableCounter.Error", error = format!("{}", MetricsError::Other("no measures found".into())));
             return Ok(ObservableCounter::new(Arc::new(NoopAsyncInstrument::new())));
         }
 
@@ -144,7 +144,7 @@
     {
         let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
         if let Err(err) = validation_result {
-            otel_error!(name: "SdkMeter.CreateObservableUpDownCounter.ValidationError", error = err);
+            otel_error!(name: "SdkMeter.CreateObservableUpDownCounter.ValidationError", error = format!("{}", err));
             return Ok(ObservableUpDownCounter::new(Arc::new(
                 NoopAsyncInstrument::new(),
             )));
@@ -159,7 +159,7 @@
         )?;
 
         if ms.is_empty() {
-            otel_error!(name: "SdkMeter.CreateObservableUpDownCounter.Error", error = MetricsError::Other("no measures found".into()));
+            otel_error!(name: "SdkMeter.CreateObservableUpDownCounter.Error", error = format!("{}",MetricsError::Other("no measures found".into())));
             return Ok(ObservableUpDownCounter::new(Arc::new(
                 NoopAsyncInstrument::new(),
             )));
@@ -186,7 +186,7 @@
     {
         let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
         if let Err(err) = validation_result {
-            otel_error!(name: "SdkMeter.CreateObservableGauge.ValidationError", error = err);
+            otel_error!(name: "SdkMeter.CreateObservableGauge.ValidationError", error = format!("{}", err));
             return Ok(ObservableGauge::new(Arc::new(NoopAsyncInstrument::new())));
         }
 
@@ -199,7 +199,7 @@
         )?;
 
         if ms.is_empty() {
-            otel_error!(name: "SdkMeter.CreateObservableGauge.Error", error = MetricsError::Other("no measures found".into()));
+            otel_error!(name: "SdkMeter.CreateObservableGauge.Error",error = format!("{}", MetricsError::Other("no measures found".into())));
             return Ok(ObservableGauge::new(Arc::new(NoopAsyncInstrument::new())));
         }
 
@@ -224,7 +224,7 @@
     {
         let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
         if let Err(err) = validation_result {
-            otel_error!(name: "SdkMeter.CreateUpDownCounter.ValidationError", error = err);
+            otel_error!(name: "SdkMeter.CreateUpDownCounter.ValidationError", error = format!("{}",err));
             return Ok(UpDownCounter::new(Arc::new(NoopSyncInstrument::new())));
         }
 
@@ -240,7 +240,7 @@
         {
             Ok(updown_counter) => Ok(updown_counter),
             Err(err) => {
-                otel_error!(name: "SdkMeter.CreateUpDownCounter.Error", error = err);
+                otel_error!(name: "SdkMeter.CreateUpDownCounter.Error", error = format!("{}", err));
                 Ok(UpDownCounter::new(Arc::new(NoopSyncInstrument::new())))
             }
         }
@@ -256,7 +256,7 @@
     {
         let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
         if let Err(err) = validation_result {
-            otel_error!(name: "SdkMeter.CreateGauge.ValidationError", error = err);
+            otel_error!(name: "SdkMeter.CreateGauge.ValidationError", error = format!("{}", err));
             return Ok(Gauge::new(Arc::new(NoopSyncInstrument::new())));
         }
 
@@ -272,7 +272,7 @@
         {
             Ok(gauge) => Ok(gauge),
             Err(err) => {
-                otel_error!(name: "SdkMeter.CreateGauge.Error", error = err);
+                otel_error!(name: "SdkMeter.CreateGauge.Error", error = format!("{}",err));
                 Ok(Gauge::new(Arc::new(NoopSyncInstrument::new())))
             }
         }
@@ -288,7 +288,7 @@
     {
         let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
         if let Err(err) = validation_result {
-            otel_error!(name: "SdkMeter.CreateHistogram.ValidationError", error = err);
+            otel_error!(name: "SdkMeter.CreateHistogram.ValidationError", error = format!("{}", err));
             return Ok(Histogram::new(Arc::new(NoopSyncInstrument::new())));
         }
 
@@ -304,7 +304,7 @@
         {
             Ok(histogram) => Ok(histogram),
             Err(err) => {
-                otel_error!(name: "SdkMeter.CreateHistogram.Error", error = err);
+                otel_error!(name: "SdkMeter.CreateHistogram.Error", error = format!("{}",err));
                 Ok(Histogram::new(Arc::new(NoopSyncInstrument::new())))
             }
         }

opentelemetry-sdk/src/metrics/meter_provider.rs

@@ -136,7 +136,7 @@
         // shutdown(), then we don't need to call shutdown again.
         if !self.is_shutdown.load(Ordering::Relaxed) {
             if let Err(err) = self.shutdown() {
-                otel_error!(name: "SdkMeterProvider.Drop.ShutdownError", error = err);
+                otel_error!(name: "SdkMeterProvider.Drop.ShutdownError", error = format!("{}",err));
             }
         }
     }

opentelemetry-sdk/src/metrics/pipeline.rs

@@ -413,17 +413,17 @@
                 if existing == id {
                     return;
                 }
                 otel_warn!(name: "Instrument.DuplicateMetricStreamDefinitions",
-                    name = id.name.clone(),
-                    description = id.description.clone(),
-                    kind = id.kind,
-                    unit = id.unit.clone(),
-                    number = id.number.clone(),
-                    existing_name = existing.name.clone(),
-                    existing_desc = existing.description.clone(),
-                    existing_kind = existing.kind,
-                    existing_unit = existing.unit.clone(),
-                    existing_number = existing.number.clone()
+                    name = format!("{}",id.name),
+                    description = format!("{}", id.description),
+                    kind = format!("{:?}", id.kind),
+                    unit = format!("{}",id.unit),
+                    number = format!("{}", id.number),
+                    existing_name = format!("{}", existing.name),
+                    existing_desc = format!("{}", existing.description),
+                    existing_kind = format!("{:?}", existing.kind),
+                    existing_unit = format!("{}", existing.unit),
+                    existing_number = format!("{}", existing.number),
                 );
             }
         }

opentelemetry-sdk/src/metrics/view.rs

@@ -102,10 +102,10 @@
 /// ```
 pub fn new_view(criteria: Instrument, mask: Stream) -> Result<Box<dyn View>> {
     if criteria.is_empty() {
-        otel_error!(name: "CreateView.ValidationError", error = MetricsError::Config(
-            "no criteria provided, dropping view".to_string()),
-            criteria = criteria,
-            mask = mask
+        otel_error!(name: "CreateView.ValidationError", error = format!("{}",MetricsError::Config(
+            "no criteria provided, dropping view".to_string())),
+            criteria = format!("{:?}", criteria),
+            mask = format!("{:?}", mask)
         );
         return Ok(Box::new(empty_view));
     }
@@ -114,10 +114,10 @@
 
     let match_fn: Box<dyn Fn(&Instrument) -> bool + Send + Sync> = if contains_wildcard {
         if mask.name != "" {
-            otel_error!(name: "CreateView.ValidationError", error = MetricsError::Config(
-                "name replacement for wildcard instrument, dropping view".to_string()),
-                criteria = criteria,
-                mask = mask
+            otel_error!(name: "CreateView.ValidationError", error = format!("{}", MetricsError::Config(
+                "name replacement for wildcard instrument, dropping view".to_string())),
+                criteria = format!("{:?}", criteria),
+                mask = format!("{:?}", mask)
             );
             return Ok(Box::new(empty_view));
         }
@@ -143,10 +143,9 @@
             Ok(_) => agg = Some(ma.clone()),
             Err(err) => {
                 otel_error!(name: "CreateView.ValidationError",
-                    error = MetricsError::Config("invalid aggregation, dropping view".to_string()),
-                    criteria = err_msg_criteria,
-                    mask = mask,
-                    error = err
+                    error = format!("{}",err),
+                    criteria = format!("{:?}", err_msg_criteria),
+                    mask = format!("{:?}", mask),
                 );
                 return Ok(Box::new(empty_view));
             }

opentelemetry/src/global/internal_logging.rs

@@ -64,7 +64,7 @@ macro_rules! otel_warn {
             tracing::warn!(name: $name,
                 target: env!("CARGO_PKG_NAME"),
                 $($key = {
-                        $crate::format_value!($value)
+                        $value
                 }),+,
                 ""
         )        }
@@ -133,7 +133,7 @@ macro_rules! otel_error {
             tracing::error!(name: $name,
                 target: env!("CARGO_PKG_NAME"),
                 $($key = {
-                        $crate::format_value!($value)
+                        $value
                 }),+,
                 ""
         )        }
@@ -145,11 +145,3 @@ macro_rules! otel_error {
         }
     };
 }
-
-/// Helper macro to format a value
-#[macro_export]
-macro_rules! format_value {
-    ($value:expr) => {{
-        format!("{:?}", $value)
-    }};
-}