diff --git a/src/bridge/symfony/telemetry-bundle/src/Flow/Bridge/Symfony/TelemetryBundle/Instrumentation/Messenger/TracingMiddleware.php b/src/bridge/symfony/telemetry-bundle/src/Flow/Bridge/Symfony/TelemetryBundle/Instrumentation/Messenger/TracingMiddleware.php index 5fc9b7f3d..e263e1895 100644 --- a/src/bridge/symfony/telemetry-bundle/src/Flow/Bridge/Symfony/TelemetryBundle/Instrumentation/Messenger/TracingMiddleware.php +++ b/src/bridge/symfony/telemetry-bundle/src/Flow/Bridge/Symfony/TelemetryBundle/Instrumentation/Messenger/TracingMiddleware.php @@ -50,17 +50,18 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope $isReceived = $receivedStamp !== null; $kind = $isReceived ? SpanKind::CONSUMER : SpanKind::PRODUCER; - $operation = $isReceived ? 'receive' : 'send'; + $operation = $isReceived ? 'process' : 'send'; $busName = $busNameStamp instanceof BusNameStamp ? $busNameStamp->getBusName() : 'default'; - $spanName = "{$busName} {$shortMessageClass}"; + $spanName = "{$operation} {$shortMessageClass}"; $attributes = [ 'messaging.system' => 'symfony_messenger', - 'messaging.destination.name' => $busName, + 'messaging.destination.name' => $shortMessageClass, 'messaging.message.class' => $messageClass, 'messaging.operation.type' => $operation, - 'messaging.operation.name' => $messageClass, + 'messaging.operation.name' => $operation, + 'messaging.symfony.bus' => $busName, ]; if ($receivedStamp instanceof ReceivedStamp) { diff --git a/src/bridge/symfony/telemetry-bundle/tests/Flow/Bridge/Symfony/TelemetryBundle/Tests/Integration/Instrumentation/Messenger/TracingMiddlewareTest.php b/src/bridge/symfony/telemetry-bundle/tests/Flow/Bridge/Symfony/TelemetryBundle/Tests/Integration/Instrumentation/Messenger/TracingMiddlewareTest.php index 40874279e..132a8651d 100644 --- a/src/bridge/symfony/telemetry-bundle/tests/Flow/Bridge/Symfony/TelemetryBundle/Tests/Integration/Instrumentation/Messenger/TracingMiddlewareTest.php +++ b/src/bridge/symfony/telemetry-bundle/tests/Flow/Bridge/Symfony/TelemetryBundle/Tests/Integration/Instrumentation/Messenger/TracingMiddlewareTest.php @@ -743,15 +743,16 @@ public function test_traces_message_dispatch(): void static::assertCount(1, $spans); $span = $spans[0]; - static::assertSame('command.bus TestMessage', $span->name()); + static::assertSame('send TestMessage', $span->name()); static::assertSame(SpanKind::PRODUCER, $span->kind()); $attributes = $span->attributes(); static::assertSame('symfony_messenger', $attributes['messaging.system']); - static::assertSame('command.bus', $attributes['messaging.destination.name']); + static::assertSame('TestMessage', $attributes['messaging.destination.name']); static::assertSame(TestMessage::class, $attributes['messaging.message.class']); static::assertSame('send', $attributes['messaging.operation.type']); - static::assertSame(TestMessage::class, $attributes['messaging.operation.name']); + static::assertSame('send', $attributes['messaging.operation.name']); + static::assertSame('command.bus', $attributes['messaging.symfony.bus']); $status = $span->status(); static::assertNotNull($status);