Bump opentelemetry.

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-06-08 03:28:03 +00:00
parent 83fe14c522
commit f63cc84c98
4 changed files with 34 additions and 128 deletions

View File

@@ -116,7 +116,7 @@ perf_measurements = [
"dep:tracing-flame",
"dep:tracing-opentelemetry",
"dep:opentelemetry_sdk",
"dep:opentelemetry-jaeger",
#"dep:opentelemetry-jaeger",
"tuwunel-core/perf_measurements",
"tuwunel-core/sentry_telemetry",
]
@@ -178,8 +178,8 @@ clap.workspace = true
const-str.workspace = true
ctor.workspace = true
log.workspace = true
opentelemetry-jaeger.optional = true
opentelemetry-jaeger.workspace = true
#opentelemetry-jaeger.optional = true
#opentelemetry-jaeger.workspace = true
opentelemetry.optional = true
opentelemetry.workspace = true
opentelemetry_sdk.optional = true

View File

@@ -77,9 +77,11 @@ pub(crate) fn init(
(None, None)
};
#[cfg(tuwunel_disable)]
let jaeger_filter = EnvFilter::try_new(&config.jaeger_filter)
.map_err(|e| err!(Config("jaeger_filter", "{e}.")))?;
#[cfg(tuwunel_disable)]
let jaeger_layer = config.allow_jaeger.then(|| {
opentelemetry::global::set_text_map_propagator(
opentelemetry_jaeger::Propagator::new(),
@@ -100,7 +102,10 @@ pub(crate) fn init(
Some(telemetry.with_filter(jaeger_reload_filter))
});
#[cfg(tuwunel_disable)]
let subscriber = subscriber.with(flame_layer).with(jaeger_layer);
let subscriber = subscriber.with(flame_layer);
(subscriber, flame_guard)
};