Fix latest dep tests (#9892)

open-telemetry · Nov 16, 2023 · dedfc20 · dedfc20
1 parent 2bcae0b
commit dedfc20
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts b/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
   implementation(project(":instrumentation:reactor:reactor-3.1:library"))
 
   testImplementation(project(":testing-common"))
-  testImplementation("org.springframework:spring-test:6.0.0")
+  testLibrary("org.springframework:spring-test:6.0.0")
 }
 
 otelJava {

diff --git a/...t/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java b/...t/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java
@@ -37,6 +37,7 @@ public class SpringWebInstrumentationTest extends AbstractHttpClientTest<HttpEnt
   static RestTemplate restTemplate;
 
   @BeforeAll
+  @SuppressWarnings("PreferJavaTimeOverload")
   static void setUp() {
     SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
     requestFactory.setConnectTimeout((int) CONNECTION_TIMEOUT.toMillis());

diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts
@@ -14,6 +14,8 @@ dependencies {
   testLibrary("org.springframework.boot:spring-boot-starter-webflux:2.4.0")
   testLibrary("org.springframework.boot:spring-boot-starter-test:2.4.0")
   testLibrary("org.springframework.boot:spring-boot-starter-reactor-netty:2.4.0")
+  // can be remove after starter is update to depend on spring 6.1
+  latestDepTestLibrary("org.springframework:spring-context:+")
 }
 
 val latestDepTest = findProperty("testLatestDeps") as Boolean

diff --git a/.../opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java b/.../opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java
@@ -20,7 +20,7 @@ enum WebfluxServerHttpAttributesGetter
 
   @Override
   public String getHttpRequestMethod(ServerWebExchange request) {
-    return request.getRequest().getMethodValue();
+    return request.getRequest().getMethod().name();
   }
 
   @Override