Merge branch '6.1.x'

Author: bclozel

spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java

@@ -676,16 +676,21 @@ public void setupMessageListener(Object messageListener) {
 	 * @see #handleListenerException
 	 */
 	protected void executeListener(Session session, Message message) {
-		createObservation(message).observe(() -> {
-			try {
-				doExecuteListener(session, message);
-			}
-			catch (Throwable ex) {
-				handleListenerException(ex);
-			}
-		});
+		try {
+			doExecuteListener(session, message);
+		}
+		catch (Throwable ex) {
+			handleListenerException(ex);
+		}
 	}
 
+	/**
+	 * Create, but do not start an {@link Observation} for JMS message processing.
+	 * <p>This will return a "no-op" observation if Micrometer Jakarta instrumentation
+	 * is not available or if no Observation Registry has been configured.
+	 * @param message the message to be observed
+	 * @since 6.1
+	 */
 	protected Observation createObservation(Message message) {
 		if (micrometerJakartaPresent && this.observationRegistry != null) {
 			return ObservationFactory.create(this.observationRegistry, message);
@@ -770,7 +775,6 @@ protected void doInvokeListener(SessionAwareMessageListener listener, Session se
 
 		Connection conToClose = null;
 		Session sessionToClose = null;
-		Observation observation = createObservation(message);
 		try {
 			Session sessionToUse = session;
 			if (micrometerJakartaPresent && this.observationRegistry != null) {
@@ -782,7 +786,6 @@ protected void doInvokeListener(SessionAwareMessageListener listener, Session se
 				sessionToClose = createSession(conToClose);
 				sessionToUse = sessionToClose;
 			}
-			observation.start();
 			// Actually invoke the message listener...
 			listener.onMessage(message, sessionToUse);
 			// Clean up specially exposed Session, if any.
@@ -794,11 +797,9 @@ protected void doInvokeListener(SessionAwareMessageListener listener, Session se
 			}
 		}
 		catch (JMSException exc) {
-			observation.error(exc);
 			throw exc;
 		}
 		finally {
-			observation.stop();
 			JmsUtils.closeSession(sessionToClose);
 			JmsUtils.closeConnection(conToClose);
 		}

spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer.java

@@ -353,7 +353,7 @@ protected void processMessage(Message message, Session session) {
 					connectionFactory, new LocallyExposedJmsResourceHolder(session));
 		}
 		try {
-			executeListener(session, message);
+			createObservation(message).observe(() -> executeListener(session, message));
 		}
 		finally {
 			if (exposeResource) {

spring-jms/src/test/java/org/springframework/jms/listener/MessageListenerContainerObservationTests.java

@@ -74,7 +74,8 @@ void shouldRecordJmsProcessObservations(AbstractMessageListenerContainer listene
 		JmsTemplate jmsTemplate = new JmsTemplate(connectionFactory);
 		jmsTemplate.convertAndSend("spring.test.observation", "message content");
 		latch.await(2, TimeUnit.SECONDS);
-		assertThat(registry).hasObservationWithNameEqualTo("jms.message.process")
+		assertThat(registry).hasNumberOfObservationsWithNameEqualTo("jms.message.process", 1)
+				.hasObservationWithNameEqualTo("jms.message.process")
 				.that()
 				.hasHighCardinalityKeyValue("messaging.destination.name", "spring.test.observation");
 		assertThat(registry).hasNumberOfObservationsEqualTo(1);
@@ -98,8 +99,7 @@ void shouldRecordJmsPublishObservations(AbstractMessageListenerContainer listene
 		TextMessage response = (TextMessage) jmsTemplate.sendAndReceive("spring.test.observation",
 							session -> session.createTextMessage("test request"));
 
-		// request received by listener and response received by template
-		assertThat(registry).hasNumberOfObservationsWithNameEqualTo("jms.message.process", 2);
+		assertThat(registry).hasNumberOfObservationsWithNameEqualTo("jms.message.process", 1);
 		// response sent to the template
 		assertThat(registry).hasNumberOfObservationsWithNameEqualTo("jms.message.publish", 1);