[BUG][Kotlin][WebClient] ApiClient is not compatible with spring-web 6 Observation API

Author: NavruzshoevDaniel

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-webclient/infrastructure/ApiClient.kt.mustache

@@ -10,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
 import org.springframework.util.LinkedMultiValueMap
 import reactor.core.publisher.Mono
 
+private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";
+
 {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}open class ApiClient(protected val client: WebClient) {
 
     protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
@@ -39,6 +41,7 @@ import reactor.core.publisher.Mono
 
     private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
         uri { builder ->
+            attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
             builder
                 .path(requestConfig.path)
                 .queryParams(LinkedMultiValueMap(requestConfig.query))

samples/client/echo_api/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -10,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
 import org.springframework.util.LinkedMultiValueMap
 import reactor.core.publisher.Mono
 
+private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";
+
 open class ApiClient(protected val client: WebClient) {
 
     protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
@@ -39,6 +41,7 @@ open class ApiClient(protected val client: WebClient) {
 
     private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
         uri { builder ->
+            attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
             builder
                 .path(requestConfig.path)
                 .queryParams(LinkedMultiValueMap(requestConfig.query))

samples/client/petstore/kotlin-jvm-spring-2-webclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -10,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
 import org.springframework.util.LinkedMultiValueMap
 import reactor.core.publisher.Mono
 
+private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";
+
 open class ApiClient(protected val client: WebClient) {
 
     protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
@@ -39,6 +41,7 @@ open class ApiClient(protected val client: WebClient) {
 
     private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
         uri { builder ->
+            attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
             builder
                 .path(requestConfig.path)
                 .queryParams(LinkedMultiValueMap(requestConfig.query))

samples/client/petstore/kotlin-jvm-spring-3-webclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -10,6 +10,8 @@ import org.springframework.http.client.MultipartBodyBuilder
 import org.springframework.util.LinkedMultiValueMap
 import reactor.core.publisher.Mono
 
+private val URI_TEMPLATE_ATTRIBUTE = WebClient::class.java.name + ".uriTemplate";
+
 open class ApiClient(protected val client: WebClient) {
 
     protected inline fun <reified I : Any, reified T: Any?> request(requestConfig: RequestConfig<I>): Mono<ResponseEntity<T>> {
@@ -39,6 +41,7 @@ open class ApiClient(protected val client: WebClient) {
 
     private fun <I> WebClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
         uri { builder ->
+            attribute(URI_TEMPLATE_ATTRIBUTE, requestConfig.path)
             builder
                 .path(requestConfig.path)
                 .queryParams(LinkedMultiValueMap(requestConfig.query))