Skip to content

Update spring-rabbit latestDep tests for 4.0 #15436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −5
Open

Update spring-rabbit latestDep tests for 4.0 #15436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ muzzle {
}
}

val latestDepTest = findProperty("testLatestDeps") as Boolean

dependencies {
library("org.springframework.amqp:spring-rabbit:1.0.0.RELEASE")

Expand All @@ -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 {
Expand All @@ -36,8 +38,6 @@ tasks {
}
}

val latestDepTest = findProperty("testLatestDeps") as Boolean

// spring 6 requires java 17
if (latestDepTest) {
otelJava {
Expand Down
2 changes: 2 additions & 0 deletions ...va/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$")
Expand Down
Loading