Fix Rabbit boot 4.0 migration issues

Author: olegz

binders/kafka-binder/spring-cloud-stream-binder-kafka-streams/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
-org.springframework.boot.env.EnvironmentPostProcessor=\
+org.springframework.boot.EnvironmentPostProcessor=\
 org.springframework.cloud.stream.binder.kafka.streams.KafkaStreamsBinderEnvironmentPostProcessor

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

@@ -14,17 +14,16 @@
 	</parent>
 
 	<dependencies>
-		<!-- <dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-function-deployer</artifactId>
-			<version>${spring-cloud-function.version}</version>
-			<optional>true</optional>
-		</dependency> -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-stream-binder-rabbit-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-function-context</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-amqp</artifactId>
@@ -53,6 +52,14 @@
 			<artifactId>spring-boot-autoconfigure</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-micrometer-tracing-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+
+
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-connectors-core</artifactId>

binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java

@@ -34,7 +34,6 @@
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Envelope;
 import io.micrometer.observation.ObservationRegistry;
-import jakarta.validation.constraints.NotNull;
 
 import org.springframework.amqp.AmqpRejectAndDontRequeueException;
 import org.springframework.amqp.ImmediateAcknowledgeAmqpException;
@@ -802,7 +801,7 @@ else if (amqpMessages == null) {
 					}
 				}
 
-				@NotNull
+				//@NotNull
 				private MessageProperties adjustMessagePropertiesHeader(Throwable cause, String stackTraceAsString, Message amqpMessage) {
 					MessageProperties messageProperties = amqpMessage
 							.getMessageProperties();

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

@@ -28,12 +28,12 @@
 import io.micrometer.tracing.brave.bridge.BraveFinishedSpan;
 import io.micrometer.tracing.test.simple.SpansAssert;
 import org.junit.jupiter.api.Test;
+import org.springframework.boot.micrometer.tracing.test.autoconfigure.AutoConfigureTracing;
 import org.testcontainers.containers.RabbitMQContainer;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.stream.binder.rabbit.RabbitTestContainer;
 import org.springframework.cloud.stream.function.StreamBridge;
@@ -53,7 +53,8 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
 		args = "--spring.config.location=classpath:/rabbit-multi-binder-observation.yml")
 @DirtiesContext
-@AutoConfigureObservability
+//@AutoConfigureMetric
+@AutoConfigureTracing
 public class RabbitMultiBinderObservationTests {
 
 	private static final TestSpanHandler SPANS = new TestSpanHandler();