This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 61e84e53f3 HTTP Server: use the default shared thread pool rather than
create a new pool for each server. Remove the `MAX_THREADS` from each server
config. (#13445)
61e84e53f3 is described below
commit 61e84e53f30272c64faff36387b05583a3709954
Author: Wan Kai <wankai...@foxmail.com>
AuthorDate: Fri Aug 29 18:17:58 2025 +0800
HTTP Server: use the default shared thread pool rather than create a new
pool for each server. Remove the `MAX_THREADS` from each server config. (#13445)
---
docs/en/changes/changes.md | 20 ++++++++++++++++++++
docs/en/setup/backend/configuration-vocabulary.md | 6 ------
.../oap/server/core/CoreModuleProvider.java | 1 -
.../oap/server/library/server/http/HTTPServer.java | 2 --
.../server/library/server/http/HTTPServerConfig.java | 2 --
.../skywalking/oap/query/logql/LogQLConfig.java | 1 -
.../skywalking/oap/query/logql/LogQLProvider.java | 1 -
.../skywalking/oap/query/promql/PromQLConfig.java | 1 -
.../skywalking/oap/query/promql/PromQLProvider.java | 1 -
.../oap/query/zipkin/ZipkinQueryConfig.java | 1 -
.../oap/query/zipkin/ZipkinQueryProvider.java | 1 -
.../firehose/AWSFirehoseReceiverModuleConfig.java | 1 -
.../firehose/AWSFirehoseReceiverModuleProvider.java | 1 -
.../receiver/sharing/server/SharingServerConfig.java | 1 -
.../sharing/server/SharingServerModuleProvider.java | 1 -
.../server/receiver/zipkin/ZipkinReceiverConfig.java | 1 -
.../receiver/zipkin/ZipkinReceiverProvider.java | 1 -
.../src/main/resources/application.yml | 7 -------
test/e2e-v2/cases/activemq/docker-compose.yml | 2 +-
test/e2e-v2/cases/exporter/kafka/docker-compose.yml | 2 +-
test/e2e-v2/cases/kafka/kafka-monitoring/Dockerfile | 4 ++--
.../cases/kafka/kafka-monitoring/docker-compose.yml | 4 ++--
test/e2e-v2/cases/kafka/log/Dockerfile.fluentd | 2 +-
test/e2e-v2/cases/kafka/log/docker-compose.yml | 4 ++--
test/e2e-v2/cases/kafka/meter/docker-compose.yml | 4 ++--
test/e2e-v2/cases/kafka/profile/docker-compose.yml | 4 ++--
.../cases/kafka/simple-so11y/docker-compose.yml | 4 ++--
test/e2e-v2/cases/python/docker-compose.yml | 4 ++--
test/e2e-v2/cases/virtual-mq/docker-compose.yml | 4 ++--
test/e2e-v2/cases/zipkin/kafka/docker-compose.yml | 4 ++--
30 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index f6a91c26dc..6ffa15855b 100644
--- 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
index ccf05ddf52..8bfa8fa59d 100644
--- a/docs/en/setup/backend/configuration-vocabulary.md
+++ b/docs/en/setup/backend/configuration-vocabulary.md
@@ -12,7 +12,6 @@ It divided into several modules, each of which has its own
settings. The followi
| - | - | restHost
| Binding IP of RESTful
services. Services include GraphQL query and HTTP data report.
[...]
| - | - | restPort
| Binding port of RESTful
services.
[...]
| - | - | restContextPath
| Web context path of
RESTful services.
[...]
-| - | - | restMaxThreads
| Maximum thread number
of RESTful services.
[...]
| - | - | restIdleTimeOut
| Connector idle timeout
of RESTful services (in milliseconds).
[...]
| - | - | restAcceptQueueSize
| ServerSocketChannel
Backlog of RESTful services.
[...]
| - | - | httpMaxRequestHeaderSize
| Maximum request header
size accepted.
[...]
@@ -153,7 +152,6 @@ It divided into several modules, each of which has its own
settings. The followi
| - | - | restHost
| Binding IP of RESTful
services. Services include GraphQL query and HTTP data report.
[...]
| - | - | restPort
| Binding port of RESTful
services.
[...]
| - | - | restContextPath
| Web context path of
RESTful services.
[...]
-| - | - | restMaxThreads
| Maximum thread number
of RESTful services.
[...]
| - | - | restIdleTimeOut
| Connector idle timeout
of RESTful services (in milliseconds).
[...]
| - | - | restAcceptQueueSize
| ServerSocketChannel
backlog of RESTful services.
[...]
| - | - | httpMaxRequestHeaderSize
| Maximum request header
size accepted.
[...]
@@ -205,7 +203,6 @@ It divided into several modules, each of which has its own
settings. The followi
| - | - | restHost
| Binding IP of RESTful
services.
[...]
| - | - | restPort
| Binding port of RESTful
services.
[...]
| - | - | restContextPath
| Web context path of
RESTful services.
[...]
-| - | - | restMaxThreads
| Maximum thread number
of RESTful services.
[...]
| - | - | restIdleTimeOut
| Connector idle timeout
of RESTful services (in milliseconds).
[...]
| - | - | restAcceptQueueSize
| Maximum request header
size accepted.
[...]
| - | - | enableKafkaCollector
| Enable Kafka Collector.
[...]
@@ -254,7 +251,6 @@ It divided into several modules, each of which has its own
settings. The followi
| - | - | restHost
| Binding IP of RESTful
services.
[...]
| - | - | restPort
| Binding port of RESTful
services.
[...]
| - | - | restContextPath
| Web context path of
RESTful services.
[...]
-| - | - | restMaxThreads
| Maximum thread number
of RESTful services.
[...]
| - | - | restIdleTimeOut
| Connector idle timeout
of RESTful services (in milliseconds).
[...]
| - | - | restAcceptQueueSize
| Maximum request header
size accepted.
[...]
| - | - | lookback
| Default look back for
traces and autocompleteTags, 1 day in millis
[...]
@@ -265,7 +261,6 @@ It divided into several modules, each of which has its own
settings. The followi
| - | - | restHost
| Binding IP of RESTful
services.
[...]
| - | - | restPort
| Binding port of RESTful
services.
[...]
| - | - | restContextPath
| Web context path of
RESTful services.
[...]
-| - | - | restMaxThreads
| Maximum thread number
of RESTful services.
[...]
| - | - | restIdleTimeOut
| Connector idle timeout
of RESTful services (in milliseconds).
[...]
| - | - | restAcceptQueueSize
| Maximum request header
size accepted.
[...]
| - | - | buildInfoVersion
| Mock version for API
buildInfo
[...]
@@ -332,7 +327,6 @@ It divided into several modules, each of which has its own
settings. The followi
| aws-firehose-receiver | default | host
| Binding IP of HTTP
server
[...]
| - | - | port
| Binding port of HTTP
server
[...]
| - | - | contextPath
| Context path of HTTP
server
[...]
-| - | - | maxThreads
| Max Thread number of
HTTP server
[...]
| - | - | idleTimeOut
| Idle timeout of a
connection for keep-alive.
[...]
| - | - | acceptQueueSize
| Maximum allowed number
of open connections
[...]
| - | - | maxRequestHeaderSize
| Maximum length of all
headers in an HTTP/1 response
[...]
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
index a9963f6545..ad9f7c4b61 100755
---
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 class CoreModuleProvider extends ModuleProvider {
.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
index 3f4410e779..0ab8b8925f 100644
---
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.ServerBuilder;
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 class HTTPServer implements Server {
.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
index 2354815388..2464191365 100644
---
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
index f2be0ed6f6..902c9367d7 100644
---
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
index ea1e12b103..b23cd7d84e 100644
---
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 class LogQLProvider extends ModuleProvider {
.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
index 36c9399cbf..c06ebec030 100644
---
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
index f25bc5dd05..a41ce71a89 100644
---
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 class PromQLProvider extends ModuleProvider {
.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
index bfea4625b2..987a4daf66 100644
---
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
index 91841adb6d..d5ab3a6be1 100644
---
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 class ZipkinQueryProvider extends ModuleProvider {
.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
index 76cb60aa17..38a73956fc 100644
---
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
index 1b47e17e28..3ab6608e20 100644
---
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 class AWSFirehoseReceiverModuleProvider extends
ModuleProvider {
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
index 06ae12fb26..b349856348 100644
---
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
index f1c9c4c166..933e095207 100644
---
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 class SharingServerModuleProvider extends
ModuleProvider {
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
index 00d5276254..8269bbe3d3 100644
---
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
index 7ba0e1bbb5..441f9faaec 100644
---
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 class ZipkinReceiverProvider extends ModuleProvider {
.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
index 30c7f4d2fa..54dfe94a96 100644
--- 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
index ddaedefc03..2b58f5eff5 100644
--- 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
index 98f5d34c35..44b4afc2db 100644
--- 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
index 5f9ee334a3..81644310e2 100644
--- 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
index c7768e565e..f39f72a8d0 100644
--- 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
index e47cedff8f..0865a1ad27 100644
--- 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
index d29ea70ee7..814f8a53d2 100644
--- 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
index b20dbfccf3..49245d70c5 100644
--- 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
index 3eb74ad1cd..c2bb171bc4 100644
--- 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
index 77a3a180e1..fe59b642f2 100644
--- 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
index faed4178ac..858a90f75a 100644
--- 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
index 89121e693e..accb4d0c81 100644
--- 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
index bae4566423..bd37518736 100644
--- 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
