Skip to content

Commit 008c164

Browse files
committed
commit
1 parent a7de955 commit 008c164

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

opentelemetry-sdk/src/metrics/meter_provider.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ use std::{
88
};
99

1010
use opentelemetry::{
11-
global,
1211
metrics::{Meter, MeterProvider, MetricsError, Result},
13-
KeyValue,
12+
otel_debug, KeyValue,
1413
};
1514

1615
use crate::{instrumentation::Scope, Resource};
@@ -137,9 +136,18 @@ impl Drop for SdkMeterProviderInner {
137136
fn drop(&mut self) {
138137
// If user has already shutdown the provider manually by calling
139138
// shutdown(), then we don't need to call shutdown again.
140-
if !self.is_shutdown.load(Ordering::Relaxed) {
139+
if self.is_shutdown.load(Ordering::Relaxed) {
140+
otel_debug!(
141+
name: "MeterProvider.AlreadyShutdown",
142+
message = "Meter provider was already shut down; drop will not attempt shutdown again."
143+
);
144+
} else {
141145
if let Err(err) = self.shutdown() {
142-
global::handle_error(err);
146+
otel_debug!(
147+
name: "MeterProvider.ShutdownFailed",
148+
message = "Shutdown attempt failed during drop of MeterProvider.",
149+
reason = format!("{}", err)
150+
);
143151
}
144152
}
145153
}

0 commit comments

Comments
 (0)