Erstatter logging av request fra HttpClient til WebClient. (#624)

* Legger til egne connection pool for WebClient.

* Tvinger Http 1.1 for å se om det løser problemet.

* Fjerner connection provider og httpClient oppsett.

Trekker filter ut som gjenbrukbar util.

* Fjerner connectionprovider.

Author: ramrock93

src/main/kotlin/no/nav/sifinnsynapi/saf/SafClientConfig.kt

@@ -6,16 +6,13 @@ import no.nav.security.token.support.client.core.oauth2.OAuth2AccessTokenService
 import no.nav.security.token.support.client.spring.ClientConfigurationProperties
 import no.nav.sifinnsynapi.util.HttpHeaderConstants
 import no.nav.sifinnsynapi.util.MDCUtil
+import no.nav.sifinnsynapi.util.WebClientUtils.requestLoggerFilter
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.HttpHeaders.AUTHORIZATION
-import org.springframework.http.client.reactive.ReactorClientHttpConnector
 import org.springframework.web.reactive.function.client.WebClient
-import reactor.netty.http.client.HttpClient
-import reactor.netty.http.client.HttpClientRequest
-import reactor.netty.http.client.HttpClientResponse
 
 @Configuration
 class SafClientConfig(
@@ -35,24 +32,7 @@ class SafClientConfig(
     fun client() = GraphQLWebClient(
         url = "$safBaseUrl/graphql",
         builder = WebClient.builder()
-            .clientConnector(
-                ReactorClientHttpConnector(
-                    HttpClient.create()
-                        .wiretap(true) // viktig for å se H2/TLS-hendelser
-                        .doOnRequest { request: HttpClientRequest, _ ->
-                            logger.info("{} {} {}", request.version(), request.method(), request.resourceUrl())
-                        }
-                        .doOnResponse { response: HttpClientResponse, _ ->
-                            logger.info(
-                                "{} - {} {} {}",
-                                response.status().toString(),
-                                response.version(),
-                                response.method(),
-                                response.resourceUrl()
-                            )
-                        }
-                )
-            )
+            .requestLoggerFilter(logger)
             .defaultRequest {
                 it.header(AUTHORIZATION, "Bearer ${accessToken(azureSafClientProperties)}")
                 val correlationId = MDCUtil.callIdOrNew()

src/main/kotlin/no/nav/sifinnsynapi/safselvbetjening/SafSelvbetjeningClientsConfig.kt

@@ -7,6 +7,7 @@ import no.nav.security.token.support.client.spring.ClientConfigurationProperties
 import no.nav.sifinnsynapi.util.HttpHeaderConstants.NAV_CALL_ID
 import no.nav.sifinnsynapi.util.HttpHeaderConstants.X_CORRELATION_ID
 import no.nav.sifinnsynapi.util.MDCUtil
+import no.nav.sifinnsynapi.util.WebClientUtils.requestLoggerFilter
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.web.client.RestTemplateBuilder
@@ -16,19 +17,15 @@ import org.springframework.http.HttpHeaders.AUTHORIZATION
 import org.springframework.http.HttpRequest
 import org.springframework.http.client.ClientHttpRequestExecution
 import org.springframework.http.client.ClientHttpRequestInterceptor
-import org.springframework.http.client.reactive.ReactorClientHttpConnector
 import org.springframework.web.client.RestTemplate
 import org.springframework.web.reactive.function.client.WebClient
-import reactor.netty.http.client.HttpClient
-import reactor.netty.http.client.HttpClientRequest
-import reactor.netty.http.client.HttpClientResponse
 import java.util.*
 
 @Configuration
 class SafSelvbetjeningClientsConfig(
     oauth2Config: ClientConfigurationProperties,
     private val oAuth2AccessTokenService: OAuth2AccessTokenService,
-    @Value("\${no.nav.gateways.saf-selvbetjening-base-url}") private val safSelvbetjeningBaseUrl: String
+    @Value("\${no.nav.gateways.saf-selvbetjening-base-url}") private val safSelvbetjeningBaseUrl: String,
 ) {
 
     private companion object {
@@ -42,18 +39,7 @@ class SafSelvbetjeningClientsConfig(
     fun graphQLClient() = GraphQLWebClient(
         url = "${safSelvbetjeningBaseUrl}/graphql",
         builder = WebClient.builder()
-            .clientConnector(
-                ReactorClientHttpConnector(
-                    HttpClient.create()
-                        .wiretap(true) // viktig for å se H2/TLS-hendelser
-                        .doOnRequest { request: HttpClientRequest, _ ->
-                            logger.info("{} {} {}", request.version(), request.method(), request.resourceUrl())
-                        }
-                        .doOnResponse { response: HttpClientResponse, _ ->
-                            logger.info("{} - {} {} {}", response.status().toString(), response.version(), response.method(), response.resourceUrl())
-                        }
-                )
-            )
+            .requestLoggerFilter(logger)
             .defaultRequest {
                 val correlationId = MDCUtil.callIdOrNew()
                 it.header(NAV_CALL_ID, correlationId)
@@ -70,20 +56,25 @@ class SafSelvbetjeningClientsConfig(
     fun safSelvbetjeningRestTemplate(
         restTemplateBuilder: RestTemplateBuilder,
         clientConfigurationProperties: ClientConfigurationProperties,
-        oAuth2AccessTokenService: OAuth2AccessTokenService
+        oAuth2AccessTokenService: OAuth2AccessTokenService,
     ): RestTemplate {
 
         logger.info("Konfigurerer opp tokenx klient for safselvbetjening.")
         return restTemplateBuilder
             .rootUri(safSelvbetjeningBaseUrl)
             .defaultHeader(NAV_CALL_ID, UUID.randomUUID().toString())
-            .additionalInterceptors(bearerTokenInterceptor(tokenxSafSelvbetjeningClientProperties, oAuth2AccessTokenService), requestLoggerInterceptor())
+            .additionalInterceptors(
+                bearerTokenInterceptor(
+                    tokenxSafSelvbetjeningClientProperties,
+                    oAuth2AccessTokenService
+                ), requestLoggerInterceptor()
+            )
             .build()
     }
 
     private fun bearerTokenInterceptor(
         clientProperties: ClientProperties,
-        oAuth2AccessTokenService: OAuth2AccessTokenService
+        oAuth2AccessTokenService: OAuth2AccessTokenService,
     ): ClientHttpRequestInterceptor {
         return ClientHttpRequestInterceptor { request: HttpRequest, body: ByteArray, execution: ClientHttpRequestExecution ->
             val response = oAuth2AccessTokenService.getAccessToken(clientProperties)

src/main/kotlin/no/nav/sifinnsynapi/util/WebClientUtils.kt

@@ -0,0 +1,17 @@
+package no.nav.sifinnsynapi.util
+
+import org.slf4j.Logger
+import org.springframework.web.reactive.function.client.WebClient
+
+object WebClientUtils {
+
+    fun WebClient.Builder.requestLoggerFilter(logger: Logger) = filters { filters ->
+        filters.add { request, next ->
+            logger.info("---> {} {}", request.method(), request.url())
+            next.exchange(request)
+                .doOnNext {
+                    logger.info("<--- {} for {} {}", it.statusCode().value(), request.method(), request.url())
+                }
+        }
+    }
+}