diff --git a/src/sentry/src/Tracing/Aspect/AmqpProducerAspect.php b/src/sentry/src/Tracing/Aspect/AmqpProducerAspect.php index ef2d83ff0..3f195a10f 100644 --- a/src/sentry/src/Tracing/Aspect/AmqpProducerAspect.php +++ b/src/sentry/src/Tracing/Aspect/AmqpProducerAspect.php @@ -85,7 +85,7 @@ protected function handleProduceMessage(ProceedingJoinPoint $proceedingJoinPoint } $messageId = uniqid('amqp_', true); - $destinationName = $exchange ?: 'default'; + $destinationName = implode(', ', (array) $routingKey); $bodySize = strlen($producerMessage->payload()); $span->setData([ 'messaging.system' => 'amqp', diff --git a/src/sentry/src/Tracing/Listener/TracingAmqpListener.php b/src/sentry/src/Tracing/Listener/TracingAmqpListener.php index edc102107..7def27e42 100644 --- a/src/sentry/src/Tracing/Listener/TracingAmqpListener.php +++ b/src/sentry/src/Tracing/Listener/TracingAmqpListener.php @@ -109,7 +109,7 @@ protected function finishTransaction(AfterConsume|FailToConsume $event): void 'messaging.message.body.size' => $carrier?->get('body_size'), 'messaging.message.receive.latency' => $carrier?->has('publish_time') ? (microtime(true) - $carrier->get('publish_time')) : null, 'messaging.message.retry.count' => 0, - 'messaging.destination.name' => $carrier?->get('destination_name') ?: $message->getExchange(), + 'messaging.destination.name' => $carrier?->get('destination_name') ?: implode(', ', (array) $message->getRoutingKey()), // for amqp 'messaging.amqp.message.type' => $message->getTypeString(), 'messaging.amqp.message.routing_key' => $message->getRoutingKey(),