Skip to content

Update spring-kafka latestDep tests for 4.0 #15435

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 4 commits into
base: main
Choose a base branch
from
Open

Update spring-kafka latestDep tests for 4.0 #15435

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26a240c
Update spring-kafka latestDep tests for 4.0
jaydeluca Nov 23, 2025
dfdc1fa
Update instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle…
jaydeluca Nov 24, 2025
f82a3b9
switch testLatestDeps dependency approach
jaydeluca Nov 25, 2025
e02082e
Merge branch 'main' into spring-kafka-update
jaydeluca Nov 25, 2025
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
19 changes: 10 additions & 9 deletions instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ muzzle {
}
}

val latestDepTest = findProperty("testLatestDeps") as Boolean

dependencies {
compileOnly("com.google.auto.value:auto-value-annotations")
annotationProcessor("com.google.auto.value:auto-value")
Expand All @@ -20,7 +22,11 @@ dependencies {
implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-common-0.11:library"))
implementation(project(":instrumentation:spring:spring-kafka-2.7:library"))

library("org.springframework.kafka:spring-kafka:2.7.0")
if (latestDepTest) {
library("org.springframework.boot:spring-boot-starter-kafka:latest.release")
} else {
library("org.springframework.kafka:spring-kafka:2.7.0")
}
Copy link
Member

@trask trask Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there no non-spring boot starter version now?

Copy link
Contributor

@laurit laurit Nov 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what if you leave library("org.springframework.kafka:spring-kafka:2.7.0") here and add
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-kafka:latest.release") down below?


testInstrumentation(project(":instrumentation:kafka:kafka-clients:kafka-clients-0.11:javaagent"))
testInstrumentation(project(":instrumentation:spring:spring-scheduling-3.1:javaagent"))
Expand All @@ -29,13 +35,8 @@ dependencies {

testLibrary("org.springframework.boot:spring-boot-starter-test:2.5.3")
testLibrary("org.springframework.boot:spring-boot-starter:2.5.3")

// tests don't work with spring boot 4 yet
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation
latestDepTestLibrary("org.springframework.boot:spring-boot-starter:3.+") // documented limitation
}

val latestDepTest = findProperty("testLatestDeps") as Boolean
val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"

testing {
Expand All @@ -45,9 +46,9 @@ testing {
implementation(project(":instrumentation:spring:spring-kafka-2.7:testing"))

// the "library" configuration is not recognized by the test suite plugin
val springKafkaVersion = if (latestDepTest) "latest.release" else "2.7.0"
val springBootVersion = if (latestDepTest) "3.+" else "2.5.3"
implementation("org.springframework.kafka:spring-kafka:$springKafkaVersion")
val springKafkaVersion = if (latestDepTest) "org.springframework.boot:spring-boot-starter-kafka:latest.release" else "org.springframework.kafka:spring-kafka:2.7.0"
val springBootVersion = if (latestDepTest) "latest.release" else "2.5.3"
implementation(springKafkaVersion)
implementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
implementation("org.springframework.boot:spring-boot-starter:$springBootVersion")
}
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