refactor(retrofit): replace com.squareup.okhttp.OkHttpClient with okh…

…ttp3.OkHttpClient (#1063)

kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/backends/AtlasStorageUpdater.java

@@ -23,12 +23,12 @@
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException;
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException;
 import com.netflix.spinnaker.security.AuthenticatedRequest;
-import com.squareup.okhttp.OkHttpClient;
 import java.util.Map;
 import javax.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import retrofit.converter.JacksonConverter;
 
 @Slf4j

kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/backends/AtlasStorageUpdaterService.java

@@ -17,10 +17,10 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netflix.kayenta.retrofit.config.RetrofitClientFactory;
-import com.squareup.okhttp.OkHttpClient;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.health.AbstractHealthIndicator;
 import org.springframework.boot.actuate.health.Health;

kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/backends/BackendUpdater.java

@@ -23,12 +23,12 @@
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerHttpException;
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException;
 import com.netflix.spinnaker.security.AuthenticatedRequest;
-import com.squareup.okhttp.OkHttpClient;
 import java.util.List;
 import javax.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import retrofit.converter.JacksonConverter;
 
 @Slf4j

kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/backends/BackendUpdaterService.java

@@ -17,10 +17,10 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netflix.kayenta.retrofit.config.RetrofitClientFactory;
-import com.squareup.okhttp.OkHttpClient;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.health.AbstractHealthIndicator;
 import org.springframework.boot.actuate.health.Health;

kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/metrics/AtlasMetricsService.java

@@ -39,7 +39,6 @@
 import com.netflix.kayenta.security.AccountCredentialsRepository;
 import com.netflix.kayenta.util.Retry;
 import com.netflix.spectator.api.Registry;
-import com.squareup.okhttp.OkHttpClient;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.*;
@@ -50,6 +49,7 @@
 import lombok.Getter;
 import lombok.Singular;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 
 @Builder
@@ -94,9 +94,11 @@ public List<MetricSet> queryMetrics(
       CanaryMetricConfig canaryMetricConfig,
       CanaryScope canaryScope) {
 
-    OkHttpClient okHttpClient = new OkHttpClient();
-    okHttpClient.setConnectTimeout(30, TimeUnit.SECONDS);
-    okHttpClient.setReadTimeout(90, TimeUnit.SECONDS);
+    OkHttpClient okHttpClient =
+        new OkHttpClient.Builder()
+            .connectTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(90, TimeUnit.SECONDS)
+            .build();
 
     if (!(canaryScope instanceof AtlasCanaryScope)) {
       throw new IllegalArgumentException(

kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientConfiguration.java

@@ -19,11 +19,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netflix.kayenta.atlas.config.KayentaSerializationConfigurationProperties;
 import com.netflix.kayenta.config.KayentaConfiguration;
-import com.netflix.spinnaker.config.OkHttpClientConfiguration;
+import com.netflix.spinnaker.config.OkHttp3ClientConfiguration;
 import com.netflix.spinnaker.orca.retrofit.exceptions.SpinnakerServerExceptionHandler;
-import com.squareup.okhttp.ConnectionPool;
-import com.squareup.okhttp.OkHttpClient;
-import org.springframework.beans.factory.annotation.Value;
+import okhttp3.OkHttpClient;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.*;
@@ -33,22 +31,10 @@
 @Configuration
 public class RetrofitClientConfiguration {
 
-  @Value("${ok-http-client.connection-pool.max-idle-connections:5}")
-  int maxIdleConnections;
-
-  @Value("${ok-http-client.connection-pool.keep-alive-duration-ms:300000}")
-  int keepAliveDurationMs;
-
-  @Value("${ok-http-client.retry-on-connection-failure:true}")
-  boolean retryOnConnectionFailure;
-
   @Bean
   @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-  OkHttpClient okHttpClient(OkHttpClientConfiguration okHttpClientConfig) {
-    OkHttpClient okHttpClient = okHttpClientConfig.create();
-    okHttpClient.setConnectionPool(new ConnectionPool(maxIdleConnections, keepAliveDurationMs));
-    okHttpClient.setRetryOnConnectionFailure(retryOnConnectionFailure);
-    return okHttpClient;
+  OkHttpClient okHttpClient(OkHttp3ClientConfiguration okHttp3ClientConfig) {
+    return okHttp3ClientConfig.create().build();
   }
 
   @Bean

kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java

@@ -19,27 +19,23 @@
 import static retrofit.Endpoints.newFixedEndpoint;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jakewharton.retrofit.Ok3Client;
 import com.netflix.spinnaker.kork.annotations.VisibleForTesting;
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerRetrofitErrorHandler;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
-import com.squareup.okhttp.Authenticator;
 import com.squareup.okhttp.Credentials;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
 import java.io.IOException;
-import java.net.Proxy;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.function.Function;
+import okhttp3.OkHttpClient;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tomcat.util.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 import retrofit.Endpoint;
 import retrofit.RestAdapter;
-import retrofit.client.OkClient;
 import retrofit.converter.Converter;
 import retrofit.converter.JacksonConverter;
 
@@ -118,7 +114,7 @@ public <T> T createClient(
 
     return new RestAdapter.Builder()
         .setEndpoint(endpoint)
-        .setClient(new OkClient(okHttpClient))
+        .setClient(new Ok3Client(okHttpClient))
         .setConverter(converter)
         .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance())
         .setLogLevel(RestAdapter.LogLevel.valueOf(retrofitLogLevel))
@@ -143,25 +139,10 @@ private static OkHttpClient createAuthenticatedClient(
       credential = Credentials.basic(username, password);
     }
 
-    OkHttpClient httpClient = new OkHttpClient();
-
-    httpClient.setAuthenticator(
-        new Authenticator() {
-          @Override
-          public Request authenticate(Proxy proxy, Response response) throws IOException {
-            return response.request().newBuilder().header("Authorization", credential).build();
-          }
-
-          @Override
-          public Request authenticateProxy(Proxy proxy, Response response) throws IOException {
-            return response
-                .request()
-                .newBuilder()
-                .header("Proxy-Authorization", credential)
-                .build();
-          }
-        });
-
-    return httpClient;
+    return new OkHttpClient.Builder()
+        .authenticator(
+            (route, response) ->
+                response.request().newBuilder().header("Authorization", credential).build())
+        .build();
   }
 }

kayenta-datadog/src/main/java/com/netflix/kayenta/datadog/config/DatadogConfiguration.java

@@ -27,10 +27,10 @@
 import com.netflix.kayenta.security.AccountCredentials;
 import com.netflix.kayenta.security.AccountCredentialsRepository;
 import com.netflix.spinnaker.kork.annotations.VisibleForTesting;
-import com.squareup.okhttp.OkHttpClient;
 import java.io.IOException;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;

kayenta-datadog/src/test/java/com/netflix/kayenta/datadog/functional/DatadogSecretsDoNotLeakWhenApiCalledFunctionalTest.java

@@ -33,11 +33,11 @@
 import com.netflix.kayenta.retrofit.config.RemoteService;
 import com.netflix.kayenta.retrofit.config.RetrofitClientFactory;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
-import com.squareup.okhttp.OkHttpClient;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.stream.Collectors;
+import okhttp3.OkHttpClient;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

kayenta-graphite/src/main/java/com/netflix/kayenta/graphite/config/GraphiteConfiguration.java

@@ -25,10 +25,10 @@
 import com.netflix.kayenta.retrofit.config.RetrofitClientFactory;
 import com.netflix.kayenta.security.AccountCredentials;
 import com.netflix.kayenta.security.AccountCredentialsRepository;
-import com.squareup.okhttp.OkHttpClient;
 import java.io.IOException;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;

kayenta-influxdb/src/main/java/com/netflix/kayenta/influxdb/config/InfluxDbConfiguration.java

@@ -25,10 +25,10 @@
 import com.netflix.kayenta.retrofit.config.RetrofitClientFactory;
 import com.netflix.kayenta.security.AccountCredentials;
 import com.netflix.kayenta.security.AccountCredentialsRepository;
-import com.squareup.okhttp.OkHttpClient;
 import java.io.IOException;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;

kayenta-judge/src/main/scala/com/netflix/kayenta/judge/RemoteJudge.java

@@ -27,10 +27,10 @@
 import com.netflix.kayenta.metrics.MetricSetPair;
 import com.netflix.kayenta.retrofit.config.RemoteService;
 import com.netflix.kayenta.retrofit.config.RetrofitClientFactory;
-import com.squareup.okhttp.OkHttpClient;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import retrofit.converter.JacksonConverter;
@@ -73,9 +73,11 @@ public CanaryJudgeResult judge(
       CanaryClassifierThresholdsConfig scoreThresholds,
       List<MetricSetPair> metricSetPairList) {
 
-    OkHttpClient okHttpClient = new OkHttpClient();
-    okHttpClient.setConnectTimeout(30, TimeUnit.SECONDS);
-    okHttpClient.setReadTimeout(90, TimeUnit.SECONDS);
+    OkHttpClient okHttpClient =
+        new OkHttpClient.Builder()
+            .connectTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(90, TimeUnit.SECONDS)
+            .build();
 
     RemoteJudgeService remoteJudge =
         retrofitClientFactory.createClient(

kayenta-newrelic-insights/src/main/java/com/netflix/kayenta/newrelic/config/NewRelicConfiguration.java

@@ -26,11 +26,11 @@
 import com.netflix.kayenta.retrofit.config.RetrofitClientFactory;
 import com.netflix.kayenta.security.AccountCredentials;
 import com.netflix.kayenta.security.AccountCredentialsRepository;
-import com.squareup.okhttp.OkHttpClient;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;

kayenta-objectstore-configbin/src/main/java/com/netflix/kayenta/configbin/config/ConfigBinConfiguration.java

@@ -24,9 +24,9 @@
 import com.netflix.kayenta.retrofit.config.RetrofitClientFactory;
 import com.netflix.kayenta.security.AccountCredentials;
 import com.netflix.kayenta.security.AccountCredentialsRepository;
-import com.squareup.okhttp.OkHttpClient;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;

kayenta-prometheus/src/main/java/com/netflix/kayenta/prometheus/config/PrometheusConfiguration.java

@@ -26,10 +26,10 @@
 import com.netflix.kayenta.retrofit.config.RetrofitClientFactory;
 import com.netflix.kayenta.security.AccountCredentials;
 import com.netflix.kayenta.security.AccountCredentialsRepository;
-import com.squareup.okhttp.OkHttpClient;
 import java.io.IOException;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

kayenta-prometheus/src/test/java/com/netflix/kayenta/prometheus/service/PrometheusRemoteServiceTest.java

@@ -28,14 +28,14 @@
 import com.netflix.kayenta.retrofit.config.RemoteService;
 import com.netflix.kayenta.retrofit.config.RetrofitClientFactory;
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException;
-import com.squareup.okhttp.OkHttpClient;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Scanner;
 import lombok.SneakyThrows;
+import okhttp3.OkHttpClient;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

kayenta-signalfx/src/main/java/com/netflix/kayenta/signalfx/config/SignalFxConfiguration.java

@@ -27,12 +27,12 @@
 import com.netflix.kayenta.signalfx.security.SignalFxNamedAccountCredentials;
 import com.netflix.kayenta.signalfx.service.SignalFxConverter;
 import com.netflix.kayenta.signalfx.service.SignalFxSignalFlowRemoteService;
-import com.squareup.okhttp.OkHttpClient;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;

kayenta-signalfx/src/test/java/com/netflix/kayenta/signalfx/config/SignalFxConfigLoadTest.java

@@ -24,8 +24,8 @@
 import com.netflix.kayenta.security.AccountCredentials;
 import com.netflix.kayenta.security.AccountCredentialsRepository;
 import com.netflix.kayenta.security.MapBackedAccountCredentialsRepository;
-import com.squareup.okhttp.OkHttpClient;
 import java.util.List;
+import okhttp3.OkHttpClient;
 import org.junit.jupiter.api.Test;
 
 public class SignalFxConfigLoadTest {

kayenta-wavefront/src/main/java/com/netflix/kayenta/wavefront/config/WavefrontConfiguration.java

@@ -24,10 +24,10 @@
 import com.netflix.kayenta.wavefront.security.WavefrontCredentials;
 import com.netflix.kayenta.wavefront.security.WavefrontNamedAccountCredentials;
 import com.netflix.kayenta.wavefront.service.WavefrontRemoteService;
-import com.squareup.okhttp.OkHttpClient;
 import java.io.IOException;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;