Update Okhttp to 4.12 and use logging interceptor

Author: henryju

lib/pom.xml

@@ -10,11 +10,16 @@
   <artifactId>sonar-scanner-java-library</artifactId>
   <name>SonarScanner Java Library</name>
 
+  <properties>
+    <slf4j.version>2.0.13</slf4j.version>
+  </properties>
+
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.13</version>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
@@ -24,6 +29,10 @@
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp-urlconnection</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>logging-interceptor</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>

lib/src/main/java/org/sonarsource/scanner/lib/internal/http/OkHttpClientFactory.java

@@ -35,6 +35,10 @@
 import okhttp3.Credentials;
 import okhttp3.JavaNetCookieJar;
 import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonarsource.scanner.lib.ScannerProperties;
 import org.sonarsource.scanner.lib.internal.http.ssl.CertificateStore;
 import org.sonarsource.scanner.lib.internal.http.ssl.SslConfig;
@@ -59,6 +63,8 @@
 
 public class OkHttpClientFactory {
 
+  private static final Logger LOG = LoggerFactory.getLogger(OkHttpClientFactory.class);
+
   static final CookieManager COOKIE_MANAGER;
   private static final String PROXY_AUTHORIZATION = "Proxy-Authorization";
   // use the same cookie jar for all instances
@@ -127,6 +133,10 @@ static OkHttpClient create(Map<String, String> bootstrapProperties, Path sonarUs
       });
     }
 
+    var logging = new HttpLoggingInterceptor(LOG::debug);
+    logging.setLevel(HttpLoggingInterceptor.Level.BASIC);
+    okHttpClientBuilder.addInterceptor(logging);
+
     return okHttpClientBuilder.build();
   }
 

lib/src/main/java/org/sonarsource/scanner/lib/internal/http/ServerConnection.java

@@ -140,7 +140,6 @@ private String callApi(String url) throws IOException {
     if (httpClient == null) {
       throw new IllegalStateException("ServerConnection must be initialized");
     }
-    LOG.debug("Call API: {}}", url);
     try (ResponseBody responseBody = callUrl(url, true, null)) {
       return responseBody.string();
     }
@@ -152,31 +151,30 @@ private String callApi(String url) throws IOException {
    * @param url            the URL to call
    * @param authentication if true, the request will be authenticated with the token
    * @param acceptHeader   the value of the Accept header
-   * @throws IOException           if connectivity error/timeout (network)
    * @throws IllegalStateException if HTTP code is different than 2xx
    */
-  private ResponseBody callUrl(String url, boolean authentication, @Nullable String acceptHeader) throws IOException {
+  private ResponseBody callUrl(String url, boolean authentication, @Nullable String acceptHeader) {
+    var requestBuilder = new Request.Builder()
+      .get()
+      .url(url)
+      .addHeader("User-Agent", userAgent);
+    if (authentication && credentials != null) {
+      requestBuilder.header("Authorization", credentials);
+    }
+    if (acceptHeader != null) {
+      requestBuilder.header("Accept", acceptHeader);
+    }
+    Request request = requestBuilder.build();
+    Response response;
     try {
-      var requestBuilder = new Request.Builder()
-        .get()
-        .url(url)
-        .addHeader("User-Agent", userAgent);
-      if (authentication && credentials != null) {
-        requestBuilder.header("Authorization", credentials);
-      }
-      if (acceptHeader != null) {
-        requestBuilder.header("Accept", acceptHeader);
-      }
-      Request request = requestBuilder.build();
-      Response response = httpClient.newCall(request).execute();
-      if (!response.isSuccessful()) {
-        response.close();
-        throw new IllegalStateException(format("Error status returned by url [%s]: %s", response.request().url(), response.code()));
-      }
-      return response.body();
+      response = httpClient.newCall(request).execute();
     } catch (Exception e) {
-      LOG.error("Call to URL [{}] failed", url);
-      throw e;
+      throw new IllegalStateException(format("Call to URL [%s] failed", url), e);
+    }
+    if (!response.isSuccessful()) {
+      response.close();
+      throw new IllegalStateException(format("Error status returned by url [%s]: %s", response.request().url(), response.code()));
     }
+    return response.body();
   }
 }

pom.xml

@@ -53,7 +53,7 @@
 
     <!-- used for deployment to SonarSource Artifactory -->
     <gitRepositoryName>sonar-scanner-java-library</gitRepositoryName>
-    <okhttp.version>4.10.0</okhttp.version>
+    <okhttp.version>4.12.0</okhttp.version>
     <mockito.version>3.12.4</mockito.version>
   </properties>
 
@@ -84,6 +84,11 @@
         <artifactId>okhttp-urlconnection</artifactId>
         <version>${okhttp.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>logging-interceptor</artifactId>
+        <version>${okhttp.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>