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 211efc0562 Further remove jetty references and config (#8974) 211efc0562 is described below commit 211efc0562a8151bef44c28ade7cc57f456ac34f Author: Superskyyy <supersk...@outlook.com> AuthorDate: Fri Apr 29 02:32:44 2022 -0400 Further remove jetty references and config (#8974) --- dist-material/log4j2.xml | 1 - docs/en/setup/backend/backend-expose.md | 9 ++++----- docs/en/setup/backend/backend-setup.md | 4 ++-- docs/en/setup/backend/configuration-vocabulary.md | 3 +-- docs/en/setup/backend/zipkin-trace.md | 1 - docs/en/setup/envoy/examples/metrics/log4j2.xml | 1 - .../oap/server/library/server/http/HTTPServerConfig.java | 2 -- .../oap/server/receiver/sharing/server/SharingServerConfig.java | 2 +- .../oap/server/receiver/sharing/server/SharingServerModule.java | 4 ++-- .../oap/server/receiver/zipkin/ZipkinReceiverConfig.java | 1 - .../oap/server/receiver/zipkin/ZipkinReceiverProvider.java | 2 -- oap-server/server-starter/src/main/resources/application.yml | 1 - oap-server/server-starter/src/main/resources/log4j2.xml | 1 - .../data-generator/src/main/resources/application.yml | 8 +++----- test/e2e-v2/cases/istio/log4j2.xml | 1 - test/e2e-v2/script/prepare/setup-oap/log4j2.xml | 1 - 16 files changed, 13 insertions(+), 29 deletions(-) diff --git a/dist-material/log4j2.xml b/dist-material/log4j2.xml index 5d09ef2230..773099b798 100644 --- a/dist-material/log4j2.xml +++ b/dist-material/log4j2.xml @@ -34,7 +34,6 @@ </RollingFile> </Appenders> <Loggers> - <logger name="org.eclipse.jetty" level="INFO"/> <logger name="org.apache.zookeeper" level="INFO"/> <logger name="io.grpc.netty" level="INFO"/> <Root level="info"> diff --git a/docs/en/setup/backend/backend-expose.md b/docs/en/setup/backend/backend-expose.md index 8fc0ca5f0c..49345249fd 100644 --- a/docs/en/setup/backend/backend-expose.md +++ b/docs/en/setup/backend/backend-expose.md @@ -10,14 +10,13 @@ requests. receiver-sharing-server: selector: ${SW_RECEIVER_SHARING_SERVER:default} default: - # For Jetty server + # For REST 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:/} - restMinThreads: ${SW_RECEIVER_SHARING_JETTY_MIN_THREADS:1} - restMaxThreads: ${SW_RECEIVER_SHARING_JETTY_MAX_THREADS:200} - restIdleTimeOut: ${SW_RECEIVER_SHARING_JETTY_IDLE_TIMEOUT:30000} - restAcceptQueueSize: ${SW_RECEIVER_SHARING_JETTY_QUEUE_SIZE:0} + 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} # For gRPC server gRPCHost: ${SW_RECEIVER_GRPC_HOST:0.0.0.0} diff --git a/docs/en/setup/backend/backend-setup.md b/docs/en/setup/backend/backend-setup.md index 22b47aca12..9c5012924f 100755 --- a/docs/en/setup/backend/backend-setup.md +++ b/docs/en/setup/backend/backend-setup.md @@ -34,8 +34,8 @@ Before deploying Skywalking in your distributed environment, you should learn ab <img src="https://skywalking.apache.org/doc-graph/communication-net.png"/> -- Most native agents and probes, including language-based or mesh probes, use gRPC service (`core/default/gRPC*` in `application.yml`) to report data to the backend. Also, the Jetty service is supported in JSON format. -- UI uses GraphQL (HTTP) query to access the backend, also in Jetty service (`core/default/rest*` in `application.yml`). +- Most native agents and probes, including language-based or mesh probes, use gRPC service (`core/default/gRPC*` in `application.yml`) to report data to the backend. Also, the REST service is supported in JSON format. +- UI uses GraphQL (HTTP) query to access the backend, also in REST service (`core/default/rest*` in `application.yml`). ## Startup script diff --git a/docs/en/setup/backend/configuration-vocabulary.md b/docs/en/setup/backend/configuration-vocabulary.md index cf50693651..afbaa546c6 100644 --- a/docs/en/setup/backend/configuration-vocabulary.md +++ b/docs/en/setup/backend/configuration-vocabulary.md @@ -205,8 +205,7 @@ core|default|role|Option values: `Mixed/Receiver/Aggregator`. **Receiver** mode | - | - | restPort | Binding port of RESTful services. | SW_RECEIVER_ZIPKIN_REST_PORT| 9411 | | - | - | restContextPath| Web context path of RESTful services. | SW_RECEIVER_ZIPKIN_REST_CONTEXT_PATH| / | | - | - | restMaxThreads| Maximum thread number of RESTful services. | SW_RECEIVER_ZIPKIN_REST_MAX_THREADS| 200 | -| - | - | restIdleTimeOut| Connector idle timeout of RESTful services (in milliseconds). | SW_RECEIVER_ZIPKIN_REST_IDLE_TIMEOUT| 30000 | -| - | - | restAcceptorPriorityDelta| ServerSocketChannel backlog of RESTful services. | SW_RECEIVER_ZIPKIN_REST_DELTA| 0 | +| - | - | restIdleTimeOut| Connector idle timeout of RESTful services (in milliseconds). | SW_RECEIVER_ZIPKIN_REST_IDLE_TIMEOUT| 30000 | | | - | - | restAcceptQueueSize| Maximum request header size accepted. | SW_RECEIVER_ZIPKIN_REST_QUEUE_SIZE| 0 | | - | - | instanceNameRule| Get the instance name from these tags. | SW_RECEIVER_ZIPKIN_INSTANCE_NAME_RULE| [spring.instance_id,node_id] | | - | - | searchableTracesTags| Defines a set of span tag keys which are searchable. Multiple values are separated by commas. | SW_ZIPKIN_SEARCHABLE_TAG_KEYS| http.method | diff --git a/docs/en/setup/backend/zipkin-trace.md b/docs/en/setup/backend/zipkin-trace.md index 6237e6ca29..68cff53d78 100644 --- a/docs/en/setup/backend/zipkin-trace.md +++ b/docs/en/setup/backend/zipkin-trace.md @@ -14,7 +14,6 @@ receiver-zipkin: restContextPath: ${SW_RECEIVER_ZIPKIN_REST_CONTEXT_PATH:/} restMaxThreads: ${SW_RECEIVER_ZIPKIN_REST_MAX_THREADS:200} restIdleTimeOut: ${SW_RECEIVER_ZIPKIN_REST_IDLE_TIMEOUT:30000} - restAcceptorPriorityDelta: ${SW_RECEIVER_ZIPKIN_REST_DELTA:0} restAcceptQueueSize: ${SW_RECEIVER_ZIPKIN_REST_QUEUE_SIZE:0} instanceNameRule: ${SW_RECEIVER_ZIPKIN_INSTANCE_NAME_RULE:[spring.instance_id,node_id]} searchableTracesTags: ${SW_ZIPKIN_SEARCHABLE_TAG_KEYS:http.method} diff --git a/docs/en/setup/envoy/examples/metrics/log4j2.xml b/docs/en/setup/envoy/examples/metrics/log4j2.xml index 9525011573..55dd9fe657 100644 --- a/docs/en/setup/envoy/examples/metrics/log4j2.xml +++ b/docs/en/setup/envoy/examples/metrics/log4j2.xml @@ -24,7 +24,6 @@ </Console> </Appenders> <Loggers> - <logger name="org.eclipse.jetty" level="INFO"/> <logger name="org.apache.zookeeper" level="INFO"/> <logger name="io.grpc.netty" level="INFO"/> <logger name="org.apache.skywalking.oap.server.receiver.istio.telemetry" level="DEBUG"/> 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 c682204cf8..0e7f314497 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 @@ -36,8 +36,6 @@ public class HTTPServerConfig { @Builder.Default private long idleTimeOut = 30000; @Builder.Default - private int acceptorPriorityDelta = 0; - @Builder.Default private int acceptQueueSize = 0; @Builder.Default private int maxRequestHeaderSize = 8192; 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 1d886496aa..44e45db7e3 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 @@ -27,7 +27,7 @@ import org.apache.skywalking.oap.server.library.module.ModuleConfig; public class SharingServerConfig extends ModuleConfig { private String restHost; /** - * Only setting the real port(not 0) makes the jetty server online. + * Only setting the real port(not 0) makes the Armeria server online. */ private int restPort; private String restContextPath; diff --git a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModule.java b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModule.java index 35caeb29c8..8805c43b68 100644 --- a/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModule.java +++ b/oap-server/server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/SharingServerModule.java @@ -23,8 +23,8 @@ import org.apache.skywalking.oap.server.core.server.HTTPHandlerRegister; import org.apache.skywalking.oap.server.library.module.ModuleDefine; /** - * Sharing server is an independent gRPC and Jetty servers provided for all receiver modules. In default, this module - * would not be activated unless the user active explicitly. It only delegates the core gRPC and Jetty servers. + * Sharing server is an independent gRPC and REST servers provided for all receiver modules. In default, this module + * would not be activated unless the user active explicitly. It only delegates the core gRPC and REST servers. * * Once it is activated, provides separated servers, then all receivers use these to accept outside requests. Typical, * this is activated to avoid the ip, port and thread pool sharing between receiver and internal traffics. For security 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 120f8b731b..d1a3f4f20f 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 @@ -34,7 +34,6 @@ public class ZipkinReceiverConfig extends ModuleConfig { private String restContextPath; private int restMaxThreads = 200; private long restIdleTimeOut = 30000; - private int restAcceptorPriorityDelta = 0; private int restAcceptQueueSize = 0; private List<String> instanceNameRule = new ArrayList<>(); 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 37b4668a2f..6c5d001616 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 @@ -67,8 +67,6 @@ public class ZipkinReceiverProvider extends ModuleProvider { .port(config.getRestPort()) .contextPath(config.getRestContextPath()) .idleTimeOut(config.getRestIdleTimeOut()) - .acceptorPriorityDelta( - config.getRestAcceptorPriorityDelta()) .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 14b385e575..d8430650b7 100755 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@ -388,7 +388,6 @@ receiver-zipkin: restContextPath: ${SW_RECEIVER_ZIPKIN_REST_CONTEXT_PATH:/} restMaxThreads: ${SW_RECEIVER_ZIPKIN_REST_MAX_THREADS:200} restIdleTimeOut: ${SW_RECEIVER_ZIPKIN_REST_IDLE_TIMEOUT:30000} - restAcceptorPriorityDelta: ${SW_RECEIVER_ZIPKIN_REST_DELTA:0} restAcceptQueueSize: ${SW_RECEIVER_ZIPKIN_REST_QUEUE_SIZE:0} instanceNameRule: ${SW_RECEIVER_ZIPKIN_INSTANCE_NAME_RULE:[spring.instance_id,node_id]} searchableTracesTags: ${SW_ZIPKIN_SEARCHABLE_TAG_KEYS:http.method} diff --git a/oap-server/server-starter/src/main/resources/log4j2.xml b/oap-server/server-starter/src/main/resources/log4j2.xml index 99f56049ef..6cbaa5c9dd 100644 --- a/oap-server/server-starter/src/main/resources/log4j2.xml +++ b/oap-server/server-starter/src/main/resources/log4j2.xml @@ -28,7 +28,6 @@ </Console> </Appenders> <Loggers> - <logger name="org.eclipse.jetty" level="INFO"/> <logger name="org.apache.zookeeper" level="INFO"/> <logger name="io.grpc.netty" level="INFO"/> <logger name="io.netty" level="INFO"/> diff --git a/oap-server/server-tools/data-generator/src/main/resources/application.yml b/oap-server/server-tools/data-generator/src/main/resources/application.yml index 60057f1e17..8c5ebff200 100755 --- a/oap-server/server-tools/data-generator/src/main/resources/application.yml +++ b/oap-server/server-tools/data-generator/src/main/resources/application.yml @@ -26,11 +26,9 @@ core: restHost: ${SW_CORE_REST_HOST:0.0.0.0} restPort: ${SW_CORE_REST_PORT:12800} restContextPath: ${SW_CORE_REST_CONTEXT_PATH:/} - restMinThreads: ${SW_CORE_REST_JETTY_MIN_THREADS:1} - restMaxThreads: ${SW_CORE_REST_JETTY_MAX_THREADS:200} - restIdleTimeOut: ${SW_CORE_REST_JETTY_IDLE_TIMEOUT:30000} - restAcceptorPriorityDelta: ${SW_CORE_REST_JETTY_DELTA:0} - restAcceptQueueSize: ${SW_CORE_REST_JETTY_QUEUE_SIZE:0} + 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} gRPCHost: ${SW_CORE_GRPC_HOST:0.0.0.0} gRPCPort: ${SW_CORE_GRPC_PORT:11800} diff --git a/test/e2e-v2/cases/istio/log4j2.xml b/test/e2e-v2/cases/istio/log4j2.xml index 8b73ab17b2..9e132a8d8b 100644 --- a/test/e2e-v2/cases/istio/log4j2.xml +++ b/test/e2e-v2/cases/istio/log4j2.xml @@ -24,7 +24,6 @@ </Console> </Appenders> <Loggers> - <logger name="org.eclipse.jetty" level="INFO"/> <logger name="org.apache.zookeeper" level="INFO"/> <logger name="io.grpc.netty" level="INFO"/> <logger name="org.apache.skywalking.oap.meter.analyzer" level="DEBUG"/> diff --git a/test/e2e-v2/script/prepare/setup-oap/log4j2.xml b/test/e2e-v2/script/prepare/setup-oap/log4j2.xml index 2758ba6d4f..f7c03f5f56 100644 --- a/test/e2e-v2/script/prepare/setup-oap/log4j2.xml +++ b/test/e2e-v2/script/prepare/setup-oap/log4j2.xml @@ -24,7 +24,6 @@ </Console> </Appenders> <Loggers> - <logger name="org.eclipse.jetty" level="INFO"/> <logger name="org.apache.zookeeper" level="INFO"/> <logger name="io.grpc.netty" level="INFO"/> <logger name="org.apache.skywalking.oap.meter.analyzer" level="DEBUG"/>