wip: otel

Author: overtrue

.idea/laravel-open-telemetry.iml

@@ -1,6 +1,5 @@
 <?php
 
-use OpenTelemetry\SemConv\ResourceAttributes;
 use Overtrue\LaravelOpenTelemetry\Watchers;
 
 return [

.idea/php.xml

@@ -6,12 +6,8 @@
 use Illuminate\Http\Request;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\API\Trace\StatusCode;
-use OpenTelemetry\Context\Context;
-use OpenTelemetry\Contrib\Propagation\ServerTiming\ServerTimingPropagator;
-use OpenTelemetry\Contrib\Propagation\TraceResponse\TraceResponsePropagator;
 use OpenTelemetry\SemConv\TraceAttributes;
 use Overtrue\LaravelOpenTelemetry\Facades\Measure;
-use Overtrue\LaravelOpenTelemetry\Support\ResponsePropagationSetter;
 use Overtrue\LaravelOpenTelemetry\Traits\InteractWithHttpHeaders;
 use Symfony\Component\HttpFoundation\Response;
 use Throwable;
@@ -34,18 +30,12 @@ public function handle(Request $request, Closure $next, ?string $name = null)
         );
 
         $span = Measure::activeSpan()->setAttributes($this->getRequestSpanAttributes($request));
-        $context = Context::getCurrent();
 
         try {
             $response = $next($request);
 
             $this->recordHeaders($span, $request);
 
-            if ($response instanceof Response) {
-                $this->recordHttpResponseToSpan($span, $response);
-                $this->propagateHeaderToResponse($context, $response);
-            }
-
             // Add trace id to response header if configured.
             if ($traceIdHeaderName = config('otel.response_trace_header_name')) {
                 $response->headers->set($traceIdHeaderName, Measure::traceId());
@@ -60,41 +50,6 @@ public function handle(Request $request, Closure $next, ?string $name = null)
         }
     }
 
-    protected function recordHttpResponseToSpan(SpanInterface $span, Response $response): void
-    {
-        $span->setAttribute(TraceAttributes::NETWORK_PROTOCOL_VERSION, $response->getProtocolVersion());
-        $span->setAttribute(TraceAttributes::HTTP_RESPONSE_STATUS_CODE, $response->getStatusCode());
-
-        if (($content = $response->getContent()) !== false) {
-            $span->setAttribute(TraceAttributes::HTTP_RESPONSE_BODY_SIZE, strlen($content));
-        }
-
-        $this->recordHeaders($span, $response);
-
-        if ($response->isSuccessful()) {
-            $span->setStatus(StatusCode::STATUS_OK);
-        }
-
-        if ($response->isServerError() || $response->isClientError()) {
-            $span->setStatus(StatusCode::STATUS_ERROR);
-        }
-    }
-
-    protected function propagateHeaderToResponse($context, Response $response): void
-    {
-        // Propagate `server-timing` header to response, if ServerTimingPropagator is present
-        if (class_exists('OpenTelemetry\Contrib\Propagation\ServerTiming\ServerTimingPropagator')) {
-            $prop = new ServerTimingPropagator();
-            $prop->inject($response, ResponsePropagationSetter::instance(), $context);
-        }
-
-        // Propagate `traceresponse` header to response, if TraceResponsePropagator is present
-        if (class_exists('OpenTelemetry\Contrib\Propagation\TraceResponse\TraceResponsePropagator')) {
-            $prop = new TraceResponsePropagator();
-            $prop->inject($response, ResponsePropagationSetter::instance(), $context);
-        }
-    }
-
     protected function recordHeaders(SpanInterface $span, Request|Response $http): SpanInterface
     {
         $prefix = match (true) {

config/otel.php

@@ -30,4 +30,4 @@ public static function carbonToNanos(CarbonInterface $carbon): int
     {
         return (int) $carbon->getPreciseTimestamp(6) * 1000;
     }
-}
+}

src/Middlewares/MeasureRequest.php

@@ -5,16 +5,12 @@
 use Closure;
 use Illuminate\Contracts\Foundation\Application;
 use OpenTelemetry\API\Globals;
-use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanContextValidator;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\Context\ContextInterface;
-use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;
 use OpenTelemetry\Context\ScopeInterface;
-use OpenTelemetry\SDK\Propagation\PropagatorFactory;
-use OpenTelemetry\SDK\Registry;
 
 class Measure
 {
@@ -90,7 +86,7 @@ public function traceId(): ?string
 
     public function propagator()
     {
-        return (new PropagatorFactory())->create();
+        return Globals::propagator();
     }
 
     public function propagationHeaders(?ContextInterface $context = null): array

src/Support/CarbonClock.php

@@ -27,4 +27,4 @@ public function set(&$carrier, string $key, string $value): void
 
         $carrier->headers->set($key, $value);
     }
-}
+}

src/Support/Measure.php

@@ -7,7 +7,6 @@
 use OpenTelemetry\API\Trace\SpanContextInterface;
 use OpenTelemetry\API\Trace\SpanInterface;
 use OpenTelemetry\Context\ContextInterface;
-use OpenTelemetry\SDK\Common\Time\SystemClock;
 
 // this file is copied from https://github.com/keepsuit/laravel-opentelemetry/blob/main/src/Support/SpanBuilder.php
 class SpanBuilder