Skip to content

Commit 8eef5ca

Browse files
authored
Fix latest dep tests (#12774)
1 parent bfbfe30 commit 8eef5ca

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

instrumentation/armeria/armeria-grpc-1.14/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
val latestDepTest = findProperty("testLatestDeps") as Boolean
2828
protobuf {
2929
protoc {
30-
val protocVersion = if (latestDepTest) "4.28.2" else "3.19.2"
30+
val protocVersion = if (latestDepTest) "3.25.5" else "3.19.2"
3131
artifact = "com.google.protobuf:protoc:$protocVersion"
3232
}
3333
plugins {

instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts

+10-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ muzzle {
1818
}
1919
}
2020

21+
val latestDepTest = findProperty("testLatestDeps") as Boolean
2122
dependencies {
2223
bootstrap(project(":instrumentation:internal:internal-application-logger:bootstrap"))
2324

@@ -30,8 +31,8 @@ dependencies {
3031
}
3132
}
3233

33-
if (findProperty("testLatestDeps") as Boolean) {
34-
testImplementation("ch.qos.logback:logback-classic:+")
34+
if (latestDepTest) {
35+
testImplementation("ch.qos.logback:logback-classic:latest.release")
3536
} else {
3637
testImplementation("ch.qos.logback:logback-classic") {
3738
version {
@@ -47,3 +48,10 @@ dependencies {
4748

4849
testLibrary("org.springframework.boot:spring-boot-starter:2.5.3")
4950
}
51+
52+
if (latestDepTest) {
53+
// spring 6 requires java 17
54+
otelJava {
55+
minJavaVersionSupported.set(JavaVersion.VERSION_17)
56+
}
57+
}

instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/build.gradle.kts

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ dependencies {
1313

1414
testLibrary("org.springframework.cloud:spring-cloud-starter-gateway:2.2.0.RELEASE")
1515
testLibrary("org.springframework.boot:spring-boot-starter-test:2.2.0.RELEASE")
16+
17+
// current latest spring cloud is not compatible with spring boot 3.4.0
18+
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.3.+")
1619
}
1720

1821
tasks.withType<Test>().configureEach {

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

+2
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ public void configure(IgnoredTypesBuilder builder) {
104104
.allowClass("org.springframework.boot.logging.logback.")
105105
.allowClass("org.springframework.boot.web.filter.")
106106
.allowClass("org.springframework.boot.web.servlet.")
107+
.allowClass("org.springframework.boot.web.embedded.netty.GracefulShutdown$$Lambda")
108+
.allowClass("org.springframework.boot.web.embedded.tomcat.GracefulShutdown$$Lambda")
107109
.allowClass(
108110
"org.springframework.boot.actuate.metrics.web.reactive.server.MetricsWebFilter$$Lambda")
109111
.allowClass("org.springframework.boot.autoconfigure.BackgroundPreinitializer$")

0 commit comments

Comments
 (0)