Merge branch 'master' into webappproxy

kezhenxu94 · web-flow · commit 96f485ff0cd6 · 2025-09-01T09:59:51.000+08:00
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -66,6 +66,26 @@
 * BanyanDB: fix Zipkin query missing tag `QUERY`.
 * Fix `IllegalArgumentException: Incorrect number of labels`, tags in the `LogReportServiceHTTPHandler` and `LogReportServiceGrpcHandler` inconsistent with `LogHandler`.
 * BanyanDB: fix Zipkin query by `annotationQuery`
+* HTTP Server: Use the default shared thread pool rather than creating a new event loop thread pool for each server. Remove the `MAX_THREADS` from each server config.
+* Optimize all Armeria HTTP Server(s) to share the `CommonPools` for the whole JVM.
+  In the `CommonPools`, the max threads for `EventLoopGroup` is `processor * 2`, and for `BlockingTaskExecutor` is `200` and can be recycled if over the keepAliveTimeMillis (60000L by default).
+  Here is a summary of the thread dump without UI query in a simple Kind env deployed by SkyWalking showcase:
+
+| **Thread Type**                 | **Count** | **Main State**              | **Description**                                                                                                                       |
+|---------------------------------|-----------|-----------------------------|---------------------------------------------------------------------------------------------------------------------------------------|
+| **JVM System Threads**          | 12        | RUNNABLE/WAITING            | Includes Reference Handler, Finalizer, Signal Dispatcher, Service Thread, C2/C1 CompilerThreads, Sweeper thread, Common-Cleaner, etc. |
+| **Netty I/O Worker Threads**    | 32        | RUNNABLE                    | Threads named "armeria-common-worker-epoll-*", handling network I/O operations.                                                       |
+| **gRPC Worker Threads**         | 16        | RUNNABLE                    | Threads named "grpc-default-worker-*".                                                                                                |
+| **HTTP Client Threads**         | 4         | RUNNABLE                    | Threads named "HttpClient-*-SelectorManager".                                                                                         |
+| **Data Consumer Threads**       | 47        | TIMED_WAITING (sleeping)    | Threads named "DataCarrier.*", used for metrics data consumption.                                                                     |
+| **Scheduled Task Threads**      | 10        | TIMED_WAITING (parking)     | Threads named "pool-*-thread-*".                                                                                                      |
+| **ForkJoinPool Worker Threads** | 2         | WAITING (parking)           | Threads named "ForkJoinPool-*".                                                                                                       |
+| **BanyanDB Processor Threads**  | 2         | TIMED_WAITING (parking)     | Threads named "BanyanDB BulkProcessor".                                                                                               |
+| **gRPC Executor Threads**       | 3         | TIMED_WAITING (parking)     | Threads named "grpc-default-executor-*".                                                                                              |
+| **JVM GC Threads**              | 13        | RUNNABLE                    | Threads named "GC Thread#*" for garbage collection.                                                                                   |
+| **Other JVM Internal Threads**  | 3         | RUNNABLE                    | Includes VM Thread, G1 Main Marker, VM Periodic Task Thread.                                                                          |
+| **Attach Listener**             | 1         | RUNNABLE                    | JVM attach listener thread.                                                                                                           |
+| **Total**                       | **158**   | -                           | -                                                                                                                                     |
 
 #### UI
 
