Skip to content

Commit c6e358d

Browse files
committed
initial commit
1 parent afc8ff5 commit c6e358d

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

opentelemetry-sdk/src/trace/sampler/jaeger_remote/rate_limit.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use opentelemetry::trace::TraceError;
21
use std::time::SystemTime;
32

43
// leaky bucket based rate limit
@@ -53,10 +52,12 @@ impl LeakyBucket {
5352
false
5453
}
5554
}
56-
Err(_) => {
57-
opentelemetry::global::handle_error(TraceError::Other(
58-
"jaeger remote sampler gets rewinded timestamp".into(),
59-
));
55+
Err(err) => {
56+
opentelemetry::otel_debug!(
57+
name: "JaegerRemoteSampler.LeakyBucket.ClockAdjustment",
58+
message = "jaeger remote sampler detected a rewind in system clock",
59+
reason = format!("{:?}", err),
60+
);
6061
true
6162
}
6263
}

opentelemetry-sdk/src/trace/sampler/jaeger_remote/sampler.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::trace::{Sampler, ShouldSample};
55
use futures_util::{stream, StreamExt as _};
66
use http::Uri;
77
use opentelemetry::trace::{Link, SamplingResult, SpanKind, TraceError, TraceId};
8-
use opentelemetry::{global, Context, KeyValue};
8+
use opentelemetry::{otel_debug, Context, KeyValue};
99
use opentelemetry_http::HttpClient;
1010
use std::str::FromStr;
1111
use std::sync::Arc;
@@ -203,7 +203,13 @@ impl JaegerRemoteSampler {
203203
// send request
204204
match Self::request_new_strategy(&client, endpoint.clone()).await {
205205
Ok(remote_strategy_resp) => strategy.update(remote_strategy_resp),
206-
Err(err_msg) => global::handle_error(TraceError::Other(err_msg.into())),
206+
Err(err_msg) => {
207+
otel_debug!(
208+
name: "JaegerRemoteSampler.UpdateStrategy.RequestFailed",
209+
reason = "Failed to fetch new sampling strategy",
210+
error = format!("{}", err_msg),
211+
);
212+
}
207213
};
208214
} else {
209215
// shutdown

opentelemetry-sdk/src/trace/sampler/jaeger_remote/sampling_strategy.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use crate::trace::sampler::jaeger_remote::remote::{
44
};
55
use crate::trace::sampler::sample_based_on_probability;
66
use opentelemetry::trace::{
7-
SamplingDecision, SamplingResult, TraceContextExt, TraceError, TraceId, TraceState,
7+
SamplingDecision, SamplingResult, TraceContextExt, TraceId, TraceState,
88
};
9-
use opentelemetry::{global, Context};
9+
use opentelemetry::{otel_debug, Context};
1010
use std::collections::HashMap;
1111
use std::fmt::{Debug, Formatter};
1212
use std::sync::Mutex;
@@ -107,9 +107,10 @@ impl Inner {
107107
}
108108
})
109109
.unwrap_or_else(|_err| {
110-
global::handle_error(TraceError::Other(
111-
"jaeger remote sampler mutex poisoned".into(),
112-
))
110+
otel_debug!(
111+
name: "JaegerRemoteSampler.MutexPoisoned",
112+
reason = "Failed to update strategy due to poisoned mutex"
113+
);
113114
});
114115
}
115116

0 commit comments

Comments
 (0)