From c1ab39fa5d7a0ebfa825dec51e0af3f0e22203ff Mon Sep 17 00:00:00 2001 From: Luca Palmieri Date: Mon, 29 Mar 2021 16:57:23 +0100 Subject: [PATCH 1/2] Set `set_tracer_provider` no longer returns a guard: it returns back the existing tracing provider. Therefore it should not be marked as `must_use`. --- opentelemetry/src/global/trace.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/opentelemetry/src/global/trace.rs b/opentelemetry/src/global/trace.rs index f095774aa1..5f3f5b2acf 100644 --- a/opentelemetry/src/global/trace.rs +++ b/opentelemetry/src/global/trace.rs @@ -253,7 +253,6 @@ pub fn tracer_with_version(name: &'static str, version: &'static str) -> BoxedTr /// Sets the given [`TracerProvider`] instance as the current global provider. /// /// [`TracerProvider`]: crate::trace::TracerProvider -#[must_use] pub fn set_tracer_provider(new_provider: P) -> GlobalTracerProvider where S: trace::Span + Send + Sync, From fe37b5432fa4f0166b57c021be8fa2c79cc80c5b Mon Sep 17 00:00:00 2001 From: Luca Palmieri Date: Mon, 29 Mar 2021 16:58:41 +0100 Subject: [PATCH 2/2] Explain return type for `set_tracer_provider` in function documentation. --- opentelemetry/src/global/trace.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opentelemetry/src/global/trace.rs b/opentelemetry/src/global/trace.rs index 5f3f5b2acf..1d09cde3a2 100644 --- a/opentelemetry/src/global/trace.rs +++ b/opentelemetry/src/global/trace.rs @@ -252,6 +252,9 @@ pub fn tracer_with_version(name: &'static str, version: &'static str) -> BoxedTr /// Sets the given [`TracerProvider`] instance as the current global provider. /// +/// It returns the [`TracerProvider`] instance that was previously mounted as global provider +/// (e.g. [`NoopTracerProvider`] if a provider had not been set before). +/// /// [`TracerProvider`]: crate::trace::TracerProvider pub fn set_tracer_provider(new_provider: P) -> GlobalTracerProvider where