Prevent creation of invalid trace id / span id (#699)

open-telemetry · Jun 6, 2022 · 3ca87a8 · 3ca87a8
1 parent 7dda601
commit 3ca87a8
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/SDK/Trace/RandomIdGenerator.php b/src/SDK/Trace/RandomIdGenerator.php
@@ -4,6 +4,7 @@
 
 namespace OpenTelemetry\SDK\Trace;
 
+use OpenTelemetry\API\Trace\SpanContext;
 use Throwable;
 
 class RandomIdGenerator implements IdGeneratorInterface
@@ -13,12 +14,20 @@ class RandomIdGenerator implements IdGeneratorInterface
 
     public function generateTraceId(): string
     {
-        return $this->randomHex(self::TRACE_ID_HEX_LENGTH);
+        do {
+            $traceId = $this->randomHex(self::TRACE_ID_HEX_LENGTH);
+        } while (!SpanContext::isValidTraceId($traceId));
+
+        return $traceId;
     }
 
     public function generateSpanId(): string
     {
-        return $this->randomHex(self::SPAN_ID_HEX_LENGTH);
+        do {
+            $spanId = $this->randomHex(self::SPAN_ID_HEX_LENGTH);
+        } while (!SpanContext::isValidSpanId($spanId));
+
+        return $spanId;
     }
 
     /**