elastic#3439 - Handle removal of ClientResponse#rawStatusCode and bum…

…p to Spring Boot 3.2
NicklasWallgren · Nov 24, 2023 · bfcc8ee · bfcc8ee
1 parent fd60ac8
commit bfcc8ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...client-plugin/src/main/java/co/elastic/apm/agent/springwebclient/WebClientSubscriber.java b/...client-plugin/src/main/java/co/elastic/apm/agent/springwebclient/WebClientSubscriber.java
@@ -74,7 +74,7 @@ public void onNext(T t) {
         try {
             if (span != null && t instanceof ClientResponse) {
                 ClientResponse clientResponse = (ClientResponse) t;
-                int statusCode = clientResponse.rawStatusCode();
+                int statusCode = clientResponse.statusCode().value();
                 span.withOutcome(ResultUtil.getOutcomeByHttpClientStatus(statusCode));
                 span.getContext().getHttp().withStatusCode(statusCode);
             }

diff --git a/...x-testapp/src/main/java/co/elastic/apm/agent/springwebflux/testapp/GreetingWebClient.java b/...x-testapp/src/main/java/co/elastic/apm/agent/springwebflux/testapp/GreetingWebClient.java
@@ -222,7 +222,7 @@ private WebClient.ResponseSpec request(String method, Function<UriBuilder, URI>
             .headers(httpHeaders -> httpHeaders.addAll(headers))
             .cookies(httpCookies -> httpCookies.addAll(cookies))
             .retrieve()
-            .onRawStatus(status -> status != expectedStatus, r -> Mono.error(new IllegalStateException(String.format("unexpected response status %d", r.rawStatusCode()))));
+            .onRawStatus(status -> status != expectedStatus, r -> Mono.error(new IllegalStateException(String.format("unexpected response status %d", r.statusCode().value()))));
     }
 
     @Override

diff --git a/apm-agent-plugins/apm-spring-webflux/pom.xml b/apm-agent-plugins/apm-spring-webflux/pom.xml
@@ -18,7 +18,7 @@
 
         <!-- spring boot version to use for dependency management & testing -->
         <version.spring-boot-2>2.7.16</version.spring-boot-2>
-        <version.spring-boot-3>3.1.5</version.spring-boot-3>
+        <version.spring-boot-3>3.2.0</version.spring-boot-3>
     </properties>
 
     <modules>