diff --git a/docs/en/setup/backend/configuration-vocabulary.md b/docs/en/setup/backend/configuration-vocabulary.md
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
@@ -253,7 +253,6 @@ public void prepare() throws ServiceNotProvidedException, ModuleStartException {
                                                             .port(moduleConfig.getRestPort())
                                                             .contextPath(moduleConfig.getRestContextPath())
                                                             .idleTimeOut(moduleConfig.getRestIdleTimeOut())
-                                                            .maxThreads(moduleConfig.getRestMaxThreads())
                                                             .acceptQueueSize(
                                                                 moduleConfig.getRestAcceptQueueSize())
                                                             .maxRequestHeaderSize(
diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/http/HTTPServer.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/http/HTTPServer.java
@@ -27,7 +27,6 @@
 import com.linecorp.armeria.server.docs.DocService;
 import com.linecorp.armeria.server.encoding.DecodingService;
 import com.linecorp.armeria.server.logging.LoggingService;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -60,7 +59,6 @@ public void initialize() {
             .builder()
             .baseContextPath(config.getContextPath())
             .serviceUnder("/docs", DocService.builder().build())
-            .workerGroup(config.getMaxThreads())
             .http1MaxHeaderSize(config.getMaxRequestHeaderSize())
             .idleTimeout(Duration.ofMillis(config.getIdleTimeOut()))
             .decorator(Route.ofCatchAll(), (delegate, ctx, req) -> {
diff --git a/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/http/HTTPServerConfig.java b/oap-server/server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/http/HTTPServerConfig.java
@@ -31,8 +31,6 @@ public class HTTPServerConfig {
     private int port;
     private String contextPath;
 
-    @Builder.Default
-    private int maxThreads = 200;
     @Builder.Default
     private long idleTimeOut = 30000;
     @Builder.Default
diff --git a/oap-server/server-query-plugin/logql-plugin/src/main/java/org/apache/skywalking/oap/query/logql/LogQLConfig.java b/oap-server/server-query-plugin/logql-plugin/src/main/java/org/apache/skywalking/oap/query/logql/LogQLConfig.java
@@ -28,7 +28,6 @@ public class LogQLConfig extends ModuleConfig {
     private String restHost;
     private int restPort;
     private String restContextPath;
-    private int restMaxThreads = 200;
     private long restIdleTimeOut = 30000;
     private int restAcceptQueueSize = 0;
 }
diff --git a/oap-server/server-query-plugin/logql-plugin/src/main/java/org/apache/skywalking/oap/query/logql/LogQLProvider.java b/oap-server/server-query-plugin/logql-plugin/src/main/java/org/apache/skywalking/oap/query/logql/LogQLProvider.java
@@ -72,7 +72,6 @@ public void start() throws ServiceNotProvidedException, ModuleStartException {
                                                             .port(config.getRestPort())
                                                             .contextPath(config.getRestContextPath())
                                                             .idleTimeOut(config.getRestIdleTimeOut())
-                                                            .maxThreads(config.getRestMaxThreads())
                                                             .acceptQueueSize(config.getRestAcceptQueueSize())
                                                             .build();
 
diff --git a/oap-server/server-query-plugin/promql-plugin/src/main/java/org/apache/skywalking/oap/query/promql/PromQLConfig.java b/oap-server/server-query-plugin/promql-plugin/src/main/java/org/apache/skywalking/oap/query/promql/PromQLConfig.java
@@ -28,7 +28,6 @@ public class PromQLConfig extends ModuleConfig {
     private String restHost;
     private int restPort;
     private String restContextPath;
-    private int restMaxThreads = 200;
     private long restIdleTimeOut = 30000;
     private int restAcceptQueueSize = 0;
 
diff --git a/oap-server/server-query-plugin/promql-plugin/src/main/java/org/apache/skywalking/oap/query/promql/PromQLProvider.java b/oap-server/server-query-plugin/promql-plugin/src/main/java/org/apache/skywalking/oap/query/promql/PromQLProvider.java
@@ -73,7 +73,6 @@ public void start() throws ServiceNotProvidedException, ModuleStartException {
                                                             .port(config.getRestPort())
                                                             .contextPath(config.getRestContextPath())
                                                             .idleTimeOut(config.getRestIdleTimeOut())
-                                                            .maxThreads(config.getRestMaxThreads())
                                                             .acceptQueueSize(config.getRestAcceptQueueSize())
                                                             .build();
 
diff --git a/oap-server/server-query-plugin/zipkin-query-plugin/src/main/java/org/apache/skywalking/oap/query/zipkin/ZipkinQueryConfig.java b/oap-server/server-query-plugin/zipkin-query-plugin/src/main/java/org/apache/skywalking/oap/query/zipkin/ZipkinQueryConfig.java
@@ -28,7 +28,6 @@ public class ZipkinQueryConfig extends ModuleConfig {
     private String restHost;
     private int restPort;
     private String restContextPath;
-    private int restMaxThreads = 200;
     private long restIdleTimeOut = 30000;
     private int restAcceptQueueSize = 0;
     private long lookback = 86400000L;
diff --git a/oap-server/server-query-plugin/zipkin-query-plugin/src/main/java/org/apache/skywalking/oap/query/zipkin/ZipkinQueryProvider.java b/oap-server/server-query-plugin/zipkin-query-plugin/src/main/java/org/apache/skywalking/oap/query/zipkin/ZipkinQueryProvider.java
@@ -73,7 +73,6 @@ public void start() throws ServiceNotProvidedException, ModuleStartException {
                                                             .port(config.getRestPort())
                                                             .contextPath(config.getRestContextPath())
                                                             .idleTimeOut(config.getRestIdleTimeOut())
-                                                            .maxThreads(config.getRestMaxThreads())
                                                             .acceptQueueSize(config.getRestAcceptQueueSize())
                                                             .build();
 
diff --git a/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleConfig.java b/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleConfig.java
@@ -25,7 +25,6 @@ public class AWSFirehoseReceiverModuleConfig extends ModuleConfig {
     private String host;
     private int port;
     private String contextPath;
-    private int maxThreads = 200;
     private long idleTimeOut = 30000;
     private int acceptQueueSize = 0;
     private int maxRequestHeaderSize = 8192;
diff --git a/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleProvider.java b/oap-server/server-receiver-plugin/aws-firehose-receiver/src/main/java/org/apache/skywalking/oap/server/receiver/aws/firehose/AWSFirehoseReceiverModuleProvider.java
@@ -68,7 +68,6 @@ public void prepare() throws ServiceNotProvidedException {
         final HTTPServerConfig httpServerConfig = HTTPServerConfig.builder().host(moduleConfig.getHost())
                                                                   .port(moduleConfig.getPort())
                                                                   .contextPath(moduleConfig.getContextPath())
-                                                                  .maxThreads(moduleConfig.getMaxThreads())
                                                                   .idleTimeOut(moduleConfig.getIdleTimeOut())
                                                                   .acceptQueueSize(
                                                                       moduleConfig.getAcceptQueueSize())
diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerConfig.java b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerConfig.java
@@ -31,7 +31,6 @@ public class SharingServerConfig extends ModuleConfig {
      */
     private int restPort;
     private String restContextPath;
-    private int restMaxThreads = 200;
     private long restIdleTimeOut = 30000;
     private int restAcceptQueueSize = 0;
 
diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModuleProvider.java b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModuleProvider.java
@@ -79,7 +79,6 @@ public void prepare() {
                 HTTPServerConfig.builder()
                                 .host(config.getRestHost()).port(config.getRestPort())
                                 .contextPath(config.getRestContextPath())
-                                .maxThreads(config.getRestMaxThreads())
                                 .acceptQueueSize(config.getRestAcceptQueueSize())
                                 .idleTimeOut(config.getRestIdleTimeOut())
                                 .maxRequestHeaderSize(config.getHttpMaxRequestHeaderSize()).build();
diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverConfig.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverConfig.java
@@ -31,7 +31,6 @@ public class ZipkinReceiverConfig extends ModuleConfig {
     private String restHost;
     private int restPort;
     private String restContextPath;
-    private int restMaxThreads = 200;
     private long restIdleTimeOut = 30000;
     private int restAcceptQueueSize = 0;
     private String searchableTracesTags = DEFAULT_SEARCHABLE_TAG_KEYS;
diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverProvider.java b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/ZipkinReceiverProvider.java
@@ -84,7 +84,6 @@ public void start() throws ServiceNotProvidedException, ModuleStartException {
                                                                 .port(config.getRestPort())
                                                                 .contextPath(config.getRestContextPath())
                                                                 .idleTimeOut(config.getRestIdleTimeOut())
-                                                                .maxThreads(config.getRestMaxThreads())
                                                                 .acceptQueueSize(config.getRestAcceptQueueSize())
                                                                 .build();
 
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
@@ -75,7 +75,6 @@ core:
     restHost: ${SW_CORE_REST_HOST:0.0.0.0}
     restPort: ${SW_CORE_REST_PORT:12800}
     restContextPath: ${SW_CORE_REST_CONTEXT_PATH:/}
-    restMaxThreads: ${SW_CORE_REST_MAX_THREADS:200}
     restIdleTimeOut: ${SW_CORE_REST_IDLE_TIMEOUT:30000}
     restAcceptQueueSize: ${SW_CORE_REST_QUEUE_SIZE:0}
     httpMaxRequestHeaderSize: ${SW_CORE_HTTP_MAX_REQUEST_HEADER_SIZE:8192}
@@ -249,7 +248,6 @@ receiver-sharing-server:
     restHost: ${SW_RECEIVER_SHARING_REST_HOST:0.0.0.0}
     restPort: ${SW_RECEIVER_SHARING_REST_PORT:0}
     restContextPath: ${SW_RECEIVER_SHARING_REST_CONTEXT_PATH:/}
-    restMaxThreads: ${SW_RECEIVER_SHARING_REST_MAX_THREADS:200}
     restIdleTimeOut: ${SW_RECEIVER_SHARING_REST_IDLE_TIMEOUT:30000}
     restAcceptQueueSize: ${SW_RECEIVER_SHARING_REST_QUEUE_SIZE:0}
     httpMaxRequestHeaderSize: ${SW_RECEIVER_SHARING_HTTP_MAX_REQUEST_HEADER_SIZE:8192}
@@ -385,7 +383,6 @@ receiver-zipkin:
     restHost: ${SW_RECEIVER_ZIPKIN_REST_HOST:0.0.0.0}
     restPort: ${SW_RECEIVER_ZIPKIN_REST_PORT:9411}
     restContextPath: ${SW_RECEIVER_ZIPKIN_REST_CONTEXT_PATH:/}
-    restMaxThreads: ${SW_RECEIVER_ZIPKIN_REST_MAX_THREADS:200}
     restIdleTimeOut: ${SW_RECEIVER_ZIPKIN_REST_IDLE_TIMEOUT:30000}
     restAcceptQueueSize: ${SW_RECEIVER_ZIPKIN_REST_QUEUE_SIZE:0}
     ## The below configs are for OAP collect zipkin trace from kafka
@@ -436,7 +433,6 @@ query-zipkin:
     restHost: ${SW_QUERY_ZIPKIN_REST_HOST:0.0.0.0}
     restPort: ${SW_QUERY_ZIPKIN_REST_PORT:9412}
     restContextPath: ${SW_QUERY_ZIPKIN_REST_CONTEXT_PATH:/zipkin}
-    restMaxThreads: ${SW_QUERY_ZIPKIN_REST_MAX_THREADS:200}
     restIdleTimeOut: ${SW_QUERY_ZIPKIN_REST_IDLE_TIMEOUT:30000}
     restAcceptQueueSize: ${SW_QUERY_ZIPKIN_REST_QUEUE_SIZE:0}
     # Default look back for traces and autocompleteTags, 1 day in millis
@@ -457,7 +453,6 @@ promql:
     restHost: ${SW_PROMQL_REST_HOST:0.0.0.0}
     restPort: ${SW_PROMQL_REST_PORT:9090}
     restContextPath: ${SW_PROMQL_REST_CONTEXT_PATH:/}
-    restMaxThreads: ${SW_PROMQL_REST_MAX_THREADS:200}
     restIdleTimeOut: ${SW_PROMQL_REST_IDLE_TIMEOUT:30000}
     restAcceptQueueSize: ${SW_PROMQL_REST_QUEUE_SIZE:0}
     # The below config is for the API buildInfo, set the value to mock the build info.
@@ -476,7 +471,6 @@ logql:
     restHost: ${SW_LOGQL_REST_HOST:0.0.0.0}
     restPort: ${SW_LOGQL_REST_PORT:3100}
     restContextPath: ${SW_LOGQL_REST_CONTEXT_PATH:/}
-    restMaxThreads: ${SW_LOGQL_REST_MAX_THREADS:200}
     restIdleTimeOut: ${SW_LOGQL_REST_IDLE_TIMEOUT:30000}
     restAcceptQueueSize: ${SW_LOGQL_REST_QUEUE_SIZE:0}
 
@@ -614,7 +608,6 @@ aws-firehose:
     host: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_HOST:0.0.0.0}
     port: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_PORT:12801}
     contextPath: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_CONTEXT_PATH:/}
-    maxThreads: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_MAX_THREADS:200}
     idleTimeOut: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_IDLE_TIME_OUT:30000}
     acceptQueueSize: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_ACCEPT_QUEUE_SIZE:0}
     maxRequestHeaderSize: ${SW_RECEIVER_AWS_FIREHOSE_HTTP_MAX_REQUEST_HEADER_SIZE:8192}
diff --git a/test/e2e-v2/cases/activemq/docker-compose.yml b/test/e2e-v2/cases/activemq/docker-compose.yml
@@ -54,7 +54,7 @@ services:
       - e2e
 
   amqexporter:
-    image: bitnami/jmx-exporter:0.20.0
+    image: bitnamilegacy/jmx-exporter:0.20.0
     hostname: amqexporter
     volumes:
       - ./config/amq/config.yaml:/opt/bitnami/jmx-exporter/example_configs/httpserver_sample_config.yml
diff --git a/test/e2e-v2/cases/exporter/kafka/docker-compose.yml b/test/e2e-v2/cases/exporter/kafka/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       retries: 120
 
   broker-a:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-a
     expose:
       - 9092
diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/Dockerfile b/test/e2e-v2/cases/kafka/kafka-monitoring/Dockerfile
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Use the Bitnami Kafka image as the base image
-FROM bitnami/kafka:2.4.1
+# Use the Kafka image as the base image
+FROM bitnamilegacy/kafka:2.4.1
 
 # Download the JMX Prometheus Java Agent and config file
 ADD https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.18.0/jmx_prometheus_javaagent-0.18.0.jar /etc/jmx_prometheus_javaagent-0.18.0.jar
diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml b/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml
@@ -89,7 +89,7 @@ services:
       retries: 120
 
   kafka-producer-perf-test:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     networks:
       - e2e
     depends_on:
@@ -102,7 +102,7 @@ services:
         kafka-producer-perf-test.sh --topic perftest --num-records 100000 --record-size 100 --throughput 500 --producer-props bootstrap.servers=broker1:9092,broker2:9093
 
   kafka-consumer-perf-test:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     networks:
       - e2e
     depends_on:
diff --git a/test/e2e-v2/cases/kafka/log/Dockerfile.fluentd b/test/e2e-v2/cases/kafka/log/Dockerfile.fluentd
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM bitnami/fluentd:1.12.1
+FROM bitnamilegacy/fluentd:1.12.1
 
 ## Install output kafka plugins
 RUN fluent-gem install fluent-plugin-kafka -v 0.19.3
diff --git a/test/e2e-v2/cases/kafka/log/docker-compose.yml b/test/e2e-v2/cases/kafka/log/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       retries: 120
 
   broker-a:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-a
     expose:
       - 9092
@@ -52,7 +52,7 @@ services:
       retries: 120
 
   broker-b:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-b
     expose:
       - 9092
diff --git a/test/e2e-v2/cases/kafka/meter/docker-compose.yml b/test/e2e-v2/cases/kafka/meter/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       retries: 120
 
   broker-a:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-a
     expose:
       - 9092
@@ -52,7 +52,7 @@ services:
       retries: 120
 
   broker-b:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-b
     expose:
       - 9092
diff --git a/test/e2e-v2/cases/kafka/profile/docker-compose.yml b/test/e2e-v2/cases/kafka/profile/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       retries: 120
 
   broker-a:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-a
     expose:
       - 9092
@@ -52,7 +52,7 @@ services:
       retries: 120
 
   broker-b:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-b
     expose:
       - 9092
diff --git a/test/e2e-v2/cases/kafka/simple-so11y/docker-compose.yml b/test/e2e-v2/cases/kafka/simple-so11y/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       retries: 120
 
   broker-a:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-a
     expose:
       - 9092
@@ -52,7 +52,7 @@ services:
       retries: 120
 
   broker-b:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-b
     expose:
       - 9092
diff --git a/test/e2e-v2/cases/python/docker-compose.yml b/test/e2e-v2/cases/python/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       retries: 120
 
   broker-a:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-a
     expose:
       - 9092
@@ -52,7 +52,7 @@ services:
       retries: 120
 
   broker-b:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-b
     expose:
       - 9092
diff --git a/test/e2e-v2/cases/virtual-mq/docker-compose.yml b/test/e2e-v2/cases/virtual-mq/docker-compose.yml
@@ -67,13 +67,13 @@ services:
     networks:
       e2e:
   zookeeper:
-    image: 'bitnami/zookeeper:latest'
+    image: 'zookeeper:3.9.3'
     environment:
       - ALLOW_ANONYMOUS_LOGIN=yes
     networks:
       e2e:
   kafka:
-    image: 'bitnami/kafka:2.4.1'
+    image: 'bitnamilegacy/kafka:2.4.1'
     environment:
       - KAFKA_BROKER_ID=1
       - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092
diff --git a/test/e2e-v2/cases/zipkin/kafka/docker-compose.yml b/test/e2e-v2/cases/zipkin/kafka/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       retries: 120
 
   broker-a:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-a
     expose:
       - 9092
@@ -52,7 +52,7 @@ services:
       retries: 120
 
   broker-b:
-    image: bitnami/kafka:2.4.1
+    image: bitnamilegacy/kafka:2.4.1
     hostname: broker-b
     expose:
       - 9092

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ public class LogQLConfig extends ModuleConfig {`
`28`	`28`	`private String restHost;`
`29`	`29`	`private int restPort;`
`30`	`30`	`private String restContextPath;`
`31`		`- private int restMaxThreads = 200;`
`32`	`31`	`private long restIdleTimeOut = 30000;`
`33`	`32`	`private int restAcceptQueueSize = 0;`
`34`	`33`	`}`