perf: condition check

DataDog · Sep 16, 2024 · 1d924b4 · 1d924b4
1 parent 58c87b4
commit 1d924b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/DDTrace/OpenTelemetry/Context.php b/src/DDTrace/OpenTelemetry/Context.php
@@ -27,6 +27,9 @@ final class Context implements ContextInterface
     /** @var ContextStorageInterface&ExecutionContextAwareInterface */
     private static ContextStorageInterface $storage;
 
+    /** @var string $storageClass */
+    private static string $storageClass = '';
+
     // Optimization for spans to avoid copying the context array.
     private static ContextKeyInterface $spanContextKey;
     private ?object $span = null;
@@ -58,11 +61,13 @@ public static function setStorage(ContextStorageInterface $storage): void
      */
     public static function storage(): ContextStorageInterface
     {
-        if (class_exists('\OpenTelemetry\Context\FiberBoundContextStorageExecutionAwareBC')) {
-            return self::$storage ??= new FiberBoundContextStorageExecutionAwareBC();
-        } else {
-            return self::$storage ??= new ContextStorage();
+        if (self::$storageClass === '') {
+            self::$storageClass = class_exists('\OpenTelemetry\Context\FiberBoundContextStorageExecutionAwareBC')
+                ? '\OpenTelemetry\Context\FiberBoundContextStorageExecutionAwareBC' // v1.1+
+                : '\OpenTelemetry\Context\ContextStorage';
         }
+
+        return self::$storage ??= new self::$storageClass();
     }
 
     /**

diff --git a/src/DDTrace/OpenTelemetry/Span.php b/src/DDTrace/OpenTelemetry/Span.php
@@ -225,7 +225,8 @@ public function toSpanData(): SpanDataInterface
         $this->updateSpanLinks();
         $this->updateSpanEvents();
 
-        if (in_array('addLink', get_class_methods(SpanInterface::class))) {
+        if (method_exists(SpanInterface::class, 'addLink')) {
+            // v1.1 backward compatibility: totalRecordedLinks parameter added
             return new ImmutableSpan(
                 $this,
                 $this->getName(),