From a19091eda31af2d9149e681fabd78fd3bc362d69 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Sun, 23 Nov 2025 17:56:14 -0500 Subject: [PATCH] Update spring-rabbit latestDep tests for 4.0 --- .../spring-rabbit-1.0/javaagent/build.gradle.kts | 10 +++++----- .../AdditionalLibraryIgnoredTypesConfigurer.java | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts index b452d792cfd3..d6b6b3bbb5d0 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts @@ -12,6 +12,8 @@ muzzle { } } +val latestDepTest = findProperty("testLatestDeps") as Boolean + dependencies { library("org.springframework.amqp:spring-rabbit:1.0.0.RELEASE") @@ -24,9 +26,9 @@ dependencies { // spring-retry is required by org.springframework.amqp:spring-rabbit:4.0.0 testLibrary("org.springframework.retry:spring-retry") - // tests don't work with spring boot 4 yet - latestDepTestLibrary("org.springframework.boot:spring-boot-starter:3.+") // documented limitation - latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation + if (latestDepTest) { + testLibrary("org.springframework.boot:spring-boot-starter-amqp:latest.release") + } } tasks { @@ -36,8 +38,6 @@ tasks { } } -val latestDepTest = findProperty("testLatestDeps") as Boolean - // spring 6 requires java 17 if (latestDepTest) { otelJava { diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java index 7b51eeb3ad0c..c97e34993b76 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java @@ -112,6 +112,8 @@ public void configure(IgnoredTypesBuilder builder) { .allowClass( "org.springframework.boot.actuate.metrics.web.reactive.server.MetricsWebFilter$$Lambda") .allowClass("org.springframework.boot.autoconfigure.BackgroundPreinitializer$") + .allowClass( + "org.springframework.boot.autoconfigure.preinitialize.BackgroundPreinitializingApplicationListener$") .allowClass( "org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration$$Lambda") .allowClass("org.springframework.boot.autoconfigure.condition.OnClassCondition$")