Skip to content

Commit 3aa97cf

Browse files
lalitblalitb
committed
remove formatting in wrapper macros
1 parent ee5c5f5 commit 3aa97cf

File tree

6 files changed

+40
-49
lines changed

6 files changed

+40
-49
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ impl<AU: AtomicallyUpdate<T>, T: Number, O: Operation> ValueMap<AU, T, O> {
148148
trackers.insert(STREAM_OVERFLOW_ATTRIBUTES.clone(), Arc::new(new_tracker));
149149
//TODO - include name of meter, instrument
150150
otel_warn!( name: "MetricCardinalityLimitReached",
151-
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()),
152-
cardinality_limit = cardinality_limit()
151+
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())),
152+
cardinality_limit = cardinality_limit() as u64,
153153
);
154154
}
155155
}

‎opentelemetry-sdk/src/metrics/meter.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ impl SdkMeter {
7474
{
7575
let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
7676
if let Err(err) = validation_result {
77-
otel_error!(name: "SdkMeter.CreateCounter.ValidationError", error = err);
77+
otel_error!(name: "SdkMeter.CreateCounter.ValidationError", error = format!("{}", err));
7878
return Ok(Counter::new(Arc::new(NoopSyncInstrument::new())));
7979
}
8080

@@ -90,7 +90,7 @@ impl SdkMeter {
9090
{
9191
Ok(counter) => Ok(counter),
9292
Err(err) => {
93-
otel_error!(name: "SdkMeter.CreateCounter.Error", error = err);
93+
otel_error!(name: "SdkMeter.CreateCounter.Error", error = format!("{}", err));
9494
Ok(Counter::new(Arc::new(NoopSyncInstrument::new())))
9595
}
9696
}
@@ -106,7 +106,7 @@ impl SdkMeter {
106106
{
107107
let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
108108
if let Err(err) = validation_result {
109-
otel_error!(name: "SdkMeter.CreateObservableCounter.ValidationError", error = err);
109+
otel_error!(name: "SdkMeter.CreateObservableCounter.ValidationError", error = format!("{}", err));
110110
return Ok(ObservableCounter::new(Arc::new(NoopAsyncInstrument::new())));
111111
}
112112

@@ -119,7 +119,7 @@ impl SdkMeter {
119119
)?;
120120

121121
if ms.is_empty() {
122-
otel_error!(name: "SdkMeter.CreateObservableCounter.Error", error = MetricsError::Other("no measures found".into()));
122+
otel_error!(name: "SdkMeter.CreateObservableCounter.Error", error = format!("{}", MetricsError::Other("no measures found".into())));
123123
return Ok(ObservableCounter::new(Arc::new(NoopAsyncInstrument::new())));
124124
}
125125

@@ -144,7 +144,7 @@ impl SdkMeter {
144144
{
145145
let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
146146
if let Err(err) = validation_result {
147-
otel_error!(name: "SdkMeter.CreateObservableUpDownCounter.ValidationError", error = err);
147+
otel_error!(name: "SdkMeter.CreateObservableUpDownCounter.ValidationError", error = format!("{}", err));
148148
return Ok(ObservableUpDownCounter::new(Arc::new(
149149
NoopAsyncInstrument::new(),
150150
)));
@@ -159,7 +159,7 @@ impl SdkMeter {
159159
)?;
160160

161161
if ms.is_empty() {
162-
otel_error!(name: "SdkMeter.CreateObservableUpDownCounter.Error", error = MetricsError::Other("no measures found".into()));
162+
otel_error!(name: "SdkMeter.CreateObservableUpDownCounter.Error", error = format!("{}",MetricsError::Other("no measures found".into())));
163163
return Ok(ObservableUpDownCounter::new(Arc::new(
164164
NoopAsyncInstrument::new(),
165165
)));
@@ -186,7 +186,7 @@ impl SdkMeter {
186186
{
187187
let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
188188
if let Err(err) = validation_result {
189-
otel_error!(name: "SdkMeter.CreateObservableGauge.ValidationError", error = err);
189+
otel_error!(name: "SdkMeter.CreateObservableGauge.ValidationError", error = format!("{}", err));
190190
return Ok(ObservableGauge::new(Arc::new(NoopAsyncInstrument::new())));
191191
}
192192

@@ -199,7 +199,7 @@ impl SdkMeter {
199199
)?;
200200

201201
if ms.is_empty() {
202-
otel_error!(name: "SdkMeter.CreateObservableGauge.Error", error = MetricsError::Other("no measures found".into()));
202+
otel_error!(name: "SdkMeter.CreateObservableGauge.Error",error = format!("{}", MetricsError::Other("no measures found".into())));
203203
return Ok(ObservableGauge::new(Arc::new(NoopAsyncInstrument::new())));
204204
}
205205

@@ -224,7 +224,7 @@ impl SdkMeter {
224224
{
225225
let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
226226
if let Err(err) = validation_result {
227-
otel_error!(name: "SdkMeter.CreateUpDownCounter.ValidationError", error = err);
227+
otel_error!(name: "SdkMeter.CreateUpDownCounter.ValidationError", error = format!("{}",err));
228228
return Ok(UpDownCounter::new(Arc::new(NoopSyncInstrument::new())));
229229
}
230230

@@ -240,7 +240,7 @@ impl SdkMeter {
240240
{
241241
Ok(updown_counter) => Ok(updown_counter),
242242
Err(err) => {
243-
otel_error!(name: "SdkMeter.CreateUpDownCounter.Error", error = err);
243+
otel_error!(name: "SdkMeter.CreateUpDownCounter.Error", error = format!("{}", err));
244244
Ok(UpDownCounter::new(Arc::new(NoopSyncInstrument::new())))
245245
}
246246
}
@@ -256,7 +256,7 @@ impl SdkMeter {
256256
{
257257
let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
258258
if let Err(err) = validation_result {
259-
otel_error!(name: "SdkMeter.CreateGauge.ValidationError", error = err);
259+
otel_error!(name: "SdkMeter.CreateGauge.ValidationError", error = format!("{}", err));
260260
return Ok(Gauge::new(Arc::new(NoopSyncInstrument::new())));
261261
}
262262

@@ -272,7 +272,7 @@ impl SdkMeter {
272272
{
273273
Ok(gauge) => Ok(gauge),
274274
Err(err) => {
275-
otel_error!(name: "SdkMeter.CreateGauge.Error", error = err);
275+
otel_error!(name: "SdkMeter.CreateGauge.Error", error = format!("{}",err));
276276
Ok(Gauge::new(Arc::new(NoopSyncInstrument::new())))
277277
}
278278
}
@@ -288,7 +288,7 @@ impl SdkMeter {
288288
{
289289
let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit);
290290
if let Err(err) = validation_result {
291-
otel_error!(name: "SdkMeter.CreateHistogram.ValidationError", error = err);
291+
otel_error!(name: "SdkMeter.CreateHistogram.ValidationError", error = format!("{}", err));
292292
return Ok(Histogram::new(Arc::new(NoopSyncInstrument::new())));
293293
}
294294

@@ -304,7 +304,7 @@ impl SdkMeter {
304304
{
305305
Ok(histogram) => Ok(histogram),
306306
Err(err) => {
307-
otel_error!(name: "SdkMeter.CreateHistogram.Error", error = err);
307+
otel_error!(name: "SdkMeter.CreateHistogram.Error", error = format!("{}",err));
308308
Ok(Histogram::new(Arc::new(NoopSyncInstrument::new())))
309309
}
310310
}

‎opentelemetry-sdk/src/metrics/meter_provider.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ impl Drop for SdkMeterProviderInner {
136136
// shutdown(), then we don't need to call shutdown again.
137137
if !self.is_shutdown.load(Ordering::Relaxed) {
138138
if let Err(err) = self.shutdown() {
139-
otel_error!(name: "SdkMeterProvider.Drop.ShutdownError", error = err);
139+
otel_error!(name: "SdkMeterProvider.Drop.ShutdownError", error = format!("{}",err));
140140
}
141141
}
142142
}

‎opentelemetry-sdk/src/metrics/pipeline.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -414,16 +414,16 @@ where
414414
return;
415415
}
416416
otel_warn!(name: "Instrument.DuplicateMetricStreamDefinitions",
417-
name = id.name.clone(),
418-
description = id.description.clone(),
419-
kind = id.kind,
420-
unit = id.unit.clone(),
421-
number = id.number.clone(),
422-
existing_name = existing.name.clone(),
423-
existing_desc = existing.description.clone(),
424-
existing_kind = existing.kind,
425-
existing_unit = existing.unit.clone(),
426-
existing_number = existing.number.clone()
417+
name = format!("{}",id.name),
418+
description = format!("{}", id.description),
419+
kind = format!("{:?}", id.kind),
420+
unit = format!("{}",id.unit),
421+
number = format!("{}", id.number),
422+
existing_name = format!("{}", existing.name),
423+
existing_desc = format!("{}", existing.description),
424+
existing_kind = format!("{:?}", existing.kind),
425+
existing_unit = format!("{}", existing.unit),
426+
existing_number = format!("{}", existing.number),
427427
);
428428
}
429429
}

‎opentelemetry-sdk/src/metrics/view.rs

+11-12
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ impl View for Box<dyn View> {
102102
/// ```
103103
pub fn new_view(criteria: Instrument, mask: Stream) -> Result<Box<dyn View>> {
104104
if criteria.is_empty() {
105-
otel_error!(name: "CreateView.ValidationError", error = MetricsError::Config(
106-
"no criteria provided, dropping view".to_string()),
107-
criteria = criteria,
108-
mask = mask
105+
otel_error!(name: "CreateView.ValidationError", error = format!("{}",MetricsError::Config(
106+
"no criteria provided, dropping view".to_string())),
107+
criteria = format!("{:?}", criteria),
108+
mask = format!("{:?}", mask)
109109
);
110110
return Ok(Box::new(empty_view));
111111
}
@@ -114,10 +114,10 @@ pub fn new_view(criteria: Instrument, mask: Stream) -> Result<Box<dyn View>> {
114114

115115
let match_fn: Box<dyn Fn(&Instrument) -> bool + Send + Sync> = if contains_wildcard {
116116
if mask.name != "" {
117-
otel_error!(name: "CreateView.ValidationError", error = MetricsError::Config(
118-
"name replacement for wildcard instrument, dropping view".to_string()),
119-
criteria = criteria,
120-
mask = mask
117+
otel_error!(name: "CreateView.ValidationError", error = format!("{}", MetricsError::Config(
118+
"name replacement for wildcard instrument, dropping view".to_string())),
119+
criteria = format!("{:?}", criteria),
120+
mask = format!("{:?}", mask)
121121
);
122122
return Ok(Box::new(empty_view));
123123
}
@@ -143,10 +143,9 @@ pub fn new_view(criteria: Instrument, mask: Stream) -> Result<Box<dyn View>> {
143143
Ok(_) => agg = Some(ma.clone()),
144144
Err(err) => {
145145
otel_error!(name: "CreateView.ValidationError",
146-
error = MetricsError::Config("invalid aggregation, dropping view".to_string()),
147-
criteria = err_msg_criteria,
148-
mask = mask,
149-
error = err
146+
error = format!("{}",err),
147+
criteria = format!("{:?}", err_msg_criteria),
148+
mask = format!("{:?}", mask),
150149
);
151150
return Ok(Box::new(empty_view));
152151
}

‎opentelemetry/src/global/internal_logging.rs

+2-10
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ macro_rules! otel_warn {
6464
tracing::warn!(name: $name,
6565
target: env!("CARGO_PKG_NAME"),
6666
$($key = {
67-
$crate::format_value!($value)
67+
$value
6868
}),+,
6969
""
7070
) }
@@ -133,7 +133,7 @@ macro_rules! otel_error {
133133
tracing::error!(name: $name,
134134
target: env!("CARGO_PKG_NAME"),
135135
$($key = {
136-
$crate::format_value!($value)
136+
$value
137137
}),+,
138138
""
139139
) }
@@ -145,11 +145,3 @@ macro_rules! otel_error {
145145
}
146146
};
147147
}
148-
149-
/// Helper macro to format a value
150-
#[macro_export]
151-
macro_rules! format_value {
152-
($value:expr) => {{
153-
format!("{:?}", $value)
154-
}};
155-
}

0 commit comments

Comments
 (0)