Internal change

PiperOrigin-RevId: 894384926

Author: DeviceInfra

src/java/com/google/devtools/mobileharness/shared/util/file/remote/ApiaryBasedGcsUtil.java

@@ -27,7 +27,7 @@
 import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.HttpStatusCodes;
 import com.google.api.client.http.InputStreamContent;
-import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.http.apache.v2.ApacheHttpTransport;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.services.storage.Storage;
 import com.google.api.services.storage.model.ComposeRequest;
@@ -53,6 +53,7 @@
 import java.nio.file.Path;
 import java.security.GeneralSecurityException;
 import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -108,7 +109,14 @@ public ApiaryBasedGcsUtil(GcsParams storageParams) throws MobileHarnessException
   private static Storage getClient(GcsParams storageParams) throws MobileHarnessException {
     // Get credential
     HttpRequestInitializer credential = getCredential(storageParams);
-    return new Storage.Builder(new NetHttpTransport(), GsonFactory.getDefaultInstance(), credential)
+    return new Storage.Builder(
+            new ApacheHttpTransport(
+                ApacheHttpTransport.newDefaultHttpClientBuilder()
+                    // Set to 100 to support up to 50 upload and 50 download threads.
+                    .setMaxConnPerRoute(100)
+                    .build()),
+            GsonFactory.getDefaultInstance(),
+            credential)
         .setHttpRequestInitializer(
             request -> {
               // Timeout should be large enough to fit bad network conditions. b/79751793,
@@ -181,6 +189,8 @@ protected void copyFileToLocal(GcsApiObject gcsFile, Path localFile, long from,
             "file gs://%s/%s [%s, %s) to %s",
             storageParams.bucketName, gcsFile, from, from + size, localFile);
 
+    Instant startTime = currentTime();
+
     retryIfMeetQuotaOrNetworkIssue(
         () -> {
           try (BufferedOutputStream bufferedOutputStream = getOutputStream(localFile)) {
@@ -224,8 +234,13 @@ protected void copyFileToLocal(GcsApiObject gcsFile, Path localFile, long from,
         "copy " + fileInfo);
 
     logger.atInfo().log(
-        "Copied file gs://%s/%s [%s, %s) to %s",
-        storageParams.bucketName, gcsFile, from, from + size, localFile);
+        "Copied file gs://%s/%s [%s, %s) to %s, took %d ms",
+        storageParams.bucketName,
+        gcsFile,
+        from,
+        from + size,
+        localFile,
+        Duration.between(startTime, currentTime()).toMillis());
   }
 
   @Override

src/java/com/google/devtools/mobileharness/shared/util/file/remote/BUILD

@@ -58,6 +58,7 @@ java_library(
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_http_client_google_http_client",
+        "@maven//:com_google_http_client_google_http_client_apache_v2",
         "@maven//:com_google_http_client_google_http_client_gson",
         "@protobuf//:protobuf_java",
     ],