You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/12/12 08:46:05 UTC
[skywalking] branch chore/cleanup created (now 1969b01)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch chore/cleanup
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 1969b01 chore: remove unused lagecy codes
This branch includes the following new commits:
new 1969b01 chore: remove unused lagecy codes
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.
[skywalking] 01/01: chore: remove unused lagecy codes
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch chore/cleanup
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 1969b01eb9b12bacab3459e075f088e85a59587f
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sat Dec 12 16:45:22 2020 +0800
chore: remove unused lagecy codes
---
.../receiver/mesh/TelemetryDataDispatcher.java | 30 ----------------------
1 file changed, 30 deletions(-)
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
index 0635655..70bb41c 100644
--- 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
@@ -24,7 +24,6 @@ import org.apache.skywalking.apm.network.servicemesh.v3.ServiceMeshMetric;
import org.apache.skywalking.apm.util.StringUtil;
import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.CoreModule;
-import org.apache.skywalking.oap.server.core.analysis.IDManager;
import org.apache.skywalking.oap.server.core.analysis.NodeType;
import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
import org.apache.skywalking.oap.server.core.config.NamingControl;
@@ -35,7 +34,6 @@ import org.apache.skywalking.oap.server.core.source.RequestType;
import org.apache.skywalking.oap.server.core.source.Service;
import org.apache.skywalking.oap.server.core.source.ServiceInstance;
import org.apache.skywalking.oap.server.core.source.ServiceInstanceRelation;
-import org.apache.skywalking.oap.server.core.source.ServiceInstanceUpdate;
import org.apache.skywalking.oap.server.core.source.ServiceRelation;
import org.apache.skywalking.oap.server.core.source.SourceReceiver;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
@@ -103,7 +101,6 @@ public class TelemetryDataDispatcher {
static void doDispatch(ServiceMeshMetric.Builder metrics) {
long minuteTimeBucket = TimeBucket.getMinuteTimeBucket(metrics.getStartTime());
- heartbeat(metrics, minuteTimeBucket);
if (org.apache.skywalking.apm.network.common.v3.DetectPoint.server.equals(metrics.getDetectPoint())) {
toAll(metrics, minuteTimeBucket);
toService(metrics, minuteTimeBucket);
@@ -119,33 +116,6 @@ public class TelemetryDataDispatcher {
}
}
- private static void heartbeat(ServiceMeshMetric.Builder metrics, long minuteTimeBucket) {
- // source
- final String sourceServiceName = metrics.getSourceServiceName();
- final String sourceServiceInstance = metrics.getSourceServiceInstance();
- // Don't generate source heartbeat, if no source.
- if (StringUtil.isNotEmpty(sourceServiceName) && StringUtil.isNotEmpty(sourceServiceInstance)) {
- final ServiceInstanceUpdate serviceInstanceUpdate = new ServiceInstanceUpdate();
- serviceInstanceUpdate.setServiceId(
- IDManager.ServiceID.buildId(sourceServiceName, NodeType.Normal)
- );
- serviceInstanceUpdate.setName(sourceServiceInstance);
- serviceInstanceUpdate.setTimeBucket(minuteTimeBucket);
- }
-
- // dest
- final String destServiceName = metrics.getDestServiceName();
- final String destServiceInstance = metrics.getDestServiceInstance();
- if (StringUtil.isNotEmpty(destServiceName) && StringUtil.isNotEmpty(destServiceInstance)) {
- final ServiceInstanceUpdate serviceInstanceUpdate = new ServiceInstanceUpdate();
- serviceInstanceUpdate.setServiceId(
- IDManager.ServiceID.buildId(destServiceName, NodeType.Normal)
- );
- serviceInstanceUpdate.setName(destServiceInstance);
- serviceInstanceUpdate.setTimeBucket(minuteTimeBucket);
- }
- }
-
private static void toAll(ServiceMeshMetric.Builder metrics, long minuteTimeBucket) {
All all = new All();
all.setTimeBucket(minuteTimeBucket);