Merge remote-tracking branch 'upstream/main' into spi/laravel

Author: ChrisLightfootWild

src/Aws/src/AwsSdkInstrumentation.php

@@ -109,9 +109,17 @@ public function activate(): bool
 
             /** @psalm-suppress PossiblyInvalidArgument */
             $end_middleware = Middleware::mapResult(function (ResultInterface $result) {
-                $this->span->setAttributes([
-                    'http.status_code' => $result['@metadata']['statusCode'], //@phan-suppress-current-line PhanTypeMismatchDimFetch
-                ]);
+                /**
+                 * Some AWS SDK Funtions, such as S3Client->getObjectUrl() do not actually perform on the wire comms
+                 * with AWS Servers, and therefore do not return with a populated AWS\Result object with valid @metadata
+                 * Check for the presence of @metadata before extracting status code as these calls are still
+                 * instrumented.
+                 */
+                if (isset($result['@metadata'])) {
+                    $this->span->setAttributes([
+                        'http.status_code' => $result['@metadata']['statusCode'], //@phan-suppress-current-line PhanTypeMismatchDimFetch
+                    ]);
+                }
 
                 $this->span->end();
                 $this->scope->detach();

src/Instrumentation/Guzzle/src/GuzzleInstrumentation.php

@@ -5,7 +5,7 @@
 namespace OpenTelemetry\Contrib\Instrumentation\Guzzle;
 
 use function get_cfg_var;
-use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Client;
 use GuzzleHttp\Promise\PromiseInterface;
 use OpenTelemetry\API\Globals;
 use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
@@ -35,9 +35,9 @@ public static function register(): void
         );
 
         hook(
-            ClientInterface::class,
+            Client::class,
             'transfer',
-            pre: static function (ClientInterface $client, array $params, string $class, string $function, ?string $filename, ?int $lineno) use ($instrumentation): array {
+            pre: static function (Client $client, array $params, string $class, string $function, ?string $filename, ?int $lineno) use ($instrumentation): array {
                 $request = $params[0];
                 assert($request instanceof RequestInterface);
 
@@ -84,7 +84,7 @@ public static function register(): void
 
                 return [$request];
             },
-            post: static function (ClientInterface $client, array $params, PromiseInterface $promise, ?Throwable $exception): void {
+            post: static function (Client $client, array $params, PromiseInterface $promise, ?Throwable $exception): void {
                 $scope = Context::storage()->scope();
                 $scope?->detach();
 

src/Instrumentation/Symfony/src/HttpClientInstrumentation.php

@@ -52,6 +52,7 @@ public static function register(): void
                     ->tracer()
                     ->spanBuilder(\sprintf('%s', $params[0]))
                     ->setSpanKind(SpanKind::KIND_CLIENT)
+                    ->setAttribute(TraceAttributes::PEER_SERVICE, parse_url((string) $params[1])['host'] ?? null)
                     ->setAttribute(TraceAttributes::URL_FULL, (string) $params[1])
                     ->setAttribute(TraceAttributes::HTTP_REQUEST_METHOD, $params[0])
                     ->setAttribute(TraceAttributes::CODE_FUNCTION, $function)

src/Instrumentation/Symfony/src/MessengerInstrumentation.php

@@ -58,7 +58,7 @@ public static function register(): void
                 $builder = $instrumentation
                     ->tracer()
                     ->spanBuilder(\sprintf('DISPATCH %s', $messageClass))
-                    ->setSpanKind(SpanKind::KIND_INTERNAL)
+                    ->setSpanKind(SpanKind::KIND_PRODUCER)
                     ->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
                     ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
                     ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
@@ -125,7 +125,7 @@ public static function register(): void
                 $builder = $instrumentation
                     ->tracer()
                     ->spanBuilder(\sprintf('SEND %s', $messageClass))
-                    ->setSpanKind(SpanKind::KIND_INTERNAL)
+                    ->setSpanKind(SpanKind::KIND_PRODUCER)
                     ->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
                     ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
                     ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)

src/Instrumentation/Symfony/src/SymfonyInstrumentation.php

@@ -104,7 +104,9 @@ public static function register(): void
                     $span->recordException($exception, [
                         TraceAttributes::EXCEPTION_ESCAPED => true,
                     ]);
-                    $span->setStatus(StatusCode::STATUS_ERROR, $exception->getMessage());
+                    if (null !== $response && $response->getStatusCode() >= Response::HTTP_INTERNAL_SERVER_ERROR) {
+                        $span->setStatus(StatusCode::STATUS_ERROR, $exception->getMessage());
+                    }
                 }
 
                 if (null === $response) {
@@ -159,8 +161,7 @@ public static function register(): void
                 Span::getCurrent()
                     ->recordException($throwable, [
                         TraceAttributes::EXCEPTION_ESCAPED => true,
-                    ])
-                    ->setStatus(StatusCode::STATUS_ERROR, $throwable->getMessage());
+                    ]);
 
                 return $params;
             },

src/Instrumentation/Symfony/tests/Integration/HttpClientInstrumentationTest.php

@@ -48,6 +48,8 @@ public function test_send_request(string $method, string $uri, int $statusCode,
             $this->assertNotNull($requestHeaders['HTTP_TRACEPARENT']);
         }
 
+        $this->assertTrue($span->getAttributes()->has(TraceAttributes::PEER_SERVICE));
+        $this->assertSame(parse_url($uri)['host'] ?? null, $span->getAttributes()->get(TraceAttributes::PEER_SERVICE));
         $this->assertTrue($span->getAttributes()->has(TraceAttributes::URL_FULL));
         $this->assertSame($uri, $span->getAttributes()->get(TraceAttributes::URL_FULL));
         $this->assertTrue($span->getAttributes()->has(TraceAttributes::HTTP_REQUEST_METHOD));

src/Instrumentation/Symfony/tests/Integration/MessengerInstrumentationTest.php

@@ -157,7 +157,7 @@ public function sendDataProvider(): array
             [
                 new SendEmailMessage('Hello Again'),
                 'SEND OpenTelemetry\Tests\Instrumentation\Symfony\tests\Integration\SendEmailMessage',
-                SpanKind::KIND_INTERNAL,
+                SpanKind::KIND_PRODUCER,
                 [
                     MessengerInstrumentation::ATTRIBUTE_MESSENGER_TRANSPORT => class_exists('Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport') ? 'Symfony\Component\Messenger\Transport\InMemory\InMemoryTransport' : 'Symfony\Component\Messenger\Transport\InMemoryTransport',
                     MessengerInstrumentation::ATTRIBUTE_MESSENGER_MESSAGE => 'OpenTelemetry\Tests\Instrumentation\Symfony\tests\Integration\SendEmailMessage',
@@ -172,7 +172,7 @@ public function dispatchDataProvider(): array
             [
                 new SendEmailMessage('Hello Again'),
                 'DISPATCH OpenTelemetry\Tests\Instrumentation\Symfony\tests\Integration\SendEmailMessage',
-                SpanKind::KIND_INTERNAL,
+                SpanKind::KIND_PRODUCER,
                 [
                     MessengerInstrumentation::ATTRIBUTE_MESSENGER_BUS => 'Symfony\Component\Messenger\MessageBus',
                     MessengerInstrumentation::ATTRIBUTE_MESSENGER_MESSAGE => 'OpenTelemetry\Tests\Instrumentation\Symfony\tests\Integration\SendEmailMessage',