Refactor span context

src/API/Trace/Propagation/TraceContextPropagator.php

@@ -10,6 +10,7 @@
 use OpenTelemetry\API\Trace\AbstractSpan;
 use OpenTelemetry\API\Trace\SpanContext;
 use OpenTelemetry\API\Trace\SpanContextInterface;
+use OpenTelemetry\API\Trace\SpanContextValidator;
 use OpenTelemetry\API\Trace\TraceState;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\Context\Propagation\ArrayAccessGetterSetter;
@@ -113,10 +114,10 @@ private static function extractImpl($carrier, PropagationGetterInterface $getter
          * - Version is invalid (not 2 char hex or 'ff')
          * - Trace version, trace ID, span ID or trace flag are invalid
          */
-        if (!SpanContext::isValidTraceVersion($version)
-            || !SpanContext::isValidTraceId($traceId)
-            || !SpanContext::isValidSpanId($spanId)
-            || !SpanContext::isValidTraceFlag($traceFlags)
+        if (!SpanContextValidator::isValidTraceVersion($version)
+            || !SpanContextValidator::isValidTraceId($traceId)
+            || !SpanContextValidator::isValidSpanId($spanId)
+            || !SpanContextValidator::isValidTraceFlag($traceFlags)
         ) {
             return SpanContext::getInvalid();
         }
@@ -136,19 +137,22 @@ private static function extractImpl($carrier, PropagationGetterInterface $getter
         if ($rawTracestate !== null) {
             $tracestate = new TraceState($rawTracestate);
 
-            return SpanContext::createFromRemoteParent(
+            return SpanContext::create(
                 $traceId,
                 $spanId,
                 $isSampled ? SpanContextInterface::TRACE_FLAG_SAMPLED : SpanContextInterface::TRACE_FLAG_DEFAULT,
-                $tracestate
+                $tracestate,
+                true
             );
         }
 
         // Only traceparent header is extracted. No tracestate.
-        return SpanContext::createFromRemoteParent(
+        return SpanContext::create(
             $traceId,
             $spanId,
-            $isSampled ? SpanContextInterface::TRACE_FLAG_SAMPLED : SpanContextInterface::TRACE_FLAG_DEFAULT
+            $isSampled ? SpanContextInterface::TRACE_FLAG_SAMPLED : SpanContextInterface::TRACE_FLAG_DEFAULT,
+            null,
+            true
         );
     }
 }

src/API/Trace/SpanContext.php

@@ -4,92 +4,17 @@
 
 namespace OpenTelemetry\API\Trace;
 
-use OpenTelemetry\API\Trace as API;
-use function strlen;
-use function strtolower;
-
-final class SpanContext implements API\SpanContextInterface
+final class SpanContext implements SpanContextInterface
 {
     public const INVALID_TRACE = '00000000000000000000000000000000';
-    public const TRACE_VERSION_REGEX = '/^(?!ff)[\da-f]{2}$/';
     public const VALID_TRACE = '/^[0-9a-f]{32}$/';
     public const TRACE_LENGTH = 32;
     public const INVALID_SPAN = '0000000000000000';
     public const VALID_SPAN = '/^[0-9a-f]{16}$/';
-    public const SPAN_LENGTH = 16;
     public const SPAN_LENGTH_BYTES = 8;
     public const SAMPLED_FLAG = 1;
-    public const TRACE_FLAG_LENGTH = 2;
-
-    private static ?API\SpanContextInterface $invalidContext = null;
-
-    /** @inheritDoc */
-    public static function createFromRemoteParent(string $traceId, string $spanId, int $traceFlags = self::TRACE_FLAG_DEFAULT, ?API\TraceStateInterface $traceState = null): API\SpanContextInterface
-    {
-        return new self(
-            $traceId,
-            $spanId,
-            $traceFlags,
-            true,
-            $traceState,
-        );
-    }
-
-    /** @inheritDoc */
-    public static function create(string $traceId, string $spanId, int $traceFlags = self::TRACE_FLAG_DEFAULT, ?API\TraceStateInterface $traceState = null): API\SpanContextInterface
-    {
-        return new self(
-            $traceId,
-            $spanId,
-            $traceFlags,
-            false,
-            $traceState,
-        );
-    }
-
-    /** @inheritDoc */
-    public static function getInvalid(): API\SpanContextInterface
-    {
-        if (null === self::$invalidContext) {
-            self::$invalidContext = self::create(self::INVALID_TRACE, self::INVALID_SPAN, 0);
-        }
-
-        return self::$invalidContext;
-    }
-
-    /**
-     * @param string $traceVersion
-     * @return bool Returns a value that indicates whether a trace version is valid.
-     */
-    public static function isValidTraceVersion(string $traceVersion): bool
-    {
-        return 1 === preg_match(self::TRACE_VERSION_REGEX, $traceVersion);
-    }
 
-    /**
-     * @return bool Returns a value that indicates whether a trace id is valid
-     */
-    public static function isValidTraceId($traceId): bool
-    {
-        return ctype_xdigit($traceId) && strlen($traceId) === self::TRACE_LENGTH && $traceId !== self::INVALID_TRACE && $traceId === strtolower($traceId);
-    }
-
-    /**
-     * @return bool Returns a value that indicates whether a span id is valid
-     */
-    public static function isValidSpanId($spanId): bool
-    {
-        return ctype_xdigit($spanId) && strlen($spanId) === self::SPAN_LENGTH && $spanId !== self::INVALID_SPAN && $spanId === strtolower($spanId);
-    }
-
-    /**
-     * @return bool Returns a value that indicates whether trace flag is valid
-     * TraceFlags must be exactly 1 bytes (1 char) representing a bit field
-     */
-    public static function isValidTraceFlag($traceFlag): bool
-    {
-        return ctype_xdigit($traceFlag) && strlen($traceFlag) === self::TRACE_FLAG_LENGTH;
-    }
+    private static ?SpanContextInterface $invalidContext = null;
 
     /**
      * @see https://www.w3.org/TR/trace-context/#trace-flags
@@ -99,7 +24,7 @@ public static function isValidTraceFlag($traceFlag): bool
 
     private string $traceId;
     private string $spanId;
-    private ?API\TraceStateInterface $traceState;
+    private ?TraceStateInterface $traceState;
     private bool $isValid;
     private bool $isRemote;
     private int $traceFlags;
@@ -109,11 +34,11 @@ private function __construct(
         string $spanId,
         int $traceFlags,
         bool $isRemote,
-        API\TraceStateInterface $traceState = null
+        TraceStateInterface $traceState = null
     ) {
         // TraceId must be exactly 16 bytes (32 chars) and at least one non-zero byte
         // SpanId must be exactly 8 bytes (16 chars) and at least one non-zero byte
-        if (!self::isValidTraceId($traceId) || !self::isValidSpanId($spanId)) {
+        if (!SpanContextValidator::isValidTraceId($traceId) || !SpanContextValidator::isValidSpanId($spanId)) {
             $traceId = self::INVALID_TRACE;
             $spanId = self::INVALID_SPAN;
         }
@@ -124,7 +49,7 @@ private function __construct(
         $this->isRemote = $isRemote;
         $this->isSampled = ($traceFlags & self::SAMPLED_FLAG) === self::SAMPLED_FLAG;
         $this->traceFlags = $traceFlags;
-        $this->isValid = self::isValidTraceId($this->traceId) && self::isValidSpanId($this->spanId);
+        $this->isValid = SpanContextValidator::isValidTraceId($this->traceId) && SpanContextValidator::isValidSpanId($this->spanId);
     }
 
     public function getTraceId(): string
@@ -137,7 +62,7 @@ public function getSpanId(): string
         return $this->spanId;
     }
 
-    public function getTraceState(): ?API\TraceStateInterface
+    public function getTraceState(): ?TraceStateInterface
     {
         return $this->traceState;
     }
@@ -161,4 +86,26 @@ public function getTraceFlags(): int
     {
         return $this->traceFlags;
     }
+
+    /** @inheritDoc */
+    public static function create(string $traceId, string $spanId, int $traceFlags = self::TRACE_FLAG_DEFAULT, ?TraceStateInterface $traceState = null, bool $isRemote=false): SpanContextInterface
+    {
+        return new SpanContext(
+            $traceId,
+            $spanId,
+            $traceFlags,
+            $isRemote,
+            $traceState,
+        );
+    }
+
+    /** @inheritDoc */
+    public static function getInvalid(): SpanContextInterface
+    {
+        if (null === self::$invalidContext) {
+            self::$invalidContext = self::create(self::INVALID_TRACE, self::INVALID_SPAN, 0);
+        }
+
+        return self::$invalidContext;
+    }
 }

src/API/Trace/SpanContextInterface.php

@@ -12,14 +12,11 @@ interface SpanContextInterface
     public const TRACE_FLAG_SAMPLED = 0x01;
     public const TRACE_FLAG_DEFAULT = 0x00;
 
-    /** @todo Implement this in the API layer */
-    public static function createFromRemoteParent(string $traceId, string $spanId, int $traceFlags = self::TRACE_FLAG_DEFAULT, ?TraceStateInterface $traceState = null): SpanContextInterface;
-
     /** @todo Implement this in the API layer */
     public static function getInvalid(): SpanContextInterface;
 
     /** @todo Implement this in the API layer */
-    public static function create(string $traceId, string $spanId, int $traceFlags = self::TRACE_FLAG_DEFAULT, ?TraceStateInterface $traceState = null): SpanContextInterface;
+    public static function create(string $traceId, string $spanId, int $traceFlags = self::TRACE_FLAG_DEFAULT, ?TraceStateInterface $traceState = null, bool $isRemote=false): SpanContextInterface;
 
     /** @psalm-mutation-free */
     public function getTraceId(): string;

src/API/Trace/SpanContextValidator.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenTelemetry\API\Trace;
+
+use function strlen;
+use function strtolower;
+
+class SpanContextValidator
+{
+    public const INVALID_TRACE = '00000000000000000000000000000000';
+    public const INVALID_SPAN = '0000000000000000';
+    public const SPAN_LENGTH = 16;
+    public const TRACE_FLAG_LENGTH = 2;
+    public const TRACE_LENGTH = 32;
+    public const TRACE_VERSION_REGEX = '/^(?!ff)[\da-f]{2}$/';
+
+    /**
+     * @param string $traceVersion
+     * @return bool Returns a value that indicates whether a trace version is valid.
+     */
+    public static function isValidTraceVersion(string $traceVersion): bool
+    {
+        return 1 === preg_match(self::TRACE_VERSION_REGEX, $traceVersion);
+    }
+
+    /**
+     * @return bool Returns a value that indicates whether a trace id is valid
+     */
+    public static function isValidTraceId($traceId): bool
+    {
+        return ctype_xdigit($traceId) && strlen($traceId) === self::TRACE_LENGTH && $traceId !== self::INVALID_TRACE && $traceId === strtolower($traceId);
+    }
+
+    /**
+     * @return bool Returns a value that indicates whether a span id is valid
+     */
+    public static function isValidSpanId($spanId): bool
+    {
+        return ctype_xdigit($spanId) && strlen($spanId) === self::SPAN_LENGTH && $spanId !== self::INVALID_SPAN && $spanId === strtolower($spanId);
+    }
+
+    /**
+     * @return bool Returns a value that indicates whether trace flag is valid
+     * TraceFlags must be exactly 1 bytes (1 char) representing a bit field
+     */
+    public static function isValidTraceFlag($traceFlag): bool
+    {
+        return ctype_xdigit($traceFlag) && strlen($traceFlag) === self::TRACE_FLAG_LENGTH;
+    }
+}

src/Extension/Propagator/B3/B3MultiPropagator.php

@@ -7,6 +7,7 @@
 use OpenTelemetry\API\Trace\AbstractSpan;
 use OpenTelemetry\API\Trace\SpanContext;
 use OpenTelemetry\API\Trace\SpanContextInterface;
+use OpenTelemetry\API\Trace\SpanContextValidator;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\Context\Propagation\ArrayAccessGetterSetter;
 use OpenTelemetry\Context\Propagation\PropagationGetterInterface;
@@ -166,7 +167,7 @@ private static function extractImpl($carrier, PropagationGetterInterface $getter
 
         // Validates the traceId and spanId
         // Returns an invalid spanContext if any of the checks fail
-        if (!SpanContext::isValidTraceId($traceId) || !SpanContext::isValidSpanId($spanId)) {
+        if (!SpanContextValidator::isValidTraceId($traceId) || !SpanContextValidator::isValidSpanId($spanId)) {
             return SpanContext::getInvalid();
         }
 
@@ -177,10 +178,13 @@ private static function extractImpl($carrier, PropagationGetterInterface $getter
             $isSampled = ($sampled === SpanContext::SAMPLED_FLAG);
         }
 
-        return SpanContext::createFromRemoteParent(
+        // Only traceparent header is extracted. No tracestate.
+        return SpanContext::create(
             $traceId,
             $spanId,
-            $isSampled ? SpanContextInterface::TRACE_FLAG_SAMPLED : SpanContextInterface::TRACE_FLAG_DEFAULT
+            $isSampled ? SpanContextInterface::TRACE_FLAG_SAMPLED : SpanContextInterface::TRACE_FLAG_DEFAULT,
+            null,
+            true
         );
     }
 }

src/Extension/Propagator/B3/B3SinglePropagator.php

@@ -9,6 +9,7 @@
 use OpenTelemetry\API\Trace\AbstractSpan;
 use OpenTelemetry\API\Trace\SpanContext;
 use OpenTelemetry\API\Trace\SpanContextInterface;
+use OpenTelemetry\API\Trace\SpanContextValidator;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\Context\Propagation\ArrayAccessGetterSetter;
 use OpenTelemetry\Context\Propagation\PropagationGetterInterface;
@@ -155,7 +156,7 @@ private static function extractImpl($carrier, PropagationGetterInterface $getter
 
         // Validates the traceId and spanId
         // Returns an invalid spanContext if any of the checks fail
-        if (!SpanContext::isValidTraceId($traceId) || !SpanContext::isValidSpanId($spanId)) {
+        if (!SpanContextValidator::isValidTraceId($traceId) || !SpanContextValidator::isValidSpanId($spanId)) {
             return SpanContext::getInvalid();
         }
 
@@ -166,10 +167,12 @@ private static function extractImpl($carrier, PropagationGetterInterface $getter
         $sampled = self::processSampledValue($samplingState);
         $isSampled = ($sampled === SpanContext::SAMPLED_FLAG);
 
-        return SpanContext::createFromRemoteParent(
+        return SpanContext::create(
             $traceId,
             $spanId,
-            $isSampled ? SpanContextInterface::TRACE_FLAG_SAMPLED : SpanContextInterface::TRACE_FLAG_DEFAULT
+            $isSampled ? SpanContextInterface::TRACE_FLAG_SAMPLED : SpanContextInterface::TRACE_FLAG_DEFAULT,
+            null,
+            true
         );
     }
 }

src/SDK/Trace/RandomIdGenerator.php

@@ -4,7 +4,7 @@
 
 namespace OpenTelemetry\SDK\Trace;
 
-use OpenTelemetry\API\Trace\SpanContext;
+use OpenTelemetry\API\Trace\SpanContextValidator;
 use Throwable;
 
 class RandomIdGenerator implements IdGeneratorInterface
@@ -16,7 +16,7 @@ public function generateTraceId(): string
     {
         do {
             $traceId = $this->randomHex(self::TRACE_ID_HEX_LENGTH);
-        } while (!SpanContext::isValidTraceId($traceId));
+        } while (!SpanContextValidator::isValidTraceId($traceId));
 
         return $traceId;
     }
@@ -25,7 +25,7 @@ public function generateSpanId(): string
     {
         do {
             $spanId = $this->randomHex(self::SPAN_ID_HEX_LENGTH);
-        } while (!SpanContext::isValidSpanId($spanId));
+        } while (!SpanContextValidator::isValidSpanId($spanId));
 
         return $spanId;
     }

src/SDK/Trace/SpanBuilder.php

@@ -166,7 +166,7 @@ public function startSpan(): API\SpanInterface
             $traceId,
             $spanId,
             SamplingResult::RECORD_AND_SAMPLE === $samplingDecision ? API\SpanContextInterface::TRACE_FLAG_SAMPLED : API\SpanContextInterface::TRACE_FLAG_DEFAULT,
-            $samplingResultTraceState,
+            $samplingResultTraceState
         );
 
         if (!in_array($samplingDecision, [SamplingResult::RECORD_AND_SAMPLE, SamplingResult::RECORD_ONLY], true)) {

tests/Integration/SDK/AlwaysOffSamplerTest.php

@@ -46,11 +46,12 @@ private function createParentContext(bool $sampled, bool $isRemote, ?API\TraceSt
         $traceFlag = $sampled ? API\SpanContextInterface::TRACE_FLAG_SAMPLED : API\SpanContextInterface::TRACE_FLAG_DEFAULT;
 
         if ($isRemote) {
-            $spanContext = SpanContext::createFromRemoteParent(
+            $spanContext = SpanContext::create(
                 '4bf92f3577b34da6a3ce929d0e0e4736',
                 '00f067aa0ba902b7',
                 $traceFlag,
-                $traceState
+                $traceState,
+                true
             );
         } else {
             $spanContext = SpanContext::create(