From 8a0e56ca7581bd7be00d180337e3a88d0d41b0b6 Mon Sep 17 00:00:00 2001 From: Lalit Date: Wed, 23 Oct 2024 21:22:41 -0700 Subject: [PATCH 1/6] internal-log counter and observable counter --- opentelemetry-sdk/src/metrics/meter.rs | 37 +++++++++++++++++++++----- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/opentelemetry-sdk/src/metrics/meter.rs b/opentelemetry-sdk/src/metrics/meter.rs index 45131ed611..9180aaf8a6 100644 --- a/opentelemetry-sdk/src/metrics/meter.rs +++ b/opentelemetry-sdk/src/metrics/meter.rs @@ -8,6 +8,7 @@ use opentelemetry::{ InstrumentProvider, MetricsError, ObservableCounter, ObservableGauge, ObservableUpDownCounter, Result, UpDownCounter, }, + otel_error, }; use crate::instrumentation::Scope; @@ -75,14 +76,19 @@ impl SdkMeter { { let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit); if let Err(err) = validation_result { - global::handle_error(err); + otel_error!( + name: "SdkMeter.CreateCounter.InstrumentCreationFailed", + meter_name = self.scope.name.as_ref(), + instrument_name = builder.name.as_ref(), + error = format!("Measurements from the counter will be ignored. Reason: {}", err) + ); return Counter::new(Arc::new(NoopSyncInstrument::new())); } match resolver .lookup( InstrumentKind::Counter, - builder.name, + builder.name.clone(), builder.description, builder.unit, None, @@ -91,7 +97,12 @@ impl SdkMeter { { Ok(counter) => counter, Err(err) => { - global::handle_error(err); + otel_error!( + name: "SdkMeter.CreateCounter.InstrumentCreationFailed", + meter_name = self.scope.name.as_ref(), + instrument_name = builder.name.as_ref(), + error = format!("Measurements from the counter will be ignored. Reason: {}", err) + ); Counter::new(Arc::new(NoopSyncInstrument::new())) } } @@ -107,19 +118,29 @@ impl SdkMeter { { let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit); if let Err(err) = validation_result { - global::handle_error(err); + otel_error!( + name: "SdkMeter.CreateObservableCounter.InstrumentCreationFailed", + meter_name = self.scope.name.as_ref(), + instrument_name = builder.name.as_ref(), + error = format!("Measurements from the observable counter will be ignored. Reason: {}", err)); return ObservableCounter::new(); } match resolver.measures( InstrumentKind::ObservableCounter, - builder.name, + builder.name.clone(), builder.description, builder.unit, None, ) { Ok(ms) => { if ms.is_empty() { + otel_error!( + name: "SdkMeter.CreateObservableCounter.InstrumentCreationFailed", + meter_name = self.scope.name.as_ref(), + instrument_name = builder.name.as_ref(), + message = "Measurements from the observable counter will be ignored. Check View Configuration." + ); return ObservableCounter::new(); } @@ -134,7 +155,11 @@ impl SdkMeter { ObservableCounter::new() } Err(err) => { - global::handle_error(err); + otel_error!( + name: "SdkMeter.CreateObservableCounter.InstrumentCreationFailed", + meter_name = self.scope.name.as_ref(), + instrument_name = builder.name.as_ref(), + message = format!("Measurements from the observable counter will be ignored. Reason: {}", err)); ObservableCounter::new() } } From 47266ef48e99e2e8daaeb0aa06a7658be5493a47 Mon Sep 17 00:00:00 2001 From: Lalit Date: Wed, 23 Oct 2024 21:33:15 -0700 Subject: [PATCH 2/6] comment. --- opentelemetry-sdk/src/metrics/meter.rs | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/opentelemetry-sdk/src/metrics/meter.rs b/opentelemetry-sdk/src/metrics/meter.rs index 9180aaf8a6..799b5477cb 100644 --- a/opentelemetry-sdk/src/metrics/meter.rs +++ b/opentelemetry-sdk/src/metrics/meter.rs @@ -77,10 +77,11 @@ impl SdkMeter { let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit); if let Err(err) = validation_result { otel_error!( - name: "SdkMeter.CreateCounter.InstrumentCreationFailed", + name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - error = format!("Measurements from the counter will be ignored. Reason: {}", err) + message = "Measurements from this counter will be ignored.", + reason = format!("{}", err) ); return Counter::new(Arc::new(NoopSyncInstrument::new())); } @@ -98,10 +99,11 @@ impl SdkMeter { Ok(counter) => counter, Err(err) => { otel_error!( - name: "SdkMeter.CreateCounter.InstrumentCreationFailed", + name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - error = format!("Measurements from the counter will be ignored. Reason: {}", err) + message = "Measurements from this counter will be ignored.", + reason = format!("{}", err) ); Counter::new(Arc::new(NoopSyncInstrument::new())) } @@ -119,10 +121,11 @@ impl SdkMeter { let validation_result = validate_instrument_config(builder.name.as_ref(), &builder.unit); if let Err(err) = validation_result { otel_error!( - name: "SdkMeter.CreateObservableCounter.InstrumentCreationFailed", + name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - error = format!("Measurements from the observable counter will be ignored. Reason: {}", err)); + mesage = "Measurements from this observable counter will be ignored.", + reason = format!("{}", err)); return ObservableCounter::new(); } @@ -136,10 +139,10 @@ impl SdkMeter { Ok(ms) => { if ms.is_empty() { otel_error!( - name: "SdkMeter.CreateObservableCounter.InstrumentCreationFailed", + name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - message = "Measurements from the observable counter will be ignored. Check View Configuration." + message = "Measurements from this observable counter will be ignored. Check View Configuration." ); return ObservableCounter::new(); } @@ -156,10 +159,11 @@ impl SdkMeter { } Err(err) => { otel_error!( - name: "SdkMeter.CreateObservableCounter.InstrumentCreationFailed", + name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - message = format!("Measurements from the observable counter will be ignored. Reason: {}", err)); + message = "Measurements from the observable counter will be ignored.", + reason = format!("{}", err)); ObservableCounter::new() } } From 6c6d2d5af66f321af76c70bca52bdad22c9d1997 Mon Sep 17 00:00:00 2001 From: Lalit Date: Wed, 23 Oct 2024 21:35:09 -0700 Subject: [PATCH 3/6] spell --- opentelemetry-sdk/src/metrics/meter.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-sdk/src/metrics/meter.rs b/opentelemetry-sdk/src/metrics/meter.rs index 799b5477cb..2e055a2d51 100644 --- a/opentelemetry-sdk/src/metrics/meter.rs +++ b/opentelemetry-sdk/src/metrics/meter.rs @@ -124,7 +124,7 @@ impl SdkMeter { name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - mesage = "Measurements from this observable counter will be ignored.", + message = "Measurements from this observable counter will be ignored.", reason = format!("{}", err)); return ObservableCounter::new(); } From 2b7141515968672b9c022f5b0ab2bee7451b6b03 Mon Sep 17 00:00:00 2001 From: Lalit Date: Wed, 23 Oct 2024 22:57:20 -0700 Subject: [PATCH 4/6] comment --- opentelemetry-sdk/src/metrics/meter.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry-sdk/src/metrics/meter.rs b/opentelemetry-sdk/src/metrics/meter.rs index 2e055a2d51..147b3620cd 100644 --- a/opentelemetry-sdk/src/metrics/meter.rs +++ b/opentelemetry-sdk/src/metrics/meter.rs @@ -124,7 +124,7 @@ impl SdkMeter { name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - message = "Measurements from this observable counter will be ignored.", + message = "Callbacks for this observable counter will be invoked.", reason = format!("{}", err)); return ObservableCounter::new(); } @@ -142,7 +142,7 @@ impl SdkMeter { name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - message = "Measurements from this observable counter will be ignored. Check View Configuration." + message = "Callbacks for this observable counter will be invoked. Check View Configuration." ); return ObservableCounter::new(); } From ed5bedfbd3123df41ae5f05cbbd384b3112b384f Mon Sep 17 00:00:00 2001 From: Lalit Date: Wed, 23 Oct 2024 22:57:45 -0700 Subject: [PATCH 5/6] comment --- opentelemetry-sdk/src/metrics/meter.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry-sdk/src/metrics/meter.rs b/opentelemetry-sdk/src/metrics/meter.rs index 147b3620cd..e4d2884e78 100644 --- a/opentelemetry-sdk/src/metrics/meter.rs +++ b/opentelemetry-sdk/src/metrics/meter.rs @@ -124,7 +124,7 @@ impl SdkMeter { name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - message = "Callbacks for this observable counter will be invoked.", + message = "Callbacks for this observable counter will not be invoked.", reason = format!("{}", err)); return ObservableCounter::new(); } @@ -142,7 +142,7 @@ impl SdkMeter { name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - message = "Callbacks for this observable counter will be invoked. Check View Configuration." + message = "Callbacks for this observable counter will not be invoked. Check View Configuration." ); return ObservableCounter::new(); } From d2d462fac5fc8c23288eeb4a85d3d7d64f47ac53 Mon Sep 17 00:00:00 2001 From: Lalit Date: Wed, 23 Oct 2024 23:00:34 -0700 Subject: [PATCH 6/6] comment --- opentelemetry-sdk/src/metrics/meter.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-sdk/src/metrics/meter.rs b/opentelemetry-sdk/src/metrics/meter.rs index e4d2884e78..8cab6e1b68 100644 --- a/opentelemetry-sdk/src/metrics/meter.rs +++ b/opentelemetry-sdk/src/metrics/meter.rs @@ -162,7 +162,7 @@ impl SdkMeter { name: "InstrumentCreationFailed", meter_name = self.scope.name.as_ref(), instrument_name = builder.name.as_ref(), - message = "Measurements from the observable counter will be ignored.", + message = "Callbacks for this observable counter will not be invoked.", reason = format!("{}", err)); ObservableCounter::new() }