chore: fix traceparent header in tracing client

worldia · Nov 6, 2024 · 4840d57 · 4840d57
1 parent c7d305a
commit 4840d57
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/src/Http/TracingHttpClient.php b/src/Http/TracingHttpClient.php
@@ -93,27 +93,13 @@ public function request(string $method, string $url, array $options = []): Respo
         $headers = $options['headers'] ?? [];
         $operationName = $options['extra']['operation_name'] ?? $this->operationNameResolver->getOperationName($method, $url);
 
-        $attributes = $this->attributeProvider->getAttributes($method, $url, $headers);
-        $attributes += $options['extra']['extra_attributes'] ?? [];
-
-        $options['user_data']['span_attributes'] = $this->getExtraSpanAttributes($options['extra']['span_attributes'] ?? null);
-
-        try {
-            if (\in_array('request.body', $options['user_data']['span_attributes'])) {
-                $attributes['request.body'] = self::getRequestBody($options);
-            }
-            if (\in_array('request.headers', $options['user_data']['span_attributes'])) {
-                $attributes['request.headers'] = HttpMessageHelper::formatHeadersForSpanAttribute($headers);
-            }
-        } catch (\Throwable) {
-        }
-
         $span = Tracing::getTracer()
             ->spanBuilder($operationName)
             ->setSpanKind(SpanKind::KIND_CLIENT)
-            ->setAttributes($attributes)
             ->startSpan();
 
+        $span->activate();
+
         $options = array_merge($options, [
             'on_progress' => function ($dlNow, $dlSize, $info) use ($onProgress, $span, $options) {
                 static $dlStarted = false;
@@ -130,8 +116,8 @@ public function request(string $method, string $url, array $options = []): Respo
                         $span->updateName($operationName);
                     }
 
-                    $span->setAttribute(TraceAttributes::HTTP_STATUS_CODE, $info['http_code']);
-                    $span->setAttribute(TraceAttributes::HTTP_URL, $info['url']);
+                    $span->setAttribute(TraceAttributes::HTTP_RESPONSE_STATUS_CODE, $info['http_code']);
+                    $span->setAttribute(TraceAttributes::URL_FULL, $info['url']);
 
                     if (\array_key_exists('total_time', $info)) {
                         $timestamp = (int) (($info['start_time'] + $info['total_time']) * ClockInterface::NANOS_PER_SECOND);
@@ -149,6 +135,23 @@ public function request(string $method, string $url, array $options = []): Respo
             ),
         ]);
 
+        $attributes = $this->attributeProvider->getAttributes($method, $url, $headers);
+        $attributes += $options['extra']['extra_attributes'] ?? [];
+
+        $options['user_data']['span_attributes'] = $this->getExtraSpanAttributes($options['extra']['span_attributes'] ?? null);
+
+        try {
+            if (\in_array('request.body', $options['user_data']['span_attributes'])) {
+                $attributes['request.body'] = self::getRequestBody($options);
+            }
+            if (\in_array('request.headers', $options['user_data']['span_attributes'])) {
+                $attributes['request.headers'] = HttpMessageHelper::formatHeadersForSpanAttribute($options['headers']);
+            }
+        } catch (\Throwable) {
+        }
+
+        $span->setAttributes($attributes);
+
         return new TracedResponse($this->client->request($method, $url, $options), $span);
     }