File tree 4 files changed +16
-3
lines changed
armeria/armeria-grpc-1.14/javaagent
internal/internal-application-logger/javaagent
spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore
4 files changed +16
-3
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ dependencies {
27
27
val latestDepTest = findProperty(" testLatestDeps" ) as Boolean
28
28
protobuf {
29
29
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"
31
31
artifact = " com.google.protobuf:protoc:$protocVersion "
32
32
}
33
33
plugins {
Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ muzzle {
18
18
}
19
19
}
20
20
21
+ val latestDepTest = findProperty(" testLatestDeps" ) as Boolean
21
22
dependencies {
22
23
bootstrap(project(" :instrumentation:internal:internal-application-logger:bootstrap" ))
23
24
@@ -30,8 +31,8 @@ dependencies {
30
31
}
31
32
}
32
33
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 " )
35
36
} else {
36
37
testImplementation(" ch.qos.logback:logback-classic" ) {
37
38
version {
@@ -47,3 +48,10 @@ dependencies {
47
48
48
49
testLibrary(" org.springframework.boot:spring-boot-starter:2.5.3" )
49
50
}
51
+
52
+ if (latestDepTest) {
53
+ // spring 6 requires java 17
54
+ otelJava {
55
+ minJavaVersionSupported.set(JavaVersion .VERSION_17 )
56
+ }
57
+ }
Original file line number Diff line number Diff line change @@ -13,6 +13,9 @@ dependencies {
13
13
14
14
testLibrary(" org.springframework.cloud:spring-cloud-starter-gateway:2.2.0.RELEASE" )
15
15
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.+" )
16
19
}
17
20
18
21
tasks.withType<Test >().configureEach {
Original file line number Diff line number Diff line change @@ -104,6 +104,8 @@ public void configure(IgnoredTypesBuilder builder) {
104
104
.allowClass ("org.springframework.boot.logging.logback." )
105
105
.allowClass ("org.springframework.boot.web.filter." )
106
106
.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" )
107
109
.allowClass (
108
110
"org.springframework.boot.actuate.metrics.web.reactive.server.MetricsWebFilter$$Lambda" )
109
111
.allowClass ("org.springframework.boot.autoconfigure.BackgroundPreinitializer$" )
You can’t perform that action at this time.
0 commit comments