Skip to content

Commit 7ddd49d

Browse files
authored
Fix spring cloud gw latest dep test (open-telemetry#13960)
1 parent 68cb3e1 commit 7ddd49d

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ dependencies {
1212
testImplementation(project(":instrumentation:spring:spring-cloud-gateway:spring-cloud-gateway-common:testing"))
1313

1414
testLibrary("org.springframework.cloud:spring-cloud-starter-gateway:2.2.0.RELEASE")
15-
// latest version of spring-cloud-starter-gateway is not compatible with spring boot 3.5 yet
16-
testImplementation("org.springframework.boot:spring-boot-starter-test:2.2.0.RELEASE")
17-
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:2.4.+") // documented limitation
15+
testLibrary("org.springframework.boot:spring-boot-starter-test:2.2.0.RELEASE")
1816
}
1917

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ public void configure(IgnoredTypesBuilder builder) {
136136
.allowClass("org.springframework.boot.web.embedded.tomcat.TomcatEmbeddedWebappClassLoader")
137137
.allowClass("org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean$")
138138
.allowClass("org.springframework.boot.StartupInfoLogger$")
139-
.allowClass("org.springframework.boot.SpringApplicationShutdownHook");
139+
.allowClass("org.springframework.boot.SpringApplicationShutdownHook")
140+
.allowClass("org.springframework.boot.convert.ApplicationConversionService$$Lambda");
140141

141142
builder
142143
.ignoreClass("org.springframework.cglib.")

0 commit comments

Comments
 (0)