Add exchange/routingKey to RabbitMessageSenderContext

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java

@@ -2486,7 +2486,7 @@ protected void observeTheSend(Channel channel, Message message, boolean mandator
 		ObservationRegistry registry = getObservationRegistry();
 		Observation observation = RabbitTemplateObservation.TEMPLATE_OBSERVATION.observation(this.observationConvention,
 				DefaultRabbitTemplateObservationConvention.INSTANCE,
-					() -> new RabbitMessageSenderContext(message, this.beanName, exch + "/" + rKey), registry);
+					() -> new RabbitMessageSenderContext(message, this.beanName, exch, rKey), registry);
 
 		observation.observe(() -> sendToRabbit(channel, exch, rKey, mandatory, message));
 	}

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/micrometer/RabbitMessageSenderContext.java

@@ -33,11 +33,17 @@ public class RabbitMessageSenderContext extends SenderContext<Message> {
 
 	private final String destination;
 
-	public RabbitMessageSenderContext(Message message, String beanName, String destination) {
+	private final String exchange;
+
+	private final String routingKey;
+
+	public RabbitMessageSenderContext(Message message, String beanName, String exchange, String routingKey) {
 		super((carrier, key, value) -> message.getMessageProperties().setHeader(key, value));
 		setCarrier(message);
 		this.beanName = beanName;
-		this.destination = destination;
+		this.exchange = exchange;
+		this.routingKey = routingKey;
+		this.destination = exchange + "/" + routingKey;
 		setRemoteServiceName("RabbitMQ");
 	}
 
@@ -53,4 +59,20 @@ public String getDestination() {
 		return this.destination;
 	}
 
+	/**
+	 * Return the exchange.
+	 * @return the exchange.
+	 */
+	public String getExchange() {
+		return this.exchange;
+	}
+
+	/**
+	 * Return the routingKey.
+	 * @return the routingKey.
+	 */
+	public String getRoutingKey() {
+		return this.routingKey;
+	}
+
 }