Actually make the OpenTelemetry code properly 8.4 compatible.

That code is not available on PHP 7.0 anyway. Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
DataDog · Jan 6, 2025 · 2aaaa29 · 2aaaa29
1 parent aa32943
commit 2aaaa29
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/DDTrace/Integrations/Logs/LogsIntegration.php b/src/DDTrace/Integrations/Logs/LogsIntegration.php
@@ -114,7 +114,7 @@ public static function replacePlaceholders(
     ): string {
         return strtr(
             $message,
-            $placeholders ? $placeholders : LogsIntegration::getPlaceholders($traceIdSubstitute, $spanIdSubstitute)
+            $placeholders ?: LogsIntegration::getPlaceholders($traceIdSubstitute, $spanIdSubstitute)
         );
     }
 

diff --git a/src/DDTrace/OpenTelemetry/Span.php b/src/DDTrace/OpenTelemetry/Span.php
@@ -20,6 +20,7 @@
 use OpenTelemetry\SDK\Common\Instrumentation\InstrumentationScopeInterface;
 use OpenTelemetry\SDK\Common\Time\ClockFactory;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
+use Psr\Link\LinkInterface;
 use Throwable;
 use function DDTrace\close_span;
 use function DDTrace\switch_stack;
@@ -427,7 +428,7 @@ public function updateName(string $name): SpanInterface
     /**
      * @inheritDoc
      */
-    public function setStatus(string $code, $description = null): SpanInterface
+    public function setStatus(string $code, ?string $description = null): SpanInterface
     {
         if ($this->hasEnded()) {
             return $this;
@@ -459,7 +460,7 @@ public function setStatus(string $code, $description = null): SpanInterface
     /**
      * @inheritDoc
      */
-    public function end($endEpochNanos = null): void
+    public function end(?int $endEpochNanos = null): void
     {
         if ($this->hasEnded()) {
             return;
@@ -472,7 +473,7 @@ public function end($endEpochNanos = null): void
         $this->spanProcessor->onEnd($this);
     }
 
-    public function endOTelSpan($endEpochNanos = null): void
+    public function endOTelSpan(?int $endEpochNanos = null): void
     {
         if ($this->hasEnded()) {
             return;
@@ -572,7 +573,7 @@ private function updateSpanEvents()
         $this->totalRecordedEvents = count($otel);
     }
 
-    private function createAndSaveSpanLink(SpanContextInterface $context, iterable $attributes = [], $link = null)
+    private function createAndSaveSpanLink(SpanContextInterface $context, iterable $attributes = [], ?LinkInterface $link = null)
     {
         $spanLink = new SpanLink();
         $spanLink->traceId = $context->getTraceId();

diff --git a/src/DDTrace/OpenTelemetry/SpanBuilder.php b/src/DDTrace/OpenTelemetry/SpanBuilder.php
@@ -96,18 +96,18 @@ public function addLink(SpanContextInterface $context, iterable $attributes = []
         return $this;
     }
 
-    public function addEvent(string $name, iterable $attributes = [], $timestamp = null): SpanBuilderInterface
+    public function addEvent(string $name, iterable $attributes = [], ?int $timestamp = null): SpanBuilderInterface
     {
         $this->events[] = new Event(
-            $name, 
+            $name,
             $timestamp ?? (int)(microtime(true) * 1e9),
             $this->tracerSharedState
                 ->getSpanLimits()
                 ->getEventAttributesFactory()
                 ->builder($attributes)
                 ->build(),
         );
-             
+
         return $this;
     }
 

diff --git a/src/ddtrace_php_api.stubs.php b/src/ddtrace_php_api.stubs.php
@@ -174,16 +174,16 @@ public function updateName(string $name) : \OpenTelemetry\API\Trace\SpanInterfac
         /**
          * @inheritDoc
          */
-        public function setStatus(string $code, $description = null) : \OpenTelemetry\API\Trace\SpanInterface
+        public function setStatus(string $code, ?string $description = null) : \OpenTelemetry\API\Trace\SpanInterface
         {
         }
         /**
          * @inheritDoc
          */
-        public function end($endEpochNanos = null) : void
+        public function end(?int $endEpochNanos = null) : void
         {
         }
-        public function endOTelSpan($endEpochNanos = null) : void
+        public function endOTelSpan(?int $endEpochNanos = null) : void
         {
         }
         public function getResource() : \OpenTelemetry\SDK\Resource\ResourceInfo
@@ -212,7 +212,7 @@ public function setParent($context) : \OpenTelemetry\API\Trace\SpanBuilderInterf
         public function addLink(\OpenTelemetry\API\Trace\SpanContextInterface $context, iterable $attributes = []) : \OpenTelemetry\API\Trace\SpanBuilderInterface
         {
         }
-        public function addEvent(string $name, iterable $attributes = [], $timestamp = null) : \OpenTelemetry\API\Trace\SpanBuilderInterface
+        public function addEvent(string $name, iterable $attributes = [], ?int $timestamp = null) : \OpenTelemetry\API\Trace\SpanBuilderInterface
         {
         }
         public function recordException(\Throwable $exception, iterable $attributes = []) : \OpenTelemetry\API\Trace\SpanBuilderInterface