Merge branch 'master' into opendocsUpgrade

.github/workflows/build.yml

@@ -19,7 +19,6 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           java-version: |
-            11
             17
           distribution: 'zulu'
           cache: 'gradle'

.github/workflows/pr.yml

@@ -13,7 +13,6 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         java-version: |
-          11
           17
         distribution: 'zulu'
         cache: 'gradle'

.github/workflows/release.yml

@@ -38,7 +38,6 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           java-version: |
-            11
             17
           distribution: 'zulu'
           cache: 'gradle'

gradle.properties

@@ -1,7 +1,7 @@
 kotlinVersion=1.6.21
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
-targetJava17=false
+targetJava17=true
 includeRuntimes=actuator,core,eureka,retrofit,secrets-aws,secrets-gcp,stackdriver,swagger,tomcat,web
 
 org.gradle.jvmargs=-Xmx2g -Xms2g

gradle/kotlin-test.gradle

@@ -38,6 +38,6 @@ dependencies {
 compileTestKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }

gradle/kotlin.gradle

@@ -40,14 +40,14 @@ dependencies {
 compileKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }
 
 compileTestKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }
 

kork-retrofit/src/main/java/com/netflix/spinnaker/kork/retrofit/RetrofitServiceFactory.java

@@ -25,6 +25,7 @@
 import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider;
 import com.netflix.spinnaker.kork.annotations.NonnullByDefault;
 import com.netflix.spinnaker.kork.client.ServiceClientFactory;
+import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerRetrofitErrorHandler;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import retrofit.Endpoint;
 import retrofit.RequestInterceptor;
@@ -54,6 +55,7 @@ public <T> T create(Class<T> type, ServiceEndpoint serviceEndpoint, ObjectMapper
         .setRequestInterceptor(spinnakerRequestInterceptor)
         .setConverter(new JacksonConverter(objectMapper))
         .setEndpoint(endpoint)
+        .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance())
         .setClient(new Ok3Client(clientProvider.getClient(serviceEndpoint)))
         .setLogLevel(retrofitLogLevel)
         .setLog(new Slf4jRetrofitLogger(type))

kork-retrofit/src/test/java/com/netflix/spinnaker/kork/retrofit/exceptions/SpinnakerRetrofitErrorHandlerTest.java

@@ -22,6 +22,7 @@
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jakewharton.retrofit.Ok3Client;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -52,6 +53,7 @@ static void setupOnce() throws Exception {
 
     retrofitService =
         new RestAdapter.Builder()
+            .setClient(new Ok3Client())
             .setEndpoint(mockWebServer.url("/").toString())
             .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance())
             .build()

kork-web/kork-web.gradle

@@ -23,7 +23,6 @@ dependencies {
   api "org.springframework.security:spring-security-core"
   api "com.netflix.spectator:spectator-api"
   api "com.fasterxml.jackson.core:jackson-annotations"
-  api "com.squareup.okhttp:okhttp"
   api "com.squareup.okhttp3:logging-interceptor"
   api "com.squareup.okhttp3:okhttp"
   api "com.squareup.retrofit:retrofit"

kork-web/src/main/java/com/netflix/spinnaker/config/OkHttpClientComponents.java

@@ -28,7 +28,6 @@
 import com.netflix.spinnaker.kork.crypto.X509IdentitySource;
 import com.netflix.spinnaker.okhttp.OkHttp3MetricsInterceptor;
 import com.netflix.spinnaker.okhttp.OkHttpClientConfigurationProperties;
-import com.netflix.spinnaker.okhttp.OkHttpMetricsInterceptor;
 import com.netflix.spinnaker.okhttp.SpinnakerRequestHeaderInterceptor;
 import com.netflix.spinnaker.okhttp.SpinnakerRequestInterceptor;
 import com.netflix.spinnaker.retrofit.Retrofit2ConfigurationProperties;
@@ -90,11 +89,6 @@ public SpinnakerRequestHeaderInterceptor spinnakerRequestHeaderInterceptor() {
     return new SpinnakerRequestHeaderInterceptor(clientProperties.getPropagateSpinnakerHeaders());
   }
 
-  @Bean
-  public OkHttpMetricsInterceptor okHttpMetricsInterceptor() {
-    return new OkHttpMetricsInterceptor(registryProvider, metricsProperties);
-  }
-
   @Bean
   public OkHttp3MetricsInterceptor okHttp3MetricsInterceptor() {
     return new OkHttp3MetricsInterceptor(registryProvider, metricsProperties);

kork-web/src/main/java/com/netflix/spinnaker/okhttp/MetricsInterceptor.java

@@ -3,9 +3,6 @@
 import com.netflix.spectator.api.Registry;
 import com.netflix.spinnaker.config.OkHttpMetricsInterceptorProperties;
 import com.netflix.spinnaker.kork.common.Header;
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -45,14 +42,11 @@ protected final Object doIntercept(Object chainObject) throws IOException {
     boolean wasSuccessful = false;
     int statusCode = -1;
 
-    Interceptor.Chain chain =
-        (chainObject instanceof Interceptor.Chain) ? (Interceptor.Chain) chainObject : null;
     okhttp3.Interceptor.Chain chain3 =
         (chainObject instanceof okhttp3.Interceptor.Chain)
             ? (okhttp3.Interceptor.Chain) chainObject
             : null;
 
-    Request request = (chain != null) ? chain.request() : null;
     okhttp3.Request request3 = (chain3 != null) ? chain3.request() : null;
 
     List<String> missingHeaders = new ArrayList<>();
@@ -63,24 +57,14 @@ protected final Object doIntercept(Object chainObject) throws IOException {
 
       Object response;
 
-      if (chain != null) {
-        method = request.method();
-        url = request.url();
-        response = chain.proceed(request);
-        statusCode = ((Response) response).code();
-      } else {
-        method = request3.method();
-        url = request3.url().url();
-        response = chain3.proceed(request3);
-        statusCode = ((okhttp3.Response) response).code();
-      }
+      method = request3.method();
+      url = request3.url().url();
+      response = chain3.proceed(request3);
+      statusCode = ((okhttp3.Response) response).code();
 
       if (checkForHeaders(url.toString())) {
         for (Header header : Header.values()) {
-          String headerValue =
-              (request != null)
-                  ? request.header(header.getHeader())
-                  : request3.header(header.getHeader());
+          String headerValue = request3.header(header.getHeader());
 
           if (header.isRequired() && StringUtils.isEmpty(headerValue)) {
             missingHeaders.add(header.getHeader());

kork-web/src/test/java/com/netflix/spinnaker/config/OkHttpClientComponentsTest.java

@@ -19,7 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.netflix.spinnaker.okhttp.OkHttp3MetricsInterceptor;
-import com.netflix.spinnaker.okhttp.OkHttpMetricsInterceptor;
 import com.netflix.spinnaker.okhttp.SpinnakerRequestHeaderInterceptor;
 import com.netflix.spinnaker.okhttp.SpinnakerRequestInterceptor;
 import org.junit.jupiter.api.BeforeEach;
@@ -47,7 +46,6 @@ void verifyValidConfiguration() {
         ctx -> {
           assertThat(ctx).hasSingleBean(SpinnakerRequestInterceptor.class);
           assertThat(ctx).hasSingleBean(SpinnakerRequestHeaderInterceptor.class);
-          assertThat(ctx).hasSingleBean(OkHttpMetricsInterceptor.class);
           assertThat(ctx).hasSingleBean(OkHttp3MetricsInterceptor.class);
         });
   }