Skip to content

Global error handler cleanup - UpDown Counter, Historgram, Gauge. #2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lalitb merged 12 commits into from
Oct 27, 2024
Merged

Global error handler cleanup - UpDown Counter, Historgram, Gauge. #2242

Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
41a11f6
initial commit
lalitb Oct 24, 2024
2234f82
Merge branch 'main' into sync-instrument-internal-log
lalitb Oct 24, 2024
2387428
Merge branch 'main' into sync-instrument-internal-log
cijothomas Oct 25, 2024
d038f40
Merge branch 'main' into sync-instrument-internal-log
cijothomas Oct 25, 2024
7bc2030
Merge branch 'main' into sync-instrument-internal-log
lalitb Oct 25, 2024
309c794
Merge branch 'main' into sync-instrument-internal-log
lalitb Oct 25, 2024
ec8d4f1
Merge branch 'main' into sync-instrument-internal-log
cijothomas Oct 26, 2024
ab3fc7e
Update opentelemetry-sdk/src/metrics/meter.rs
lalitb Oct 27, 2024
b193461
Update opentelemetry-sdk/src/metrics/meter.rs
lalitb Oct 27, 2024
728f61b
Merge branch 'main' into sync-instrument-internal-log
lalitb Oct 27, 2024
30a5f75
instrument names fix
lalitb Oct 27, 2024
3b15802
remove global
lalitb Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 45 additions & 9 deletions opentelemetry-sdk/src/metrics/meter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,14 +296,20 @@ 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: "InstrumentCreationFailed",
meter_name = self.scope.name.as_ref(),
instrument_name = builder.name.as_ref(),
message = "Measurements from this updown counter will be ignored.",
reason = format!("{}", err)
);
return UpDownCounter::new(Arc::new(NoopSyncInstrument::new()));
}

match resolver
.lookup(
InstrumentKind::UpDownCounter,
builder.name,
builder.name.clone(),
builder.description,
builder.unit,
None,
Expand All @@ -312,7 +318,13 @@ impl SdkMeter {
{
Ok(updown_counter) => updown_counter,
Err(err) => {
global::handle_error(err);
otel_error!(
name: "InstrumentCreationFailed",
meter_name = self.scope.name.as_ref(),
instrument_name = builder.name.as_ref(),
message = "Measurements from this updown counter will be ignored.",
reason = format!("{}", err)
);
UpDownCounter::new(Arc::new(NoopSyncInstrument::new()))
}
}
Expand All @@ -328,14 +340,20 @@ 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: "InstrumentCreationFailed",
meter_name = self.scope.name.as_ref(),
instrument_name = builder.name.as_ref(),
message = "Measurements from this gauge will be ignored.",
reason = format!("{}", err)
);
return Gauge::new(Arc::new(NoopSyncInstrument::new()));
}

match resolver
.lookup(
InstrumentKind::Gauge,
builder.name,
builder.name.clone(),
builder.description,
builder.unit,
None,
Expand All @@ -344,7 +362,13 @@ impl SdkMeter {
{
Ok(gauge) => gauge,
Err(err) => {
global::handle_error(err);
otel_error!(
name: "InstrumentCreationFailed",
meter_name = self.scope.name.as_ref(),
instrument_name = builder.name.as_ref(),
message = "Measurements from this gauge will be ignored.",
reason = format!("{}", err)
);
Gauge::new(Arc::new(NoopSyncInstrument::new()))
}
}
Expand All @@ -360,14 +384,20 @@ 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: "InstrumentCreationFailed",
meter_name = self.scope.name.as_ref(),
instrument_name = builder.name.as_ref(),
message = "Measurements from this histogram will be ignored.",
reason = format!("{}", err)
);
return Histogram::new(Arc::new(NoopSyncInstrument::new()));
}

match resolver
.lookup(
InstrumentKind::Histogram,
builder.name,
builder.name.clone(),
builder.description,
builder.unit,
builder.boundaries,
Expand All @@ -376,7 +406,13 @@ impl SdkMeter {
{
Ok(histogram) => histogram,
Err(err) => {
global::handle_error(err);
otel_error!(
name: "InstrumentCreationFailed",
meter_name = self.scope.name.as_ref(),
instrument_name = builder.name.as_ref(),
message = "Measurements from this hsitogram will be ignored.",
reason = format!("{}", err)
);
Histogram::new(Arc::new(NoopSyncInstrument::new()))
}
}
Expand Down
Loading