This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch mesh-source-dispatch
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/mesh-source-dispatch by this
push:
new 306ba07 Finish the skeleton of mesh receiver.
306ba07 is described below
commit 306ba074b7cf97f32f1faef12db8c89fca1a5209
Author: Wu Sheng <[email protected]>
AuthorDate: Thu Sep 20 17:40:36 2018 +0800
Finish the skeleton of mesh receiver.
---
.../apache/skywalking/oap/server/core/Const.java | 6 +-
.../oap/server/core/query/TopologyBuilder.java | 6 +-
.../pom.xml | 5 +-
.../provider/IstioTelemetryGRPCHandler.java | 6 +-
.../provider/IstioTelemetryReceiverProvider.java | 3 +-
.../skywalking-mesh-receiver-plugin/pom.xml | 4 -
.../server/receiver/mesh/CoreRegisterLinker.java | 61 ++++++++++
.../receiver/mesh/MeshDataBufferFileCache.java | 77 +++++++++++++
.../aop/server/receiver/mesh/MeshGRPCHandler.java | 2 +
.../aop/server/receiver/mesh/MeshModuleConfig.java | 33 ++++++
.../server/receiver/mesh/MeshReceiverProvider.java | 18 ++-
.../mesh/ServiceMeshMetricDataDecorator.java | 124 +++++++++++++++++++++
.../receiver/mesh/TelemetryDataDispatcher.java | 39 +++++++
.../listener/endpoint/MultiScopesSpanListener.java | 10 +-
14 files changed, 373 insertions(+), 21 deletions(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/Const.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/Const.java
index fbad921..4324835 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/Const.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/Const.java
@@ -26,9 +26,9 @@ public class Const {
public static final String ID_SPLIT = "_";
public static final String KEY_VALUE_SPLIT = ",";
public static final String ARRAY_SPLIT = "|";
- public static final int NONE_SERVICE_ID = 1;
- public static final int NONE_INSTANCE_ID = 1;
- public static final int NONE_ENDPOINT_ID = 1;
+ public static final int USER_SERVICE_ID = 1;
+ public static final int USER_INSTANCE_ID = 1;
+ public static final int USER_ENDPOINT_ID = 1;
public static final String NONE_ENDPOINT_NAME = "None";
public static final String USER_CODE = "User";
public static final String SEGMENT_SPAN_SPLIT = "S";
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
index 7be38bd..a933a50 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
@@ -95,7 +95,7 @@ class TopologyBuilder {
ServiceInventory source =
serviceInventoryCache.get(serverCall.getSource());
ServiceInventory target =
serviceInventoryCache.get(serverCall.getTarget());
- if (source.getSequence() == Const.NONE_SERVICE_ID) {
+ if (source.getSequence() == Const.USER_SERVICE_ID) {
if (!nodeIds.contains(source.getSequence())) {
Node visualUserNode = new Node();
visualUserNode.setId(source.getSequence());
@@ -122,7 +122,7 @@ class TopologyBuilder {
call.setTarget(target.getSequence());
call.setId(serverCall.getId());
- if (source.getSequence() == Const.NONE_SERVICE_ID) {
+ if (source.getSequence() == Const.USER_SERVICE_ID) {
call.setCallType(Const.EMPTY_STRING);
} else {
call.setCallType(nodeCompMap.get(serverCall.getTarget()));
@@ -147,7 +147,7 @@ class TopologyBuilder {
serviceRelationServerCalls.forEach(serverCall -> {
ServiceInventory source =
serviceInventoryCache.get(serverCall.getSource());
- if (BooleanUtils.valueToBoolean(source.getIsAddress()) ||
source.getSequence() == Const.NONE_SERVICE_ID) {
+ if (BooleanUtils.valueToBoolean(source.getIsAddress()) ||
source.getSequence() == Const.USER_SERVICE_ID) {
filteredCalls.add(serverCall);
}
});
diff --git
a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml
b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml
index ea72429..786b6d6 100644
---
a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml
+++
b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml
@@ -32,8 +32,9 @@
<dependencies>
<dependency>
- <groupId></groupId>
- <artifactId>mesh</artifactId>
+ <groupId>org.apache.skywalking</groupId>
+ <artifactId>skywalking-mesh-receiver-plugin</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git
a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java
b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java
index c21a5dd..4c92920 100644
---
a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java
+++
b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java
@@ -27,6 +27,7 @@ import io.istio.api.policy.v1beta1.TypeProto;
import java.time.Duration;
import java.time.Instant;
import java.util.Map;
+import org.apache.skywalking.aop.server.receiver.mesh.TelemetryDataDispatcher;
import org.apache.skywalking.apm.network.common.DetectPoint;
import org.apache.skywalking.apm.network.servicemesh.Protocol;
import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric;
@@ -58,7 +59,7 @@ public class IstioTelemetryGRPCHandler extends
HandleMetricServiceGrpc.HandleMet
String endpoint;
boolean status = true;
Protocol netProtocol;
- if (protocol.equals("http") || protocol.equals("https")) {
+ if (protocol.equals("http") || protocol.equals("https") ||
requestScheme.equals("http") || requestScheme.equals("https")) {
endpoint = requestScheme + "/" + requestMethod + "/" +
requestPath;
status = responseCode >= 200 && responseCode < 400;
netProtocol = Protocol.HTTP;
@@ -83,6 +84,9 @@ public class IstioTelemetryGRPCHandler extends
HandleMetricServiceGrpc.HandleMet
.setDestServiceInstance(string(i,
"destinationUID")).setEndpoint(endpoint).setLatency(latency)
.setResponseCode(Math.toIntExact(responseCode)).setStatus(status).setProtocol(netProtocol).setDetectPoint(detectPoint).build();
logger.debug("Transformed metric {}", metric);
+
+ TelemetryDataDispatcher dispatcher = new TelemetryDataDispatcher();
+ dispatcher.process(metric);
}
responseObserver.onNext(ReportProto.ReportResult.newBuilder().build());
responseObserver.onCompleted();
diff --git
a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java
b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java
index 4421f24..5ac2f15 100644
---
a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java
+++
b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryReceiverProvider.java
@@ -18,6 +18,7 @@
package org.apache.skywalking.oap.server.receiver.istio.telemetry.provider;
+import org.apache.skywalking.aop.server.receiver.mesh.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;
@@ -53,6 +54,6 @@ public class IstioTelemetryReceiverProvider extends
ModuleProvider {
}
@Override public String[] requiredModules() {
- return new String[] {CoreModule.NAME};
+ return new String[] {CoreModule.NAME, MeshReceiverModule.NAME};
}
}
\ No newline at end of file
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml
index 1354dde..43a8351 100644
--- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml
+++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml
@@ -29,9 +29,5 @@
<artifactId>skywalking-mesh-receiver-plugin</artifactId>
<packaging>jar</packaging>
- <modules>
- <module>mesh-receiver-module</module>
- <module>mesh-receiver-provider</module>
- </modules>
</project>
\ No newline at end of file
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/CoreRegisterLinker.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/CoreRegisterLinker.java
new file mode 100644
index 0000000..067cd7f
--- /dev/null
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/CoreRegisterLinker.java
@@ -0,0 +1,61 @@
+/*
+ * 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;
+
+import org.apache.skywalking.oap.server.core.CoreModule;
+import
org.apache.skywalking.oap.server.core.register.service.IEndpointInventoryRegister;
+import
org.apache.skywalking.oap.server.core.register.service.IServiceInstanceInventoryRegister;
+import
org.apache.skywalking.oap.server.core.register.service.IServiceInventoryRegister;
+import org.apache.skywalking.oap.server.library.module.ModuleManager;
+
+/**
+ * @author wusheng
+ */
+public class CoreRegisterLinker {
+ private static volatile ModuleManager moduleManager;
+ private static volatile IServiceInventoryRegister serviceInventoryRegister;
+ private static volatile IServiceInstanceInventoryRegister
serviceInstanceInventoryRegister;
+ private static volatile IEndpointInventoryRegister
endpointInventoryRegister;
+
+ public static void setModuleManager(ModuleManager moduleManager) {
+ CoreRegisterLinker.moduleManager = moduleManager;
+ }
+
+ public static IServiceInventoryRegister getServiceInventoryRegister() {
+ if (serviceInventoryRegister == null) {
+ serviceInventoryRegister =
moduleManager.find(CoreModule.NAME).getService(IServiceInventoryRegister.class);
+ }
+ return serviceInventoryRegister;
+ }
+
+ public static IServiceInstanceInventoryRegister
getServiceInstanceInventoryRegister() {
+ if (serviceInstanceInventoryRegister == null) {
+ serviceInstanceInventoryRegister =
moduleManager.find(CoreModule.NAME).getService(IServiceInstanceInventoryRegister.class);
+ }
+ return serviceInstanceInventoryRegister;
+ }
+
+ public static IEndpointInventoryRegister getEndpointInventoryRegister() {
+ if (endpointInventoryRegister == null) {
+ endpointInventoryRegister =
moduleManager.find(CoreModule.NAME).getService(IEndpointInventoryRegister.class);
+ }
+ return endpointInventoryRegister;
+ }
+
+}
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshDataBufferFileCache.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshDataBufferFileCache.java
new file mode 100644
index 0000000..f894a8c
--- /dev/null
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshDataBufferFileCache.java
@@ -0,0 +1,77 @@
+/*
+ * 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;
+
+import java.io.IOException;
+import java.util.List;
+import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
+import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer;
+import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric;
+import org.apache.skywalking.oap.server.library.buffer.BufferStream;
+import org.apache.skywalking.oap.server.library.buffer.DataStreamReader;
+
+public class MeshDataBufferFileCache implements
IConsumer<ServiceMeshMetricDataDecorator>,
DataStreamReader.CallBack<ServiceMeshMetric> {
+ private MeshModuleConfig config;
+ private DataCarrier<ServiceMeshMetricDataDecorator> dataCarrier;
+ private BufferStream<ServiceMeshMetric> stream;
+
+ public MeshDataBufferFileCache(MeshModuleConfig config) {
+ this.config = config;
+ dataCarrier = new DataCarrier<>(3, 1024);
+ }
+
+ void start() throws IOException {
+ dataCarrier.consume(this, 1);
+ BufferStream.Builder<ServiceMeshMetric> builder = new
BufferStream.Builder<>(config.getBufferPath());
+ builder.cleanWhenRestart(config.isBufferFileCleanWhenRestart());
+ builder.dataFileMaxSize(config.getBufferDataMaxFileSize());
+ builder.offsetFileMaxSize(config.getBufferOffsetMaxFileSize());
+ builder.parser(ServiceMeshMetric.parser());
+ builder.callBack(this);
+
+ stream = builder.build();
+ stream.initialize();
+ }
+
+ @Override public void init() {
+
+ }
+
+ @Override public void consume(List<ServiceMeshMetricDataDecorator> data) {
+
+ }
+
+ @Override public void onError(List<ServiceMeshMetricDataDecorator> data,
Throwable t) {
+
+ }
+
+ @Override public void onExit() {
+
+ }
+
+ /**
+ * File buffer callback.
+ *
+ * @param message
+ * @return
+ */
+ @Override public boolean call(ServiceMeshMetric message) {
+ return false;
+ }
+}
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java
index f1ecd3a..9085303 100644
---
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java
@@ -35,6 +35,8 @@ public class MeshGRPCHandler extends
ServiceMeshMetricServiceGrpc.ServiceMeshMet
if (logger.isDebugEnabled()) {
logger.debug("Received mesh metric: {}", metric);
}
+ TelemetryDataDispatcher dispatcher = new
TelemetryDataDispatcher();
+ dispatcher.process(metric);
}
@Override public void onError(Throwable throwable) {
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshModuleConfig.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshModuleConfig.java
new file mode 100644
index 0000000..5f650ce
--- /dev/null
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshModuleConfig.java
@@ -0,0 +1,33 @@
+/*
+ * 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;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.skywalking.oap.server.library.module.ModuleConfig;
+
+/**
+ * @author peng-yongsheng
+ */
+public class MeshModuleConfig extends ModuleConfig {
+ @Setter @Getter private String bufferPath;
+ @Setter @Getter private int bufferOffsetMaxFileSize;
+ @Setter @Getter private int bufferDataMaxFileSize;
+ @Setter @Getter private boolean bufferFileCleanWhenRestart;
+}
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshReceiverProvider.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshReceiverProvider.java
index 03024c3..8ab82ce 100644
---
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshReceiverProvider.java
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshReceiverProvider.java
@@ -18,6 +18,7 @@
package org.apache.skywalking.aop.server.receiver.mesh;
+import java.io.IOException;
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;
@@ -27,6 +28,12 @@ import
org.apache.skywalking.oap.server.library.module.ModuleStartException;
import
org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException;
public class MeshReceiverProvider extends ModuleProvider {
+ private MeshModuleConfig config;
+
+ public MeshReceiverProvider() {
+ config = new MeshModuleConfig();
+ }
+
@Override public String name() {
return "default";
}
@@ -36,13 +43,20 @@ public class MeshReceiverProvider extends ModuleProvider {
}
@Override public ModuleConfig createConfigBeanIfAbsent() {
- return null;
+ return config;
}
@Override public void prepare() throws ServiceNotProvidedException,
ModuleStartException {
+ MeshDataBufferFileCache cache = new MeshDataBufferFileCache(config);
+ try {
+ cache.start();
+ } catch (IOException e) {
+ throw new ModuleStartException(e.getMessage(), e);
+ }
}
@Override public void start() throws ServiceNotProvidedException,
ModuleStartException {
+ CoreRegisterLinker.setModuleManager(getManager());
GRPCHandlerRegister service =
getManager().find(CoreModule.NAME).getService(GRPCHandlerRegister.class);
service.addHandler(new MeshGRPCHandler());
}
@@ -52,6 +66,6 @@ public class MeshReceiverProvider extends ModuleProvider {
}
@Override public String[] requiredModules() {
- return new String[]{CoreModule.NAME};
+ return new String[] {CoreModule.NAME};
}
}
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java
new file mode 100644
index 0000000..b0497ed
--- /dev/null
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/ServiceMeshMetricDataDecorator.java
@@ -0,0 +1,124 @@
+/*
+ * 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;
+
+import org.apache.skywalking.apm.network.common.DetectPoint;
+import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric;
+import org.apache.skywalking.oap.server.core.Const;
+import org.apache.skywalking.oap.server.core.register.ServiceInstanceInventory;
+
+/**
+ * @author wusheng
+ */
+public class ServiceMeshMetricDataDecorator {
+ private ServiceMeshMetric origin;
+ private ServiceMeshMetric.Builder newDataBuilder;
+ private int endpointId;
+
+ public ServiceMeshMetricDataDecorator(ServiceMeshMetric origin) {
+ this.origin = origin;
+ }
+
+ boolean tryMetaDataRegister() {
+ int sourceServiceId = 0;
+ int sourceServiceInstanceId = 0;
+ int destServiceId = 0;
+ int destServiceInstanceId = 0;
+ boolean isRegistered = true;
+ sourceServiceId = origin.getSourceServiceId();
+ if (sourceServiceId == Const.NONE) {
+ sourceServiceId =
CoreRegisterLinker.getServiceInventoryRegister().getOrCreate(origin.getSourceServiceName());
+ if (sourceServiceId != Const.NONE) {
+ getNewDataBuilder().setSourceServiceId(sourceServiceId);
+ } else {
+ isRegistered = false;
+ }
+ }
+ sourceServiceInstanceId = origin.getSourceServiceInstanceId();
+ if (sourceServiceId != Const.NONE && sourceServiceInstanceId ==
Const.NONE) {
+ sourceServiceInstanceId =
CoreRegisterLinker.getServiceInstanceInventoryRegister().getOrCreate(sourceServiceId,
origin.getSourceServiceInstance(), origin.getEndTime(),
+ getOSInfoForMesh(origin.getSourceServiceInstance()));
+ if (sourceServiceInstanceId != Const.NONE) {
+
getNewDataBuilder().setSourceServiceInstanceId(sourceServiceInstanceId);
+ } else {
+ isRegistered = false;
+ }
+ }
+ destServiceId = origin.getDestServiceId();
+ if (destServiceId == Const.NONE) {
+ destServiceId =
CoreRegisterLinker.getServiceInventoryRegister().getOrCreate(origin.getDestServiceName());
+ if (destServiceId != Const.NONE) {
+ getNewDataBuilder().setDestServiceId(destServiceId);
+ } else {
+ isRegistered = false;
+ }
+ }
+ destServiceInstanceId = origin.getDestServiceInstanceId();
+ if (destServiceId != Const.NONE && destServiceInstanceId ==
Const.NONE) {
+ destServiceInstanceId =
CoreRegisterLinker.getServiceInstanceInventoryRegister().getOrCreate(destServiceId,
origin.getDestServiceInstance(), origin.getEndTime(),
+ getOSInfoForMesh(origin.getSourceServiceInstance()));
+ if (destServiceInstanceId != Const.NONE) {
+
getNewDataBuilder().setDestServiceInstanceId(destServiceInstanceId);
+ } else {
+ isRegistered = false;
+ }
+ }
+ String endpoint = origin.getEndpoint();
+ if (destServiceId != Const.NONE) {
+ DetectPoint point = origin.getDetectPoint();
+ /**
+ * Detect point matches {@link SpanType}, value options:
+ *
+ * Entry = 0; Server side.
+ * Exit = 1; Client side
+ * Local = 2; Never used.
+ *
+ */
+ int detectPointInt = DetectPoint.client.equals(point) ? 1 : 0;
+ endpointId =
CoreRegisterLinker.getEndpointInventoryRegister().getOrCreate(destServiceId,
endpoint, detectPointInt);
+ if (endpointId != Const.NONE) {
+ } else {
+ isRegistered = false;
+ }
+ }
+
+ return isRegistered;
+ }
+
+ public ServiceMeshMetric getMetric() {
+ if (newDataBuilder != null) {
+ return newDataBuilder.build();
+ } else {
+ return origin;
+ }
+ }
+
+ private ServiceMeshMetric.Builder getNewDataBuilder() {
+ if (newDataBuilder == null) {
+ newDataBuilder = origin.toBuilder();
+ }
+ return newDataBuilder;
+ }
+
+ private ServiceInstanceInventory.AgentOsInfo getOSInfoForMesh(String
instanceName) {
+ ServiceInstanceInventory.AgentOsInfo osInfo = new
ServiceInstanceInventory.AgentOsInfo();
+ osInfo.setHostname(instanceName);
+ return osInfo;
+ }
+}
diff --git
a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
new file mode 100644
index 0000000..c74a9a5
--- /dev/null
+++
b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/TelemetryDataDispatcher.java
@@ -0,0 +1,39 @@
+/*
+ * 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;
+
+import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric;
+
+/**
+ * TelemetryDataDispatcher processes the {@link ServiceMeshMetric} format
telemetry data, transfers it to source
+ * dispatcher.
+ *
+ * @author wusheng
+ */
+public class TelemetryDataDispatcher {
+ public void process(ServiceMeshMetric data) {
+ ServiceMeshMetricDataDecorator decorator = new
ServiceMeshMetricDataDecorator(data);
+ boolean registerStatus = decorator.tryMetaDataRegister();
+
+ if (registerStatus) {
+ // TODO dispatch to sources.
+ }
+
+ }
+}
diff --git
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
index ff083b4..1b653c8 100644
---
a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
+++
b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
@@ -97,9 +97,9 @@ public class MultiScopesSpanListener implements
EntrySpanListener, ExitSpanListe
}
} else {
SourceBuilder sourceBuilder = new SourceBuilder();
- sourceBuilder.setSourceEndpointId(Const.NONE_ENDPOINT_ID);
- sourceBuilder.setSourceServiceInstanceId(Const.NONE_INSTANCE_ID);
- sourceBuilder.setSourceServiceId(Const.NONE_SERVICE_ID);
+ sourceBuilder.setSourceEndpointId(Const.USER_ENDPOINT_ID);
+ sourceBuilder.setSourceServiceInstanceId(Const.USER_INSTANCE_ID);
+ sourceBuilder.setSourceServiceId(Const.USER_SERVICE_ID);
sourceBuilder.setDestEndpointId(spanDecorator.getOperationNameId());
sourceBuilder.setDestServiceInstanceId(segmentCoreInfo.getApplicationInstanceId());
sourceBuilder.setDestServiceId(segmentCoreInfo.getApplicationId());
@@ -122,7 +122,7 @@ public class MultiScopesSpanListener implements
EntrySpanListener, ExitSpanListe
int destServiceId = serviceInventoryCache.getServiceId(peerId);
int destInstanceId =
instanceInventoryCache.getServiceInstanceId(destServiceId, peerId);
- sourceBuilder.setSourceEndpointId(Const.NONE_ENDPOINT_ID);
+ sourceBuilder.setSourceEndpointId(Const.USER_ENDPOINT_ID);
sourceBuilder.setSourceServiceInstanceId(segmentCoreInfo.getApplicationInstanceId());
sourceBuilder.setSourceServiceId(segmentCoreInfo.getApplicationId());
sourceBuilder.setDestEndpointId(spanDecorator.getOperationNameId());
@@ -175,7 +175,7 @@ public class MultiScopesSpanListener implements
EntrySpanListener, ExitSpanListe
if (nonNull(entrySpanDecorator)) {
exitSourceBuilder.setSourceEndpointId(entrySpanDecorator.getOperationNameId());
} else {
- exitSourceBuilder.setSourceEndpointId(Const.NONE_ENDPOINT_ID);
+ exitSourceBuilder.setSourceEndpointId(Const.USER_ENDPOINT_ID);
}
exitSourceBuilder.setSourceEndpointName(endpointInventoryCache.get(exitSourceBuilder.getSourceEndpointId()).getName());
