Skip to content

Commit a19091e

Browse files
committed
Update spring-rabbit latestDep tests for 4.0
1 parent 9ea03e9 commit a19091e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ muzzle {
1212
}
1313
}
1414

15+
val latestDepTest = findProperty("testLatestDeps") as Boolean
16+
1517
dependencies {
1618
library("org.springframework.amqp:spring-rabbit:1.0.0.RELEASE")
1719

@@ -24,9 +26,9 @@ dependencies {
2426
// spring-retry is required by org.springframework.amqp:spring-rabbit:4.0.0
2527
testLibrary("org.springframework.retry:spring-retry")
2628

27-
// tests don't work with spring boot 4 yet
28-
latestDepTestLibrary("org.springframework.boot:spring-boot-starter:3.+") // documented limitation
29-
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation
29+
if (latestDepTest) {
30+
testLibrary("org.springframework.boot:spring-boot-starter-amqp:latest.release")
31+
}
3032
}
3133

3234
tasks {
@@ -36,8 +38,6 @@ tasks {
3638
}
3739
}
3840

39-
val latestDepTest = findProperty("testLatestDeps") as Boolean
40-
4141
// spring 6 requires java 17
4242
if (latestDepTest) {
4343
otelJava {

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ public void configure(IgnoredTypesBuilder builder) {
112112
.allowClass(
113113
"org.springframework.boot.actuate.metrics.web.reactive.server.MetricsWebFilter$$Lambda")
114114
.allowClass("org.springframework.boot.autoconfigure.BackgroundPreinitializer$")
115+
.allowClass(
116+
"org.springframework.boot.autoconfigure.preinitialize.BackgroundPreinitializingApplicationListener$")
115117
.allowClass(
116118
"org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration$$Lambda")
117119
.allowClass("org.springframework.boot.autoconfigure.condition.OnClassCondition$")

0 commit comments

Comments
 (0)