Fjerner unødvendig bean

navikt · Dec 20, 2023 · 1d6ba00 · 1d6ba00
1 parent 32a4ffe
commit 1d6ba00
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/main/kotlin/no/nav/bidrag/commons/web/config/RestTemplateBuilderBean.kt b/src/main/kotlin/no/nav/bidrag/commons/web/config/RestTemplateBuilderBean.kt
@@ -1,6 +1,5 @@
 package no.nav.bidrag.commons.web.config
 
-import io.micrometer.observation.ObservationRegistry
 import no.nav.bidrag.commons.web.interceptor.ConsumerIdClientInterceptor
 import no.nav.bidrag.commons.web.interceptor.MdcValuesPropagatingClientInterceptor
 import org.springframework.boot.actuate.metrics.web.client.ObservationRestTemplateCustomizer
@@ -10,13 +9,12 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
 import org.springframework.context.annotation.Scope
-import org.springframework.http.client.observation.DefaultClientRequestObservationConvention
 import java.time.Duration
 import java.time.temporal.ChronoUnit
 
 @Suppress("SpringFacetCodeInspection")
 @Configuration
-@Import(ConsumerIdClientInterceptor::class, MdcValuesPropagatingClientInterceptor::class, NaisProxyCustomizer::class)
+@Import(ConsumerIdClientInterceptor::class, MdcValuesPropagatingClientInterceptor::class, NaisProxyCustomizer::class, ObservationRestTemplateCustomizer::class)
 class RestTemplateBuilderBean {
 
     @Bean
@@ -55,9 +53,4 @@ class RestTemplateBuilderBean {
         .additionalCustomizers(observationRestTemplateCustomizer)
         .setConnectTimeout(Duration.of(15, ChronoUnit.SECONDS))
         .setReadTimeout(Duration.of(30, ChronoUnit.SECONDS))
-
-    @Bean
-    fun metricsRestTemplateCustomizer(): ObservationRestTemplateCustomizer {
-        return ObservationRestTemplateCustomizer(ObservationRegistry.create(), DefaultClientRequestObservationConvention())
-    }
 }