Fix span suppression should suppress nested spans of non-recording spans too (#1921)

Author: Nevay

src/SDK/Trace/NonRecordingSpan.php

@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenTelemetry\SDK\Trace;
+
+use OpenTelemetry\API\Trace\SpanContextInterface;
+use OpenTelemetry\API\Trace\SpanInterface;
+use OpenTelemetry\Context\ContextInterface;
+use OpenTelemetry\SDK\Trace\SpanSuppression\SpanSuppression;
+use Override;
+use Throwable;
+
+/**
+ * @internal
+ */
+final class NonRecordingSpan extends \OpenTelemetry\API\Trace\Span
+{
+    public function __construct(
+        private readonly SpanContextInterface $spanContext,
+        private readonly SpanSuppression $spanSuppression,
+    ) {
+    }
+
+    #[Override]
+    public function storeInContext(ContextInterface $context): ContextInterface
+    {
+        return $this->spanSuppression->suppress(parent::storeInContext($context));
+    }
+
+    #[Override]
+    public function getContext(): SpanContextInterface
+    {
+        return $this->spanContext;
+    }
+
+    #[Override]
+    public function isRecording(): bool
+    {
+        return false;
+    }
+
+    #[Override]
+    public function setAttribute(string $key, float|array|bool|int|string|null $value): SpanInterface
+    {
+        return $this;
+    }
+
+    #[Override]
+    public function setAttributes(iterable $attributes): SpanInterface
+    {
+        return $this;
+    }
+
+    #[Override]
+    public function addLink(SpanContextInterface $context, iterable $attributes = []): SpanInterface
+    {
+        return $this;
+    }
+
+    #[Override]
+    public function addEvent(string $name, iterable $attributes = [], ?int $timestamp = null): SpanInterface
+    {
+        return $this;
+    }
+
+    #[Override]
+    public function recordException(Throwable $exception, iterable $attributes = []): SpanInterface
+    {
+        return $this;
+    }
+
+    #[Override]
+    public function updateName(string $name): SpanInterface
+    {
+        return $this;
+    }
+
+    #[Override]
+    public function setStatus(string $code, ?string $description = null): SpanInterface
+    {
+        return $this;
+    }
+
+    #[Override]
+    public function end(?int $endEpochNanos = null): void
+    {
+        // no-op
+    }
+}

src/SDK/Trace/SpanBuilder.php

@@ -168,8 +168,7 @@ public function startSpan(): API\SpanInterface
         );
 
         if (!in_array($samplingDecision, [SamplingResult::RECORD_AND_SAMPLE, SamplingResult::RECORD_ONLY], true)) {
-            // TODO must suppress no-op spans too
-            return Span::wrap($spanContext);
+            return new NonRecordingSpan($spanContext, $spanSuppression);
         }
 
         $attributesBuilder = clone $this->attributesBuilder;

tests/Integration/SDK/TracerTest.php

@@ -41,7 +41,7 @@ public function test_noop_span_should_be_started_when_sampling_result_is_drop():
         $processor->expects($this->never())->method('onStart');
         $span = $tracer->spanBuilder('test.span')->startSpan();
 
-        $this->assertInstanceOf(NonRecordingSpan::class, $span);
+        $this->assertFalse($span->isRecording());
         $this->assertNotEquals(API\TraceFlags::SAMPLED, $span->getContext()->getTraceFlags());
     }