Skip to content

Commit dd2938a

Browse files
authored
Merge branch 'main' into add-shutdown-with-timeout-for-metric-reader-and-provider
2 parents e5a28dd + 4791aae commit dd2938a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,6 @@ where
152152
let new_tracker = A::create(&self.config);
153153
new_tracker.update(value);
154154
trackers.insert(stream_overflow_attributes().clone(), Arc::new(new_tracker));
155-
otel_warn!( name: "ValueMap.measure",
156-
message = "Maximum data points for metric stream exceeded. Entry added to overflow. Subsequent overflows to same metric until next collect will not be logged."
157-
);
158155
}
159156
}
160157

opentelemetry-sdk/src/trace/mod.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,11 @@ mod tests {
136136
}
137137
}
138138

139-
fn on_end(&self, _span: SpanData) {}
139+
fn on_end(&self, _span: SpanData) {
140+
// TODO: Accessing Context::current() will panic today and hence commented out.
141+
// See https://github.com/open-telemetry/opentelemetry-rust/issues/2871
142+
// let _c = Context::current();
143+
}
140144

141145
fn force_flush(&self) -> crate::error::OTelSdkResult {
142146
Ok(())

0 commit comments

Comments
 (0)