This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 6.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/6.0 by this push:
new 8c3fb27 Init codes of service mesh probe receiver.
8c3fb27 is described below
commit 8c3fb27e0eaed35c6771cbe6e1caeb2fccb60578
Author: Wu Sheng <[email protected]>
AuthorDate: Wed Jul 25 16:09:17 2018 +0800
Init codes of service mesh probe receiver.
---
apm-protocol/apm-network/src/main/proto | 2 +-
.../mesh-receiver-provider/pom.xml | 5 ++
.../receiver/mesh/provider/MeshGRPCHandler.java | 53 ++++++++++++++++++++++
.../mesh/provider/MeshReceiverProvider.java | 7 ++-
.../server-starter/src/main/resources/log4j2.xml | 6 +--
5 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/apm-protocol/apm-network/src/main/proto
b/apm-protocol/apm-network/src/main/proto
index 996e6a4..75c7418 160000
--- a/apm-protocol/apm-network/src/main/proto
+++ b/apm-protocol/apm-network/src/main/proto
@@ -1 +1 @@
-Subproject commit 996e6a42fffff2d8cb689c232ba8334d8ab85077
+Subproject commit 75c74186a1548657013a299f388e6e8b7b4b5251
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/pom.xml
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/pom.xml
index 185b227..3119c3b 100644
---
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/pom.xml
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/pom.xml
@@ -34,6 +34,11 @@
<artifactId>mesh-receiver-module</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.skywalking</groupId>
+ <artifactId>server-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/provider/MeshGRPCHandler.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/provider/MeshGRPCHandler.java
new file mode 100644
index 0000000..e9764ce
--- /dev/null
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/provider/MeshGRPCHandler.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.aop.server.receiver.mesh.provider;
+
+import io.grpc.stub.StreamObserver;
+import org.apache.skywalking.apm.network.servicemesh.MeshProbeDownstream;
+import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric;
+import
org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetricServiceGrpc;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MeshGRPCHandler extends
ServiceMeshMetricServiceGrpc.ServiceMeshMetricServiceImplBase {
+ private static final Logger logger =
LoggerFactory.getLogger(MeshGRPCHandler.class);
+
+ @Override
+ public StreamObserver<ServiceMeshMetric>
collect(StreamObserver<MeshProbeDownstream> responseObserver) {
+ return new StreamObserver<ServiceMeshMetric>() {
+ @Override public void onNext(ServiceMeshMetric metric) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Received mesh metric: {}", metric);
+ }
+
+
+ }
+
+ @Override public void onError(Throwable throwable) {
+ logger.error(throwable.getMessage(), throwable);
+ responseObserver.onCompleted();
+ }
+
+ @Override public void onCompleted() {
+
responseObserver.onNext(MeshProbeDownstream.newBuilder().build());
+ responseObserver.onCompleted();
+ }
+ };
+ }
+}
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/provider/MeshReceiverProvider.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/provider/MeshReceiverProvider.java
index d4dcd3c..cedb1b4 100644
---
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/provider/MeshReceiverProvider.java
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/mesh-receiver-provider/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/provider/MeshReceiverProvider.java
@@ -19,6 +19,8 @@
package org.apache.skywalking.aop.server.receiver.mesh.provider;
import
org.apache.skywalking.aop.server.receiver.mesh.module.MeshReceiverModule;
+import org.apache.skywalking.oap.server.core.CoreModule;
+import org.apache.skywalking.oap.server.core.server.GRPCHandlerRegister;
import org.apache.skywalking.oap.server.library.module.ModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleDefine;
import org.apache.skywalking.oap.server.library.module.ModuleProvider;
@@ -39,10 +41,11 @@ public class MeshReceiverProvider extends ModuleProvider {
}
@Override public void prepare() throws ServiceNotProvidedException,
ModuleStartException {
-
}
@Override public void start() throws ServiceNotProvidedException,
ModuleStartException {
+ GRPCHandlerRegister service =
getManager().find(CoreModule.NAME).getService(GRPCHandlerRegister.class);
+ service.addHandler(new MeshGRPCHandler());
}
@Override public void notifyAfterCompleted() throws
ServiceNotProvidedException, ModuleStartException {
@@ -50,6 +53,6 @@ public class MeshReceiverProvider extends ModuleProvider {
}
@Override public String[] requiredModules() {
- return new String[0];
+ return new String[]{CoreModule.NAME};
}
}
diff --git a/oap-server/server-starter/src/main/resources/log4j2.xml
b/oap-server/server-starter/src/main/resources/log4j2.xml
index 6697ebf..0003b82 100644
--- a/oap-server/server-starter/src/main/resources/log4j2.xml
+++ b/oap-server/server-starter/src/main/resources/log4j2.xml
@@ -17,7 +17,7 @@
~
-->
-<Configuration status="info">
+<Configuration status="INFO">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x
- %m%n"/>
@@ -27,10 +27,8 @@
<logger name="org.eclipse.jetty" level="INFO"/>
<logger name="org.apache.zookeeper" level="INFO"/>
<logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
- <logger
name="org.apache.skywalking.apm.collector.agent.grpc.provider.handler.JVMMetricsServiceHandler"
level="INFO"/>
- <logger
name="org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer"
level="INFO"/>
<logger name="io.grpc.netty" level="INFO"/>
- <Root level="info">
+ <Root level="INFO">
<AppenderRef ref="Console"/>
</Root>
</Loggers>
