Revert "feat(mcp): configure HTTP proxy from connectors proxy vars on MCP connections (#6335)" (#6524)

This reverts commit 65044f1.

(cherry picked from commit 5db5a29)

Author: mdii

connectors/agentic-ai/src/main/java/io/camunda/connector/agenticai/autoconfigure/AgenticAiConnectorsAutoConfiguration.java

@@ -58,14 +58,11 @@
 import io.camunda.connector.agenticai.aiagent.tool.GatewayToolHandler;
 import io.camunda.connector.agenticai.aiagent.tool.GatewayToolHandlerRegistry;
 import io.camunda.connector.agenticai.aiagent.tool.GatewayToolHandlerRegistryImpl;
-import io.camunda.connector.agenticai.common.AgenticAiHttpSupport;
 import io.camunda.connector.agenticai.mcp.client.configuration.McpClientConfiguration;
 import io.camunda.connector.agenticai.mcp.client.configuration.McpRemoteClientConfiguration;
 import io.camunda.connector.agenticai.mcp.discovery.configuration.McpDiscoveryConfiguration;
 import io.camunda.connector.api.document.DocumentFactory;
 import io.camunda.connector.api.validation.ValidationProvider;
-import io.camunda.connector.http.client.client.jdk.proxy.JdkHttpClientProxyConfigurator;
-import io.camunda.connector.http.client.proxy.ProxyConfiguration;
 import io.camunda.connector.runtime.annotation.ConnectorsObjectMapper;
 import io.camunda.connector.runtime.core.ConnectorResultHandler;
 import io.camunda.connector.runtime.core.document.store.CamundaDocumentStore;
@@ -98,12 +95,6 @@
 })
 public class AgenticAiConnectorsAutoConfiguration {
 
-  @Bean
-  @ConditionalOnMissingBean
-  public AgenticAiHttpSupport agenticAiHttpSupport() {
-    return new AgenticAiHttpSupport(new JdkHttpClientProxyConfigurator(new ProxyConfiguration()));
-  }
-
   @Bean
   @ConditionalOnMissingBean
   public AdHocToolElementParameterExtractor aiAgentAdHocToolElementParameterExtractor() {

connectors/agentic-ai/src/main/java/io/camunda/connector/agenticai/common/AgenticAiHttpSupport.java

@@ -7,7 +7,6 @@
 package io.camunda.connector.agenticai.mcp.client.configuration.mcpsdk;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.camunda.connector.agenticai.common.AgenticAiHttpSupport;
 import io.camunda.connector.agenticai.mcp.client.configuration.annotation.RuntimeMcpClientFactory;
 import io.camunda.connector.agenticai.mcp.client.framework.bootstrap.McpClientHeadersSupplierFactory;
 import io.camunda.connector.agenticai.mcp.client.framework.mcpsdk.McpSdkClientFactory;
@@ -35,9 +34,7 @@ void init() {
   @RuntimeMcpClientFactory
   public McpSdkClientFactory mcpSdkMcpClientFactory(
       @ConnectorsObjectMapper ObjectMapper objectMapper,
-      AgenticAiHttpSupport httpSupport,
       McpClientHeadersSupplierFactory headersSupplierFactory) {
-    return new McpSdkClientFactory(
-        objectMapper, httpSupport.getJdkHttpClientProxyConfigurator(), headersSupplierFactory);
+    return new McpSdkClientFactory(objectMapper, headersSupplierFactory);
   }
 }

connectors/agentic-ai/src/main/java/io/camunda/connector/agenticai/mcp/client/configuration/mcpsdk/McpSdkMcpClientConfiguration.java

@@ -7,7 +7,6 @@
 package io.camunda.connector.agenticai.mcp.client.configuration.mcpsdk;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.camunda.connector.agenticai.common.AgenticAiHttpSupport;
 import io.camunda.connector.agenticai.mcp.client.configuration.annotation.RemoteMcpClientFactory;
 import io.camunda.connector.agenticai.mcp.client.framework.bootstrap.McpClientHeadersSupplierFactory;
 import io.camunda.connector.agenticai.mcp.client.framework.mcpsdk.McpSdkClientFactory;
@@ -36,9 +35,7 @@ void init() {
   @RemoteMcpClientFactory
   public McpSdkClientFactory mcpSdkMcpRemoteClientFactory(
       @ConnectorsObjectMapper ObjectMapper objectMapper,
-      AgenticAiHttpSupport httpSupport,
       McpClientHeadersSupplierFactory headersSupplierFactory) {
-    return new McpSdkClientFactory(
-        objectMapper, httpSupport.getJdkHttpClientProxyConfigurator(), headersSupplierFactory);
+    return new McpSdkClientFactory(objectMapper, headersSupplierFactory);
   }
 }

connectors/agentic-ai/src/main/java/io/camunda/connector/agenticai/mcp/client/configuration/mcpsdk/McpSdkMcpRemoteClientConfiguration.java

@@ -12,7 +12,6 @@
 import io.camunda.connector.agenticai.mcp.client.execution.McpClientDelegate;
 import io.camunda.connector.agenticai.mcp.client.framework.bootstrap.McpClientHeadersSupplierFactory;
 import io.camunda.connector.agenticai.mcp.client.framework.mcpsdk.rpc.McpSdkMcpClientDelegate;
-import io.camunda.connector.http.client.client.jdk.proxy.JdkHttpClientProxyConfigurator;
 import io.modelcontextprotocol.client.McpClient;
 import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport;
 import io.modelcontextprotocol.client.transport.HttpClientStreamableHttpTransport;
@@ -29,17 +28,12 @@
 public class McpSdkClientFactory implements McpClientFactory {
 
   public static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(30);
-
   private final ObjectMapper objectMapper;
-  private final JdkHttpClientProxyConfigurator proxyConfigurator;
   private final McpClientHeadersSupplierFactory headersSupplierFactory;
 
   public McpSdkClientFactory(
-      ObjectMapper objectMapper,
-      JdkHttpClientProxyConfigurator proxyConfigurator,
-      McpClientHeadersSupplierFactory headersSupplierFactory) {
+      ObjectMapper objectMapper, McpClientHeadersSupplierFactory headersSupplierFactory) {
     this.objectMapper = objectMapper;
-    this.proxyConfigurator = proxyConfigurator;
     this.headersSupplierFactory = headersSupplierFactory;
   }
 
@@ -88,7 +82,6 @@ private HttpClientStreamableHttpTransport createStreamableHttpTransport(
     return HttpClientStreamableHttpTransport.builder(streamableHttpConfig.url())
         .endpoint(
             streamableHttpConfig.url()) // see https://github.com/camunda/connectors/issues/6393
-        .customizeClient(proxyConfigurator::configure)
         .connectTimeout(timeout(streamableHttpConfig.timeout()))
         .supportedProtocolVersions(
             List.of(
@@ -109,13 +102,13 @@ private HttpClientSseClientTransport createSseTransport(
 
     return HttpClientSseClientTransport.builder(sseConfig.url())
         .sseEndpoint(sseConfig.url()) // see https://github.com/camunda/connectors/issues/6393
-        .customizeClient(proxyConfigurator::configure)
         .connectTimeout(timeout(sseConfig.timeout()))
         .customizeRequest(
             request -> {
               var headers = headerSuppliers.get();
               headers.forEach(request::header);
             })
+        // todo proxy configuration
         .build();
   }
 

connectors/agentic-ai/src/main/java/io/camunda/connector/agenticai/mcp/client/framework/mcpsdk/McpSdkClientFactory.java

@@ -41,7 +41,6 @@
 import io.camunda.connector.agenticai.aiagent.memory.conversation.document.CamundaDocumentConversationStore;
 import io.camunda.connector.agenticai.aiagent.memory.conversation.inprocess.InProcessConversationStore;
 import io.camunda.connector.agenticai.aiagent.tool.GatewayToolHandlerRegistry;
-import io.camunda.connector.agenticai.common.AgenticAiHttpSupport;
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -55,7 +54,6 @@ class AgenticAiConnectorsAutoConfigurationTest {
 
   private static final List<Class<?>> AGENTIC_AI_BEANS =
       List.of(
-          AgenticAiHttpSupport.class,
           AdHocToolElementParameterExtractor.class,
           AdHocToolSchemaGenerator.class,
           AdHocToolsSchemaResolver.class,

connectors/agentic-ai/src/test/java/io/camunda/connector/agenticai/autoconfigure/AgenticAiConnectorsAutoConfigurationTest.java

@@ -13,9 +13,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.awaitility.Awaitility.await;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -34,7 +31,6 @@
 import io.camunda.connector.agenticai.mcp.client.framework.bootstrap.McpClientHeadersSupplierFactory;
 import io.camunda.connector.agenticai.mcp.client.framework.mcpsdk.rpc.McpSdkMcpClientDelegate;
 import io.camunda.connector.agenticai.mcp.client.model.auth.BearerAuthentication;
-import io.camunda.connector.http.client.client.jdk.proxy.JdkHttpClientProxyConfigurator;
 import io.modelcontextprotocol.client.McpSyncClient;
 import java.time.Duration;
 import java.util.List;
@@ -65,7 +61,6 @@ class McpSdkClientFactoryTest {
           "X-Dummy", "Test",
           "Authorization", "Bearer test-token");
 
-  @Mock private JdkHttpClientProxyConfigurator httpClientProxyConfigurator;
   @Mock private McpClientHeadersSupplierFactory headersSupplierFactory;
 
   private final ObjectMapper objectMapper = new ObjectMapper();
@@ -74,8 +69,7 @@ class McpSdkClientFactoryTest {
   @BeforeEach
   void setUp() {
     WireMock.reset();
-    factory =
-        new McpSdkClientFactory(objectMapper, httpClientProxyConfigurator, headersSupplierFactory);
+    factory = new McpSdkClientFactory(objectMapper, headersSupplierFactory);
   }
 
   @Test
@@ -86,7 +80,6 @@ void createsStdioMcpClient() {
             CLIENT_ID, createMcpClientConfiguration(McpClientType.STDIO, stdioConfig, null, null));
 
     assertClientIsOfCorrectType(client);
-    verifyNoInteractions(httpClientProxyConfigurator);
   }
 
   @Test
@@ -114,7 +107,6 @@ void createsStreamableHttpMcpClient(String endpoint, WireMockRuntimeInfo wireMoc
                 McpClientType.HTTP, null, streamableHttpTransportConfig, null));
 
     assertClientIsOfCorrectType(client);
-    verify(httpClientProxyConfigurator).configure(any());
 
     assertThatThrownBy(() -> client.listTools(AllowDenyList.allowingEverything()))
         .hasMessage("Client failed to initialize listing tools");
@@ -145,7 +137,6 @@ void createsSseHttpMcpClient(String endpoint, WireMockRuntimeInfo wireMock) {
             CLIENT_ID, createMcpClientConfiguration(McpClientType.SSE, null, null, sseConfig));
 
     assertClientIsOfCorrectType(client);
-    verify(httpClientProxyConfigurator).configure(any());
 
     assertThatThrownBy(() -> client.listTools(AllowDenyList.allowingEverything()))
         .hasMessage("Client failed to initialize listing tools");