[task] optimize okhttp3 connection factory

collector/pom.xml

@@ -69,8 +69,8 @@
         </dependency>
         <!-- http -->
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
         </dependency>
         <!--network-->
         <dependency>
@@ -182,6 +182,12 @@
         <dependency>
             <groupId>com.ecwid.consul</groupId>
             <artifactId>consul-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+            </exclusions>
             <version>${consul-api.version}</version>
         </dependency>
         <!-- nacos -->

common/pom.xml

@@ -93,8 +93,8 @@
         </dependency>
         <!-- Use apache.http.conn.util instead of sun.net.util -->
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
         </dependency>
         <!-- caffeine-->
         <dependency>

common/src/main/java/org/apache/hertzbeat/common/constants/NetworkConstants.java

@@ -58,7 +58,8 @@ interface HttpClientConstants {
 
         int READ_TIME_OUT = 6 * 1000;
         int WRITE_TIME_OUT = 6 * 1000;
-        int CONNECT_TIME_OUT = 6 * 1000;
+        int CONNECT_TIME_OUT = 15;
+        int SOCKET_TIME_OUT = 20;
         int CHUNK_SIZE = 8196;
         int MAX_IDLE_CONNECTIONS = 20;
         int KEEP_ALIVE_TIMEOUT = 30 * 1000;
@@ -67,6 +68,8 @@ interface HttpClientConstants {
         int HTTPCLIENT_KEEP_ALIVE_DURATION = 30 * 1000;
         int HTTP_CLIENT_CONNECTION_MANAGER_CLOSE_WAIT_TIME_MS = 1000;
         int HTTP_CLIENT_CONNECTION_MANAGER_CLOSE_IDLE_TIME_S = 30;
+        int HTTP_CLIENT_MAX_CONNECT_TOTAL = 200;
+        int HTTP_CLIENT_MAX_CONNECT_PRE_ROUTE = 200;
     }
 
 }

common/src/main/java/org/apache/hertzbeat/common/util/IpDomainUtil.java

@@ -24,8 +24,8 @@
 import java.util.Enumeration;
 import java.util.regex.Pattern;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.hc.core5.net.InetAddressUtils;
 import org.apache.hertzbeat.common.constants.NetworkConstants;
-import org.apache.http.conn.util.InetAddressUtils;
 import org.springframework.util.StringUtils;
 
 /**

manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java

@@ -19,13 +19,18 @@
 
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
-import okhttp3.ConnectionPool;
-import okhttp3.OkHttpClient;
-import org.apache.hertzbeat.common.constants.NetworkConstants;
+import org.apache.hc.client5.http.config.ConnectionConfig;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.core5.util.Timeout;
+import org.apache.hertzbeat.common.constants.NetworkConstants.HttpClientConstants;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -41,21 +46,30 @@ public RestTemplate restTemplate(ClientHttpRequestFactory factory) {
         restTemplate.setInterceptors(Collections.singletonList(new HeaderRequestInterceptor()));
         return restTemplate;
     }
-
+    
     @Bean
-    public ClientHttpRequestFactory simpleClientHttpRequestFactory() {
-
-        return new OkHttp3ClientHttpRequestFactory(
-               new OkHttpClient.Builder()
-                       .readTimeout(NetworkConstants.HttpClientConstants.READ_TIME_OUT, TimeUnit.SECONDS)
-                        .writeTimeout(NetworkConstants.HttpClientConstants.WRITE_TIME_OUT, TimeUnit.SECONDS)
-                        .connectTimeout(NetworkConstants.HttpClientConstants.CONNECT_TIME_OUT, TimeUnit.SECONDS)
-                        .connectionPool(new ConnectionPool(
-                                NetworkConstants.HttpClientConstants.MAX_IDLE_CONNECTIONS,
-                                NetworkConstants.HttpClientConstants.KEEP_ALIVE_TIMEOUT,
-                                TimeUnit.SECONDS)
-                        ).build()
-        );
+    public ClientHttpRequestFactory httpComponentsClientHttpRequestFactory() {
+        ConnectionConfig connectionConfig = ConnectionConfig
+                .custom()
+                .setConnectTimeout(Timeout.of(HttpClientConstants.CONNECT_TIME_OUT, TimeUnit.SECONDS))
+                .setSocketTimeout(Timeout.of(HttpClientConstants.SOCKET_TIME_OUT, TimeUnit.SECONDS))
+                .setValidateAfterInactivity(Timeout.of(HttpClientConstants.MAX_IDLE_CONNECTIONS, TimeUnit.SECONDS))
+                .build();
+        RequestConfig requestConfig = RequestConfig.custom()
+                .setConnectionRequestTimeout(HttpClientConstants.CONNECT_TIME_OUT, TimeUnit.SECONDS)
+                .setResponseTimeout(HttpClientConstants.SOCKET_TIME_OUT, TimeUnit.SECONDS)
+                .build();
+        HttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder
+                .create()
+                .setDefaultConnectionConfig(connectionConfig)
+                .setMaxConnTotal(HttpClientConstants.HTTP_CLIENT_MAX_CONNECT_TOTAL)
+                .setMaxConnPerRoute(HttpClientConstants.HTTP_CLIENT_MAX_CONNECT_PRE_ROUTE)
+                .build();
+        CloseableHttpClient httpClient = HttpClients.custom()
+                .setConnectionManager(connectionManager)
+                .setDefaultRequestConfig(requestConfig)
+                .build();
+        return new HttpComponentsClientHttpRequestFactory(httpClient);
     }
 
 }

pom.xml

@@ -120,6 +120,7 @@
         <aliYun-sdk-java-sms.version>2.0.24</aliYun-sdk-java-sms.version>
         <caffeine.version>2.9.3</caffeine.version>
         <httpclient.version>4.5.14</httpclient.version>
+        <httpclient5.version>5.3.1</httpclient5.version>
 
         <lombok.version>1.18.28</lombok.version>
         <slf4j.version>2.0.9</slf4j.version>
@@ -271,9 +272,9 @@
                 <version>${commons-net}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${httpclient.version}</version>
+                <groupId>org.apache.httpcomponents.client5</groupId>
+                <artifactId>httpclient5</artifactId>
+                <version>${httpclient5.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>