Fix race condition in the IntObservZipkinTests

The `QueueChannel.receive()` may be fulfilled before
an observation is stopped in the `MessageHandler`

* Rework `IntegrationObservabilityZipkinTests` configuration to add
a `HandleMessageAdvice` to wait on the `CountDownLatch` before asserting spans
* Exclude an `adviceChain` attribute from the `ServiceActivatorAnnotationPostProcessor`
since an advice can be applied for the consumer endpoint, not the MH directly.
The `ConsumerEndpointFactoryBean` does the proper decision to apply advice onto MH
or just around its `handleMessage()` method

Author: artembilan

spring-integration-core/src/main/java/org/springframework/integration/config/annotation/ServiceActivatorAnnotationPostProcessor.java

@@ -46,7 +46,7 @@
 public class ServiceActivatorAnnotationPostProcessor extends AbstractMethodAnnotationPostProcessor<ServiceActivator> {
 
 	public ServiceActivatorAnnotationPostProcessor() {
-		this.messageHandlerAttributes.addAll(Arrays.asList("outputChannel", "requiresReply", "adviceChain"));
+		this.messageHandlerAttributes.addAll(Arrays.asList("outputChannel", "requiresReply"));
 	}
 
 	@Override

spring-integration-core/src/test/java/org/springframework/integration/support/management/observation/IntegrationObservabilityZipkinTests.java

@@ -18,17 +18,23 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.annotation.BridgeTo;
 import org.springframework.integration.annotation.EndpointId;
 import org.springframework.integration.annotation.Poller;
+import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.channel.interceptor.ObservationPropagationChannelInterceptor;
 import org.springframework.integration.config.EnableIntegration;
 import org.springframework.integration.config.EnableIntegrationManagement;
 import org.springframework.integration.config.GlobalChannelInterceptor;
+import org.springframework.integration.handler.BridgeHandler;
+import org.springframework.integration.handler.advice.HandleMessageAdvice;
 import org.springframework.integration.support.MutableMessage;
 import org.springframework.integration.support.MutableMessageBuilder;
 import org.springframework.messaging.Message;
@@ -79,6 +85,9 @@ public SampleTestRunnerConsumer yourCode() {
 				Message<?> receive = replyChannel.receive(10_000);
 				assertThat(receive).isNotNull()
 						.extracting("payload").isEqualTo("test data");
+				var configuration = applicationContext.getBean(ObservationIntegrationTestConfiguration.class);
+
+				assertThat(configuration.observedHandlerLatch.await(10, TimeUnit.SECONDS)).isTrue();
 			}
 
 			SpansAssert.assertThat(bb.getFinishedSpans())
@@ -105,19 +114,40 @@ public SampleTestRunnerConsumer yourCode() {
 	@EnableIntegrationManagement
 	public static class ObservationIntegrationTestConfiguration {
 
+		CountDownLatch observedHandlerLatch = new CountDownLatch(1);
+
 		@Bean
 		@GlobalChannelInterceptor
 		public ChannelInterceptor observationPropagationInterceptor(ObservationRegistry observationRegistry) {
 			return new ObservationPropagationChannelInterceptor(observationRegistry);
 		}
 
 		@Bean
-		@BridgeTo(poller = @Poller(fixedDelay = "100"))
-		@EndpointId("observedEndpoint")
 		public PollableChannel queueChannel() {
 			return new QueueChannel();
 		}
 
+		@Bean
+		@EndpointId("observedEndpoint")
+		@ServiceActivator(inputChannel = "queueChannel",
+				poller = @Poller(fixedDelay = "100"),
+				adviceChain = "observedHandlerAdvice")
+		BridgeHandler bridgeHandler() {
+			return new BridgeHandler();
+		}
+
+		@Bean
+		HandleMessageAdvice observedHandlerAdvice() {
+			return invocation -> {
+				try {
+					return invocation.proceed();
+				}
+				finally {
+					this.observedHandlerLatch.countDown();
+				}
+			};
+		}
+
 	}
 
 }