From dedfc204c14ce6457b4c759063652650f6022ef7 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Thu, 16 Nov 2023 20:12:24 +0200
Subject: [PATCH] Fix latest dep tests (#9892)

---
 .../spring/spring-security-config-6.0/library/build.gradle.kts  | 2 +-
 .../spring/web/v3_1/SpringWebInstrumentationTest.java           | 1 +
 .../spring-webflux/spring-webflux-5.3/library/build.gradle.kts  | 2 ++
 .../spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java  | 2 +-
 4 files changed, 5 insertions(+), 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
index 12f62f98fe1e..368eb0272570 100644
--- 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/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java b/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java
index 306f5737ae73..4733e4e57f31 100644
--- a/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java
+++ b/instrumentation/spring/spring-web/spring-web-3.1/library/src/test/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
index 1df4b62e1934..1526873f7866 100644
--- 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/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java
index a62d1da7b27e..f2083208faa9 100644
--- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java
+++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/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