Skip to content

Commit 0a39b3b

Browse files
authored
Merge branch 'main' into exp-hist-internal-log
2 parents 4bab7f5 + 0202299 commit 0a39b3b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ hyper-util = "0.1"
3030
log = "0.4.21"
3131
once_cell = "1.13"
3232
ordered-float = "4.0"
33-
pin-project-lite = "0.2"
33+
pin-project-lite = "=0.2.14" # 0.2.15 is failing for cargo-check-external-types
3434
prost = "0.13"
3535
prost-build = "0.13"
3636
prost-types = "0.13"

opentelemetry-sdk/src/metrics/manual_reader.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use std::{
44
};
55

66
use opentelemetry::{
7-
global,
87
metrics::{MetricsError, Result},
8+
otel_debug,
99
};
1010

1111
use super::{
@@ -77,9 +77,9 @@ impl MetricReader for ManualReader {
7777
if inner.sdk_producer.is_none() {
7878
inner.sdk_producer = Some(pipeline);
7979
} else {
80-
global::handle_error(MetricsError::Config(
81-
"duplicate reader registration, did not register manual reader".into(),
82-
))
80+
otel_debug!(
81+
name: "ManualReader.DuplicateRegistration",
82+
message = "The pipeline is already registered to the Reader. Registering pipeline multiple times is not allowed.");
8383
}
8484
});
8585
}

0 commit comments

Comments
 (0)