Skip to content

Commit dedfc20

Browse files
authored
Fix latest dep tests (#9892)
1 parent 2bcae0b commit dedfc20

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
implementation(project(":instrumentation:reactor:reactor-3.1:library"))
1313

1414
testImplementation(project(":testing-common"))
15-
testImplementation("org.springframework:spring-test:6.0.0")
15+
testLibrary("org.springframework:spring-test:6.0.0")
1616
}
1717

1818
otelJava {

instrumentation/spring/spring-web/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/web/v3_1/SpringWebInstrumentationTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class SpringWebInstrumentationTest extends AbstractHttpClientTest<HttpEnt
3737
static RestTemplate restTemplate;
3838

3939
@BeforeAll
40+
@SuppressWarnings("PreferJavaTimeOverload")
4041
static void setUp() {
4142
SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
4243
requestFactory.setConnectTimeout((int) CONNECTION_TIMEOUT.toMillis());

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ dependencies {
1414
testLibrary("org.springframework.boot:spring-boot-starter-webflux:2.4.0")
1515
testLibrary("org.springframework.boot:spring-boot-starter-test:2.4.0")
1616
testLibrary("org.springframework.boot:spring-boot-starter-reactor-netty:2.4.0")
17+
// can be remove after starter is update to depend on spring 6.1
18+
latestDepTestLibrary("org.springframework:spring-context:+")
1719
}
1820

1921
val latestDepTest = findProperty("testLatestDeps") as Boolean

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/WebfluxServerHttpAttributesGetter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ enum WebfluxServerHttpAttributesGetter
2020

2121
@Override
2222
public String getHttpRequestMethod(ServerWebExchange request) {
23-
return request.getRequest().getMethodValue();
23+
return request.getRequest().getMethod().name();
2424
}
2525

2626
@Override

0 commit comments

Comments
 (0)