Further remove jetty references and config (#8974)
This commit is contained in:
Superskyyy
GitHub
parent
12ba7aa533
commit
211efc0562
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 |
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue