From 00c2680abb5c1cf3bb6755c4becb147342980141 Mon Sep 17 00:00:00 2001
From: Chris Smalley <csmalley@netflix.com>
Date: Mon, 16 Nov 2020 15:27:59 -0800
Subject: [PATCH] fix(*): Pass OkHttpMetricsInterceptorProperties to
 OkHttpMetricsInterceptor constructor (#5102)

- OkHttpMetricsInterceptor constructor changed in a kork bump - this makes things work
---
 .../config/EurekaProviderConfiguration.groovy       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/clouddriver-eureka/src/main/groovy/com/netflix/spinnaker/config/EurekaProviderConfiguration.groovy b/clouddriver-eureka/src/main/groovy/com/netflix/spinnaker/config/EurekaProviderConfiguration.groovy
index a4412fae9d8..9b7ce8d5165 100644
--- a/clouddriver-eureka/src/main/groovy/com/netflix/spinnaker/config/EurekaProviderConfiguration.groovy
+++ b/clouddriver-eureka/src/main/groovy/com/netflix/spinnaker/config/EurekaProviderConfiguration.groovy
@@ -76,10 +76,6 @@ class EurekaProviderConfiguration {
     return properties
   }
 
-  private OkHttpClientConfiguration eurekaOkHttpClientConfig() {
-    new OkHttpClientConfiguration(eurekaClientConfig(), new OkHttpMetricsInterceptor({ registry }, true))
-  }
-
   private static Converter eurekaConverter() {
     new JacksonConverter(new ObjectMapper()
       .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
@@ -88,8 +84,10 @@ class EurekaProviderConfiguration {
       .enable(MapperFeature.AUTO_DETECT_CREATORS))
   }
 
-  private EurekaApiFactory eurekaApiFactory() {
-    new EurekaApiFactory(eurekaConverter(), eurekaOkHttpClientConfig())
+  private EurekaApiFactory eurekaApiFactory(OkHttpMetricsInterceptorProperties okHttpMetricsInterceptorProperties) {
+    OkHttpClientConfiguration config = new OkHttpClientConfiguration(eurekaClientConfig(),
+      new OkHttpMetricsInterceptor({ registry }, okHttpMetricsInterceptorProperties))
+    return new EurekaApiFactory(eurekaConverter(), config)
   }
 
   @Value('${eureka.poll-interval-millis:15000}')
@@ -100,10 +98,11 @@ class EurekaProviderConfiguration {
 
   @Bean
   EurekaCachingProvider eurekaCachingProvider(EurekaAccountConfigurationProperties eurekaAccountConfigurationProperties,
+                                              OkHttpMetricsInterceptorProperties okHttpMetricsInterceptorProperties,
                                               List<EurekaAwareProvider> eurekaAwareProviderList,
                                               ObjectMapper objectMapper) {
     List<EurekaCachingAgent> agents = []
-    def eurekaApiFactory = eurekaApiFactory()
+    def eurekaApiFactory = eurekaApiFactory(okHttpMetricsInterceptorProperties)
     eurekaAccountConfigurationProperties.accounts.each { EurekaAccountConfigurationProperties.EurekaAccount accountConfig ->
       accountConfig.regions.each { region ->
         String eurekaHost = accountConfig.readOnlyUrl.replaceAll(Pattern.quote('{{region}}'), region)