Re-enable RabbitMultiBinderObservationTests

Spring Boot now has a dedicated `spring-boot-micrometer-tracing-brave` module
to auto-configure Brave tracing
* Remove redundant now `micrometer-tracing-bridge-brave` dependency
* Remove comment for the `@AutoConfigureMetric` from the `RabbitMultiBinderObservationTests`
since test logic does nothing with metrics
* Fix comment for spans in the trace: now Spring Integration handlers are also report
their observation even in binder context

Author: artembilan

binders/rabbit-binder/spring-cloud-stream-binder-rabbit/pom.xml

@@ -52,6 +52,11 @@
 			<artifactId>spring-boot-autoconfigure</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-micrometer-tracing-brave</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-micrometer-tracing-test</artifactId>
@@ -115,11 +120,6 @@
 			<version>1.17.1</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-tracing-bridge-brave</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-tracing-integration-test</artifactId>

binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/test/java/org/springframework/cloud/stream/binder/rabbit/integration/RabbitMultiBinderObservationTests.java

@@ -19,15 +19,13 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 import brave.handler.SpanHandler;
 import brave.test.TestSpanHandler;
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
 import io.micrometer.tracing.brave.bridge.BraveFinishedSpan;
 import io.micrometer.tracing.test.simple.SpansAssert;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.micrometer.tracing.test.autoconfigure.AutoConfigureTracing;
 import org.testcontainers.containers.RabbitMQContainer;
@@ -54,9 +52,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 		args = "--spring.config.location=classpath:/rabbit-multi-binder-observation.yml")
 @DirtiesContext
-//@AutoConfigureMetric
 @AutoConfigureTracing
-@Disabled
 public class RabbitMultiBinderObservationTests {
 
 	private static final TestSpanHandler SPANS = new TestSpanHandler();
@@ -86,9 +82,9 @@ void observationIsPropagatedInMultiBinderConfiguration() throws InterruptedExcep
 
 		// There is a race condition when we already have a reply, but the span in the
 		// Rabbit listener is not closed yet.
-		// parent -> StreamBridge -> RabbitTemplate -> Rabbit Listener -> Consumer
+		// parent -> StreamBridge -> AmqpOutboundEndpoint -> RabbitTemplate -> Rabbit Listener -> Consumer
 		await().untilAsserted(() -> assertThat(SPANS.spans()).hasSize(6));
-		SpansAssert.assertThat(SPANS.spans().stream().map(BraveFinishedSpan::fromBrave).collect(Collectors.toList()))
+		SpansAssert.assertThat(SPANS.spans().stream().map(BraveFinishedSpan::fromBrave).toList())
 			.haveSameTraceId();
 	}