setting level of the logging interceptor

Consensys · May 12, 2022 · d74f7d4 · d74f7d4
1 parent 5039fc8
commit d74f7d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/...nclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/OkHttpClientCreator.java b/...nclient/src/main/java/tech/pegasys/teku/ethereum/executionclient/OkHttpClientCreator.java
@@ -17,6 +17,7 @@
 import java.util.Optional;
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
+import okhttp3.logging.HttpLoggingInterceptor.Logger;
 import tech.pegasys.teku.ethereum.executionclient.auth.JwtAuthHttpInterceptor;
 import tech.pegasys.teku.ethereum.executionclient.auth.JwtConfig;
 import tech.pegasys.teku.infrastructure.time.TimeProvider;
@@ -35,4 +36,11 @@ public static OkHttpClient create(
         config -> builder.addInterceptor(new JwtAuthHttpInterceptor(config, timeProvider)));
     return builder.build();
   }
+
+  public static HttpLoggingInterceptor createLoggingInterceptor(
+      Logger logger, HttpLoggingInterceptor.Level level) {
+    final HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(logger);
+    loggingInterceptor.setLevel(level);
+    return loggingInterceptor;
+  }
 }
diff --git a/...lient/src/main/java/tech/pegasys/teku/ethereum/executionclient/web3j/Web3jHttpClient.java b/...lient/src/main/java/tech/pegasys/teku/ethereum/executionclient/web3j/Web3jHttpClient.java
@@ -35,13 +35,17 @@ class Web3jHttpClient extends Web3JClient {
       final Duration timeout,
       final Optional<JwtConfig> jwtConfig) {
     super(timeProvider);
-    final HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(LOG::trace);
+    final Optional<HttpLoggingInterceptor> loggingInterceptor;
+    if (LOG.isTraceEnabled()) {
+      loggingInterceptor =
+          Optional.of(
+              OkHttpClientCreator.createLoggingInterceptor(
+                  LOG::trace, HttpLoggingInterceptor.Level.BODY));
+    } else {
+      loggingInterceptor = Optional.empty();
+    }
     final OkHttpClient okHttpClient =
-        OkHttpClientCreator.create(
-            jwtConfig,
-            timeout,
-            LOG.isTraceEnabled() ? Optional.of(loggingInterceptor) : Optional.empty(),
-            timeProvider);
+        OkHttpClientCreator.create(jwtConfig, timeout, loggingInterceptor, timeProvider);
     Web3jService httpService = new HttpService(endpoint.toString(), okHttpClient);
     initWeb3jService(httpService);
   }