Skip to content

Commit 1b5c0d1

Browse files
committed
Update spring-pulsar latestDeps tests for 4.0 update
1 parent 9ea03e9 commit 1b5c0d1

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

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

Lines changed: 8 additions & 7 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.pulsar:spring-pulsar:1.0.0")
1719
implementation(project(":instrumentation:pulsar:pulsar-2.8:javaagent"))
@@ -23,12 +25,11 @@ dependencies {
2325
testLibrary("org.springframework.boot:spring-boot-starter-test:3.2.4")
2426
testLibrary("org.springframework.boot:spring-boot-starter:3.2.4")
2527

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

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

3435
testing {
@@ -38,9 +39,9 @@ testing {
3839
implementation(project(":instrumentation:spring:spring-pulsar-1.0:testing"))
3940

4041
if (latestDepTest) {
41-
implementation("org.springframework.pulsar:spring-pulsar:latest.release")
42-
implementation("org.springframework.boot:spring-boot-starter-test:3.+")
43-
implementation("org.springframework.boot:spring-boot-starter:3.+")
42+
implementation("org.springframework.boot:spring-boot-starter-pulsar:latest.release")
43+
implementation("org.springframework.boot:spring-boot-starter-test:latest.release")
44+
implementation("org.springframework.boot:spring-boot-starter:latest.release")
4445
} else {
4546
implementation("org.springframework.pulsar:spring-pulsar:1.0.0")
4647
implementation("org.springframework.boot:spring-boot-starter-test:3.2.4")

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)