ADK changes

PiperOrigin-RevId: 941938279

Author: google-genai-bot

core/src/main/java/com/google/adk/internal/http/HttpClientFactory.java

@@ -19,14 +19,12 @@
 import static com.google.common.base.StandardSystemProperty.JAVA_VERSION;
 
 import com.google.adk.Version;
-import com.google.adk.internal.http.HttpClientFactory;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.genai.Client;
 import com.google.genai.ResponseStream;
 import com.google.genai.types.Candidate;
-import com.google.genai.types.ClientOptions;
 import com.google.genai.types.Content;
 import com.google.genai.types.FinishReason;
 import com.google.genai.types.FunctionCall;
@@ -44,7 +42,6 @@
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
-import okhttp3.OkHttpClient;
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,8 +56,6 @@ public class Gemini extends BaseLlm {
 
   private static final Logger logger = LoggerFactory.getLogger(Gemini.class);
   private static final ImmutableMap<String, String> TRACKING_HEADERS;
-  private static final OkHttpClient SHARED_HTTP_CLIENT =
-      HttpClientFactory.createSharedHttpClient("GeminiApiClient");
 
   static {
     String frameworkLabel = "google-adk/" + Version.JAVA_ADK_VERSION;
@@ -99,7 +94,6 @@ public Gemini(String modelName, String apiKey) {
         Client.builder()
             .apiKey(apiKey)
             .httpOptions(HttpOptions.builder().headers(TRACKING_HEADERS).build())
-            .clientOptions(ClientOptions.builder().customHttpClient(SHARED_HTTP_CLIENT).build())
             .build();
   }
 
@@ -113,9 +107,7 @@ public Gemini(String modelName, VertexCredentials vertexCredentials) {
     super(modelName);
     Objects.requireNonNull(vertexCredentials, "vertexCredentials cannot be null");
     Client.Builder apiClientBuilder =
-        Client.builder()
-            .httpOptions(HttpOptions.builder().headers(TRACKING_HEADERS).build())
-            .clientOptions(ClientOptions.builder().customHttpClient(SHARED_HTTP_CLIENT).build());
+        Client.builder().httpOptions(HttpOptions.builder().headers(TRACKING_HEADERS).build());
     vertexCredentials.project().ifPresent(apiClientBuilder::project);
     vertexCredentials.location().ifPresent(apiClientBuilder::location);
     vertexCredentials.credentials().ifPresent(apiClientBuilder::credentials);
@@ -214,7 +206,6 @@ public Gemini build() {
             modelName,
             Client.builder()
                 .httpOptions(HttpOptions.builder().headers(TRACKING_HEADERS).build())
-                .clientOptions(ClientOptions.builder().customHttpClient(SHARED_HTTP_CLIENT).build())
                 .build());
       }
     }

core/src/main/java/com/google/adk/models/Gemini.java

@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.adk.JsonBaseModel;
-import com.google.adk.internal.http.HttpClientFactory;
 import com.google.adk.models.LlmRequest;
 import com.google.adk.models.LlmResponse;
 import com.google.common.annotations.VisibleForTesting;
@@ -73,8 +72,7 @@ public final class ChatCompletionsHttpClient implements ChatCompletionsClient {
    * {@link ChatCompletionsHttpClient} instances. Each instance forks this client via {@link
    * OkHttpClient#newBuilder()} to apply per-instance timeouts without leaking pools.
    */
-  private static final OkHttpClient SHARED_POOL_CLIENT =
-      HttpClientFactory.createSharedHttpClient("ChatCompletionsHttpClient");
+  private static final OkHttpClient SHARED_POOL_CLIENT = new OkHttpClient();
 
   private final OkHttpClient client;
   private final HttpUrl completionsUrl;

core/src/main/java/com/google/adk/models/chat/ChatCompletionsHttpClient.java

@@ -18,7 +18,6 @@
 
 import static com.google.common.base.StandardSystemProperty.JAVA_VERSION;
 
-import com.google.adk.internal.http.HttpClientFactory;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.common.base.Ascii;
 import com.google.common.base.Strings;
@@ -103,22 +102,8 @@ abstract class ApiClient {
     this.httpClient = createHttpClient(httpOptions.timeout().orElse(null));
   }
 
-  /**
-   * Shared OkHttpClient instance whose connection pool and thread dispatcher are reused across all
-   * {@link ApiClient} subclass instances.
-   *
-   * <p>Even though {@link ApiClient} is abstract, every instantiation of a concrete subclass (e.g.,
-   * GoogleAiClient) triggers this class's constructor. Making this static prevents a severe
-   * resource leak where every new LLM Agent would otherwise spin up a brand new thread pool and TCP
-   * connection pool. Instead, all clients share this pool and fork it via {@link
-   * OkHttpClient#newBuilder()}.
-   */
-  private static final OkHttpClient SHARED_POOL_CLIENT =
-      HttpClientFactory.createSharedHttpClient("ApiClient");
-
   private OkHttpClient createHttpClient(@Nullable Integer timeout) {
-    OkHttpClient.Builder builder = SHARED_POOL_CLIENT.newBuilder();
-
+    OkHttpClient.Builder builder = new OkHttpClient().newBuilder();
     if (timeout != null) {
       builder.connectTimeout(Duration.ofMillis(timeout));
     }