You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/04/01 18:01:44 UTC
[incubator-skywalking] branch jaeger-receiver created (now 9746bd3)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch jaeger-receiver
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
at 9746bd3 Make Jaeger receiver works in 12450 as default.
This branch includes the following new commits:
new 9746bd3 Make Jaeger receiver works in 12450 as default.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-skywalking] 01/01: Make Jaeger receiver works in 12450
as default.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch jaeger-receiver
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 9746bd350cafa61bba0137f8b9d34095ee859513
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Apr 1 11:01:34 2019 -0700
Make Jaeger receiver works in 12450 as default.
---
.../receiver/jaeger/JaegerReceiverConfig.java | 4 +++
.../receiver/jaeger/JaegerReceiverProvider.java | 37 +++++++++++++++++++---
.../src/main/resources/application.yml | 2 ++
3 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverConfig.java b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverConfig.java
index 275e964..780ea09 100644
--- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverConfig.java
+++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverConfig.java
@@ -24,5 +24,9 @@ import org.apache.skywalking.oap.server.library.module.ModuleConfig;
@Setter
@Getter
public class JaegerReceiverConfig extends ModuleConfig {
+ private String gRPCHost = null;
+ private int gRPCPort = -1;
+ private int maxConcurrentCallsPerConnection;
+ private int maxMessageSize;
private boolean registerJaegerEndpoint = true;
}
diff --git a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverProvider.java b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverProvider.java
index 8f49315..243605e 100644
--- a/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverProvider.java
+++ b/oap-server/server-receiver-plugin/jaeger-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/jaeger/JaegerReceiverProvider.java
@@ -18,8 +18,12 @@
package org.apache.skywalking.aop.server.receiver.jaeger;
+import java.util.Objects;
+import org.apache.logging.log4j.util.Strings;
import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister;
import org.apache.skywalking.oap.server.library.module.*;
+import org.apache.skywalking.oap.server.library.server.ServerException;
+import org.apache.skywalking.oap.server.library.server.grpc.GRPCServer;
import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerModule;
/**
@@ -27,6 +31,8 @@ import org.apache.skywalking.oap.server.receiver.sharing.server.SharingServerMod
*/
public class JaegerReceiverProvider extends ModuleProvider {
public static final String NAME = "default";
+ private JaegerReceiverConfig config;
+ private GRPCServer grpcServer = null;
@Override public String name() {
return NAME;
@@ -37,20 +43,41 @@ public class JaegerReceiverProvider extends ModuleProvider {
}
@Override public ModuleConfig createConfigBeanIfAbsent() {
- return null;
+ config = new JaegerReceiverConfig();
+ return config;
}
@Override public void prepare() throws ServiceNotProvidedException, ModuleStartException {
-
+ if (config.getGRPCPort() > 0) {
+ grpcServer = new GRPCServer(Strings.isBlank(config.getGRPCHost()) ? "0.0.0.0" : config.getGRPCHost(), config.getGRPCPort());
+ if (config.getMaxMessageSize() > 0) {
+ grpcServer.setMaxMessageSize(config.getMaxMessageSize());
+ }
+ if (config.getMaxConcurrentCallsPerConnection() > 0) {
+ grpcServer.setMaxConcurrentCallsPerConnection(config.getMaxConcurrentCallsPerConnection());
+ }
+ grpcServer.initialize();
+ }
}
@Override public void start() throws ServiceNotProvidedException, ModuleStartException {
- GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class);
- grpcHandlerRegister.addHandler(new JaegerGRPCHandler(getManager()));
+ if (Objects.nonNull(grpcServer)) {
+ grpcServer.addHandler(new JaegerGRPCHandler(getManager()));
+ } else {
+ GRPCHandlerRegister grpcHandlerRegister = getManager().find(SharingServerModule.NAME).provider().getService(GRPCHandlerRegister.class);
+ grpcHandlerRegister.addHandler(new JaegerGRPCHandler(getManager()));
+ }
+
}
@Override public void notifyAfterCompleted() throws ServiceNotProvidedException, ModuleStartException {
-
+ try {
+ if (Objects.nonNull(grpcServer)) {
+ grpcServer.start();
+ }
+ } catch (ServerException e) {
+ throw new ModuleStartException(e.getMessage(), e);
+ }
}
@Override public String[] requiredModules() {
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index 0b575c7..4e4e796 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -105,6 +105,8 @@ envoy-metric:
# contextPath: ${SW_RECEIVER_ZIPKIN_CONTEXT_PATH:/}
receiver_jaeger:
default:
+ gRPCHost: ${SW_RECEIVER_JAEGER_HOST:0.0.0.0}
+ gRPCPort: ${SW_RECEIVER_JAEGER_PORT:14250}
query:
graphql:
path: ${SW_QUERY_GRAPHQL_PATH:/graphql}