Support Spring Boot 3.2

m3dev · Feb 5, 2024 · 2782acc · 2782acc
1 parent e1024dd
commit 2782acc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/jvm/build.gradle.kts b/jvm/build.gradle.kts
@@ -47,7 +47,7 @@ subprojects {
     val servletApiVersion by extra { "6.0.0" }
 
     // Following versions are based on spring-boot
-    val springBootVersion by extra { "3.0.0" }
+    val springBootVersion by extra { "3.2.2" }
     val springVersion by extra { "6.0.0" }
     val apacheHttpClientVersion by extra { "4.5.8" }
     val okHttpClientVersion by extra { "4.8.0" }

diff --git a/...-web/src/main/kotlin/com/m3/tracing/spring/http/client/M3TracingHttpRequestInterceptor.kt b/...-web/src/main/kotlin/com/m3/tracing/spring/http/client/M3TracingHttpRequestInterceptor.kt
@@ -17,7 +17,7 @@ class M3TracingHttpRequestInterceptor(
     override fun intercept(request: HttpRequest, body: ByteArray, execution: ClientHttpRequestExecution): ClientHttpResponse {
         return tracer.processOutgoingHttpRequest(wrapRequest(request)).use { span ->
             span["client"] = "RestTemplate"
-            span["method"] = request.methodValue
+            span["method"] = request.method.toString()
             span["uri"] = request.uri.toString()
             execution.execute(request, body).also { response ->
                 span["status"] = response.rawStatusCode

diff --git a/jvm/spring-web/src/main/kotlin/com/m3/tracing/spring/http/client/SpringHttpRequestInfo.kt b/jvm/spring-web/src/main/kotlin/com/m3/tracing/spring/http/client/SpringHttpRequestInfo.kt
@@ -10,7 +10,7 @@ open class SpringHttpRequestInfo(protected val req: HttpRequest): HttpRequestInf
 
     @Suppress("UNCHECKED_CAST", "IMPLICIT_ANY")
     override fun <T> tryGetMetadata(key: HttpRequestMetadataKey<T>): T? = when(key) {
-        HttpRequestMetadataKey.Method -> req.methodValue as T?
+        HttpRequestMetadataKey.Method -> req.method.toString() as T?
         HttpRequestMetadataKey.Host -> req.headers.host?.hostName as T?
         HttpRequestMetadataKey.ContentLength -> req.headers.contentLength.let { if (it <= 0) null else it } as T?
         HttpRequestMetadataKey.Path -> req.uri.path as T?