move to tracer

Author: cijothomas

opentelemetry-sdk/CHANGELOG.md

@@ -2,16 +2,14 @@
 
 ## vNext
 
-`SdkLogger` modified to respect telemetry suppression based on `Context`. A
-similar change is done for Tracing signal too, by returning `Sampling::Drop`
-when telemetry is suppressed. In other words, if the current context has
-telemetry suppression enabled, then logs/spans will be ignored. The flag is
-typically set by OTel components to prevent telemetry from itself being fed back
-into OTel. `BatchLogProcessor`, `BatchSpanProcessor`, and `PeriodicReader`
-modified to set the suppression flag in their dedicated thread, so that
-telemetry generated from those threads will not be fed back into OTel.
-Similarly, `SimpleLogProcessor` also modified to suppress telemetry before
-invoking exporters.
+`SdkLogger`, `SdkTracer` modified to respect telemetry suppression based on
+`Context`. In other words, if the current context has telemetry suppression
+enabled, then logs/spans will be ignored. The flag is typically set by OTel
+components to prevent telemetry from itself being fed back into OTel.
+`BatchLogProcessor`, `BatchSpanProcessor`, and `PeriodicReader` modified to set
+the suppression flag in their dedicated thread, so that telemetry generated from
+those threads will not be fed back into OTel. Similarly, `SimpleLogProcessor`
+also modified to suppress telemetry before invoking exporters.
 
 ## 0.29.0
 

opentelemetry-sdk/src/trace/sampler.rs

@@ -172,25 +172,6 @@ impl ShouldSample for Sampler {
         attributes: &[KeyValue],
         links: &[Link],
     ) -> SamplingResult {
-        // Checking suppression mode in sampler is more efficient than checking
-        // it in the span processor as this allows earlier short-circuiting.
-        // Also, it is currently *NOT* possible to check suppression mode or
-        // even access current context in the span processor's OnEnd method. See
-        // https://github.com/open-telemetry/opentelemetry-rust/issues/2871
-        // TODO: Can we move this even earlier, i.e. in the Tracer itself?
-        // TODO: Check and fix: why this methods gets Option<&Context> and not
-        // Context?
-        if let Some(parent_context) = parent_context {
-            if parent_context.is_telemetry_suppressed() {
-                return SamplingResult {
-                    decision: SamplingDecision::Drop,
-                    // No extra attributes ever set by the SDK samplers.
-                    attributes: Vec::new(),
-                    // all sampler in SDK will not modify trace state.
-                    trace_state: TraceState::default(),
-                };
-            }
-        }
         let decision = match self {
             // Always sample the trace
             Sampler::AlwaysOn => SamplingDecision::RecordAndSample,

opentelemetry-sdk/src/trace/tracer.rs

@@ -178,6 +178,15 @@ impl opentelemetry::trace::Tracer for SdkTracer {
     /// trace includes a single root span, which is the shared ancestor of all other
     /// spans in the trace.
     fn build_with_context(&self, mut builder: SpanBuilder, parent_cx: &Context) -> Self::Span {
+        if parent_cx.is_telemetry_suppressed() {
+            return Span::new(
+                SpanContext::empty_context(),
+                None,
+                self.clone(),
+                SpanLimits::default(),
+            );
+        }
+
         let provider = self.provider();
         // no point start a span if the tracer provider has already being shutdown
         if provider.is_shutdown() {