fix(logging): Supply logger to all retrofit clients (#733)

spinnaker · May 7, 2020 · 29c89b0 · 29c89b0
1 parent 212436a
commit 29c89b0
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 5 deletions.
diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/BitBucketConfig.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/BitBucketConfig.groovy
@@ -18,6 +18,7 @@ package com.netflix.spinnaker.igor.config
 
 import com.netflix.spinnaker.igor.scm.bitbucket.client.BitBucketClient
 import com.netflix.spinnaker.igor.scm.bitbucket.client.BitBucketMaster
+import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger
 import com.squareup.okhttp.Credentials
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
@@ -56,6 +57,7 @@ class BitBucketConfig {
       .setRequestInterceptor(new BasicAuthRequestInterceptor(username, password))
       .setClient(new OkClient())
       .setConverter(new JacksonConverter())
+      .setLog(new Slf4jRetrofitLogger(BitBucketClient))
       .build()
       .create(BitBucketClient)
   }

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitHubConfig.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitHubConfig.groovy
@@ -19,6 +19,7 @@ package com.netflix.spinnaker.igor.config
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.netflix.spinnaker.igor.scm.github.client.GitHubClient
 import com.netflix.spinnaker.igor.scm.github.client.GitHubMaster
+import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
@@ -55,6 +56,7 @@ class GitHubConfig {
             .setRequestInterceptor(new BasicAuthRequestInterceptor(accessToken))
             .setClient(new OkClient())
             .setConverter(new JacksonConverter(mapper))
+            .setLog(new Slf4jRetrofitLogger(GitHubClient))
             .build()
             .create(GitHubClient)
 

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitLabConfig.java b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitLabConfig.java
@@ -18,6 +18,7 @@
 
 import com.netflix.spinnaker.igor.scm.gitlab.client.GitLabClient;
 import com.netflix.spinnaker.igor.scm.gitlab.client.GitLabMaster;
+import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,6 +52,7 @@ public GitLabClient gitLabClient(String address, String privateToken) {
         .setRequestInterceptor(new PrivateTokenRequestInterceptor(privateToken))
         .setClient(new OkClient())
         .setConverter(new JacksonConverter())
+        .setLog(new Slf4jRetrofitLogger(GitLabClient.class))
         .build()
         .create(GitLabClient.class);
   }

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitlabCiConfig.java b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/GitlabCiConfig.java
@@ -20,6 +20,7 @@
 import com.netflix.spinnaker.igor.gitlabci.client.GitlabCiClient;
 import com.netflix.spinnaker.igor.gitlabci.service.GitlabCiService;
 import com.netflix.spinnaker.igor.service.BuildServices;
+import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import com.squareup.okhttp.OkHttpClient;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -88,14 +89,11 @@ public static GitlabCiClient gitlabCiClient(
     OkHttpClient client = new OkHttpClient();
     client.setReadTimeout(timeout, TimeUnit.MILLISECONDS);
 
-    // Need this code because without FULL log level, fetching logs will fail. Ref
-    // https://github.com/square/retrofit/issues/953.
-    RestAdapter.Log fooLog = message -> {};
     return new RestAdapter.Builder()
         .setEndpoint(Endpoints.newFixedEndpoint(address))
         .setRequestInterceptor(new GitlabCiHeaders(privateToken))
         .setClient(new OkClient(client))
-        .setLog(fooLog)
+        .setLog(new Slf4jRetrofitLogger(GitlabCiClient.class))
         .setLogLevel(RestAdapter.LogLevel.FULL)
         .setConverter(new JacksonConverter(objectMapper))
         .build()

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/JenkinsConfig.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/JenkinsConfig.groovy
@@ -30,8 +30,8 @@ import com.netflix.spinnaker.igor.config.client.JenkinsRetrofitRequestIntercepto
 import com.netflix.spinnaker.igor.jenkins.client.JenkinsClient
 import com.netflix.spinnaker.igor.jenkins.service.JenkinsService
 import com.netflix.spinnaker.igor.service.BuildServices
-import com.netflix.spinnaker.kork.telemetry.InstrumentedProxy
 import com.netflix.spinnaker.okhttp.OkHttpMetricsInterceptor
+import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger
 import com.squareup.okhttp.OkHttpClient
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
@@ -187,6 +187,7 @@ class JenkinsConfig {
             .setLogLevel(RestAdapter.LogLevel.BASIC)
             .setClient(new OkClient(client))
             .setConverter(new JacksonConverter(getObjectMapper()))
+            .setLog(new Slf4jRetrofitLogger(JenkinsClient))
             .build()
             .create(JenkinsClient)
     }

diff --git a/...eb/src/main/groovy/com/netflix/spinnaker/igor/scm/bitbucket/client/BitBucketMaster.groovy b/...eb/src/main/groovy/com/netflix/spinnaker/igor/scm/bitbucket/client/BitBucketMaster.groovy
@@ -18,6 +18,7 @@ package com.netflix.spinnaker.igor.scm.bitbucket.client
 
 import com.netflix.spinnaker.igor.config.BitBucketProperties
 import com.netflix.spinnaker.igor.scm.AbstractScmMaster
+import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger
 import com.squareup.okhttp.Credentials
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.context.annotation.Bean
@@ -50,6 +51,7 @@ class BitBucketMaster extends AbstractScmMaster {
       .setRequestInterceptor(new BasicAuthRequestInterceptor(username, password))
       .setClient(new OkClient())
       .setConverter(new JacksonConverter())
+      .setLog(new Slf4jRetrofitLogger(BitBucketClient))
       .build()
       .create(BitBucketClient)
   }

diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/scm/github/client/GitHubMaster.groovy b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/scm/github/client/GitHubMaster.groovy
@@ -18,6 +18,7 @@ package com.netflix.spinnaker.igor.scm.github.client
 
 import com.netflix.spinnaker.igor.config.GitHubProperties
 import com.netflix.spinnaker.igor.scm.AbstractScmMaster
+import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger
 import org.springframework.context.annotation.Bean
 import retrofit.Endpoints
 import retrofit.RequestInterceptor
@@ -46,6 +47,7 @@ class GitHubMaster  extends AbstractScmMaster {
             .setRequestInterceptor(new BasicAuthRequestInterceptor(accessToken))
             .setClient(new OkClient())
             .setConverter(new JacksonConverter())
+            .setLog(new Slf4jRetrofitLogger(GitHubClient))
             .build()
             .create(GitHubClient)
     }

diff --git a/igor-web/src/main/java/com/netflix/spinnaker/igor/concourse/client/ConcourseClient.java b/igor-web/src/main/java/com/netflix/spinnaker/igor/concourse/client/ConcourseClient.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.netflix.spinnaker.igor.concourse.client.model.Token;
+import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import com.squareup.okhttp.OkHttpClient;
 import java.time.ZonedDateTime;
 import lombok.Getter;
@@ -88,6 +89,7 @@ public ConcourseClient(String host, String user, String password) {
                 request -> {
                   request.addHeader("Authorization", "Basic Zmx5OlpteDU=");
                 })
+            .setLog(new Slf4jRetrofitLogger(TokenService.class))
             .build()
             .create(TokenService.class);
 
@@ -120,6 +122,7 @@ private <S> S createService(Class<S> serviceClass) {
         .setClient(new OkClient(okHttpClient))
         .setConverter(jacksonConverter)
         .setRequestInterceptor(oauthInterceptor)
+        .setLog(new Slf4jRetrofitLogger(serviceClass))
         .build()
         .create(serviceClass);
   }

diff --git a/igor-web/src/main/java/com/netflix/spinnaker/igor/config/TravisConfig.java b/igor-web/src/main/java/com/netflix/spinnaker/igor/config/TravisConfig.java
@@ -25,6 +25,7 @@
 import com.netflix.spinnaker.igor.travis.client.TravisClient;
 import com.netflix.spinnaker.igor.travis.client.model.v3.Root;
 import com.netflix.spinnaker.igor.travis.service.TravisService;
+import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import com.squareup.okhttp.OkHttpClient;
 import java.util.ArrayList;
 import java.util.Map;
@@ -126,6 +127,7 @@ public static TravisClient travisClient(String address, int timeout, ObjectMappe
         .setLog(fooLog)
         .setLogLevel(RestAdapter.LogLevel.FULL)
         .setConverter(new JacksonConverter(objectMapper))
+        .setLog(new Slf4jRetrofitLogger(TravisClient.class))
         .build()
         .create(TravisClient.class);
   }