You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2018/04/08 22:20:50 UTC
[GitHub] wu-sheng closed pull request #1049: Segment parse performance optimization
wu-sheng closed pull request #1049: Segment parse performance optimization
URL: https://github.com/apache/incubator-skywalking/pull/1049
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java
index ab15b5942..313fca844 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricsServiceHandler.java
@@ -66,11 +66,11 @@ public JVMMetricsServiceHandler(ModuleManager moduleManager) {
logger.debug("receive the jvm metric from application instance, id: {}", instanceId);
request.getMetricsList().forEach(metric -> {
- long time = TimeBucketUtils.INSTANCE.getSecondTimeBucket(metric.getTime());
- sendToCpuMetricService(instanceId, time, metric.getCpu());
- sendToMemoryMetricService(instanceId, time, metric.getMemoryList());
- sendToMemoryPoolMetricService(instanceId, time, metric.getMemoryPoolList());
- sendToGCMetricService(instanceId, time, metric.getGcList());
+ long secondTimeBucket = TimeBucketUtils.INSTANCE.getSecondTimeBucket(metric.getTime());
+ sendToCpuMetricService(instanceId, secondTimeBucket, metric.getCpu());
+ sendToMemoryMetricService(instanceId, secondTimeBucket, metric.getMemoryList());
+ sendToMemoryPoolMetricService(instanceId, secondTimeBucket, metric.getMemoryPoolList());
+ sendToGCMetricService(instanceId, secondTimeBucket, metric.getGcList());
sendToInstanceHeartBeatService(instanceId, metric.getTime());
});
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/AgentDataMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/AgentDataMock.java
index 182eb0030..40e40bea9 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/AgentDataMock.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/AgentDataMock.java
@@ -36,14 +36,18 @@ public static void main(String[] args) throws InterruptedException {
RegisterMock registerMock = new RegisterMock();
registerMock.mock(channel);
+ TraceSegmentMock segmentMock = new TraceSegmentMock();
+ segmentMock.mock(channel, new Long[] {System.currentTimeMillis()}, true);
+
+ Thread.sleep(30000);
+
Long[] times = TimeBuilder.INSTANCE.generateTimes();
logger.info("times size: {}", times.length);
- TraceSegmentMock segmentMock = new TraceSegmentMock();
- segmentMock.mock(channel, times);
+ segmentMock.mock(channel, times, false);
JVMMetricMock jvmMetricMock = new JVMMetricMock();
- jvmMetricMock.mock(channel, times);
+// jvmMetricMock.mock(channel, times);
Thread.sleep(60);
}
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java
index 5029d43a3..d83a6cd7b 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ConsumerMock.java
@@ -34,26 +34,26 @@
class ConsumerMock {
void mock(StreamObserver<UpstreamSegment> segmentStreamObserver, UniqueId.Builder globalTraceId,
- UniqueId.Builder segmentId, long startTimestamp) {
+ UniqueId.Builder segmentId, long startTimestamp, boolean isPrepare) {
UpstreamSegment.Builder upstreamSegment = UpstreamSegment.newBuilder();
upstreamSegment.addGlobalTraceIds(globalTraceId);
- upstreamSegment.setSegment(createSegment(startTimestamp, segmentId));
+ upstreamSegment.setSegment(createSegment(startTimestamp, segmentId, isPrepare));
segmentStreamObserver.onNext(upstreamSegment.build());
}
- private ByteString createSegment(long startTimestamp, UniqueId.Builder segmentId) {
+ private ByteString createSegment(long startTimestamp, UniqueId.Builder segmentId, boolean isPrepare) {
TraceSegmentObject.Builder segment = TraceSegmentObject.newBuilder();
segment.setTraceSegmentId(segmentId);
segment.setApplicationId(-1);
segment.setApplicationInstanceId(2);
- segment.addSpans(createExitSpan(startTimestamp));
- segment.addSpans(createEntrySpan(startTimestamp));
+ segment.addSpans(createExitSpan(startTimestamp, isPrepare));
+ segment.addSpans(createEntrySpan(startTimestamp, isPrepare));
return segment.build().toByteString();
}
- private SpanObject.Builder createExitSpan(long startTimestamp) {
+ private SpanObject.Builder createExitSpan(long startTimestamp, boolean isPrepare) {
SpanObject.Builder span = SpanObject.newBuilder();
span.setSpanId(1);
span.setSpanType(SpanType.Exit);
@@ -62,13 +62,18 @@ private ByteString createSegment(long startTimestamp, UniqueId.Builder segmentId
span.setStartTime(startTimestamp + 10);
span.setEndTime(startTimestamp + 1990);
span.setComponentId(ComponentsDefine.DUBBO.getId());
- span.setOperationName("org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()");
- span.setPeer("172.25.0.4:20880");
+ if (isPrepare) {
+ span.setPeer("172.25.0.4:20880");
+ span.setOperationName("org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()");
+ } else {
+ span.setOperationNameId(-1);
+ span.setPeerId(-1);
+ }
span.setIsError(false);
return span;
}
- private SpanObject.Builder createEntrySpan(long startTimestamp) {
+ private SpanObject.Builder createEntrySpan(long startTimestamp, boolean isPrepare) {
SpanObject.Builder span = SpanObject.newBuilder();
span.setSpanId(0);
span.setSpanType(SpanType.Entry);
@@ -77,7 +82,11 @@ private ByteString createSegment(long startTimestamp, UniqueId.Builder segmentId
span.setStartTime(startTimestamp);
span.setEndTime(startTimestamp + 2000);
span.setComponentId(ComponentsDefine.TOMCAT.getId());
- span.setOperationName("/dubbox-case/case/dubbox-rest");
+ if (isPrepare) {
+ span.setOperationName("/dubbox-case/case/dubbox-rest");
+ } else {
+ span.setOperationNameId(2);
+ }
span.setIsError(false);
return span;
}
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java
index b61ff4e56..42dd356fb 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/ProviderMock.java
@@ -36,40 +36,47 @@
class ProviderMock {
void mock(StreamObserver<UpstreamSegment> segmentStreamObserver, UniqueId.Builder globalTraceId,
- UniqueId.Builder segmentId, UniqueId.Builder parentTraceSegmentId, long startTimestamp) {
+ UniqueId.Builder segmentId, UniqueId.Builder parentTraceSegmentId, long startTimestamp, boolean isPrepare) {
UpstreamSegment.Builder upstreamSegment = UpstreamSegment.newBuilder();
upstreamSegment.addGlobalTraceIds(globalTraceId);
- upstreamSegment.setSegment(createSegment(startTimestamp, segmentId, parentTraceSegmentId));
+ upstreamSegment.setSegment(createSegment(startTimestamp, segmentId, parentTraceSegmentId, isPrepare));
segmentStreamObserver.onNext(upstreamSegment.build());
}
private ByteString createSegment(long startTimestamp, UniqueId.Builder segmentId,
- UniqueId.Builder parentTraceSegmentId) {
+ UniqueId.Builder parentTraceSegmentId, boolean isPrepare) {
TraceSegmentObject.Builder segment = TraceSegmentObject.newBuilder();
segment.setTraceSegmentId(segmentId);
segment.setApplicationId(2);
segment.setApplicationInstanceId(3);
- segment.addSpans(createExitSpan(startTimestamp));
- segment.addSpans(createEntrySpan(startTimestamp, parentTraceSegmentId));
+ segment.addSpans(createExitSpan(startTimestamp, isPrepare));
+ segment.addSpans(createEntrySpan(startTimestamp, parentTraceSegmentId, isPrepare));
return segment.build().toByteString();
}
- private TraceSegmentReference.Builder createReference(UniqueId.Builder parentTraceSegmentId) {
+ private TraceSegmentReference.Builder createReference(UniqueId.Builder parentTraceSegmentId, boolean isPrepare) {
TraceSegmentReference.Builder reference = TraceSegmentReference.newBuilder();
reference.setParentTraceSegmentId(parentTraceSegmentId);
reference.setParentApplicationInstanceId(2);
reference.setParentSpanId(1);
- reference.setParentServiceName("/dubbox-case/case/dubbox-rest");
- reference.setNetworkAddress("172.25.0.4:20880");
reference.setEntryApplicationInstanceId(2);
- reference.setEntryServiceName("/dubbox-case/case/dubbox-rest");
reference.setRefType(RefType.CrossProcess);
+
+ if (isPrepare) {
+ reference.setParentServiceName("/dubbox-case/case/dubbox-rest");
+ reference.setNetworkAddress("172.25.0.4:20880");
+ reference.setEntryServiceName("/dubbox-case/case/dubbox-rest");
+ } else {
+ reference.setParentServiceId(2);
+ reference.setNetworkAddressId(-1);
+ reference.setEntryServiceId(2);
+ }
return reference;
}
- private SpanObject.Builder createExitSpan(long startTimestamp) {
+ private SpanObject.Builder createExitSpan(long startTimestamp, boolean isPrepare) {
SpanObject.Builder span = SpanObject.newBuilder();
span.setSpanId(1);
span.setSpanType(SpanType.Exit);
@@ -78,13 +85,19 @@ private ByteString createSegment(long startTimestamp, UniqueId.Builder segmentId
span.setStartTime(startTimestamp + 510);
span.setEndTime(startTimestamp + 1490);
span.setComponentId(ComponentsDefine.MONGODB.getId());
- span.setOperationName("mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]");
- span.setPeer("localhost:27017");
span.setIsError(false);
+
+ if (isPrepare) {
+ span.setOperationName("mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]");
+ span.setPeer("localhost:27017");
+ } else {
+ span.setOperationNameId(-2);
+ span.setPeerId(1);
+ }
return span;
}
- private SpanObject.Builder createEntrySpan(long startTimestamp, UniqueId.Builder uniqueId) {
+ private SpanObject.Builder createEntrySpan(long startTimestamp, UniqueId.Builder uniqueId, boolean isPrepare) {
SpanObject.Builder span = SpanObject.newBuilder();
span.setSpanId(0);
span.setSpanType(SpanType.Entry);
@@ -93,9 +106,14 @@ private ByteString createSegment(long startTimestamp, UniqueId.Builder segmentId
span.setStartTime(startTimestamp + 500);
span.setEndTime(startTimestamp + 1500);
span.setComponentId(ComponentsDefine.DUBBO.getId());
- span.setOperationName("org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()");
span.setIsError(false);
- span.addRefs(createReference(uniqueId));
+ span.addRefs(createReference(uniqueId, isPrepare));
+
+ if (isPrepare) {
+ span.setOperationName("org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()");
+ } else {
+ span.setOperationNameId(3);
+ }
return span;
}
}
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
index 0eb086ee6..00ab6c805 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
@@ -152,6 +152,7 @@ private void registerProvider() throws InterruptedException {
private void registerServiceName(ServiceNameCollection.Builder serviceNameCollection) throws InterruptedException {
ServiceNameMappingCollection serviceNameMappingCollection;
do {
+ logger.debug("register service name: {}", serviceNameCollection.getElements(0).getServiceName());
serviceNameMappingCollection = serviceNameDiscoveryServiceBlockingStub.discovery(serviceNameCollection.build());
logger.debug("service name mapping collection size: {}", serviceNameMappingCollection.getElementsCount());
if (serviceNameMappingCollection.getElementsCount() > 0) {
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TimeBuilder.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TimeBuilder.java
index 5e4b4e121..a1eaca7c4 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TimeBuilder.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TimeBuilder.java
@@ -33,19 +33,19 @@
private static final Logger logger = LoggerFactory.getLogger(TimeBuilder.class);
private Duration[] durations = {
- new Duration("2017-01-01T00:02:01.001", "2017-01-01T00:05:01.001", 2),
- new Duration("2017-02-01T00:02:01.001", "2017-02-01T00:05:01.001", 2),
- new Duration("2017-03-01T00:02:01.001", "2017-03-01T00:05:01.001", 2),
+ new Duration("2017-01-01T00:02:01.001", "2017-01-01T00:05:01.001", 20),
+ new Duration("2017-02-01T00:02:01.001", "2017-02-01T00:05:01.001", 20),
+ new Duration("2017-03-01T00:02:01.001", "2017-03-01T00:05:01.001", 20),
- new Duration("2017-04-01T00:02:01.001", "2017-04-01T00:05:01.001", 2),
- new Duration("2017-04-02T00:02:01.001", "2017-04-02T00:05:01.001", 2),
- new Duration("2017-04-03T00:02:01.001", "2017-04-03T00:05:01.001", 2),
+ new Duration("2017-04-01T00:02:01.001", "2017-04-01T00:05:01.001", 20),
+ new Duration("2017-04-02T00:02:01.001", "2017-04-02T00:05:01.001", 20),
+ new Duration("2017-04-03T00:02:01.001", "2017-04-03T00:05:01.001", 20),
- new Duration("2017-05-01T08:02:01.001", "2017-05-01T08:05:01.001", 2),
- new Duration("2017-05-01T09:02:01.001", "2017-05-01T09:05:01.001", 2),
- new Duration("2017-05-01T10:02:01.001", "2017-05-01T10:05:01.001", 2),
+ new Duration("2017-05-01T08:02:01.001", "2017-05-01T08:05:01.001", 20),
+ new Duration("2017-05-01T09:02:01.001", "2017-05-01T09:05:01.001", 20),
+ new Duration("2017-05-01T10:02:01.001", "2017-05-01T10:05:01.001", 20),
- new Duration("2017-06-01T10:02:01.001", "2017-06-01T10:05:01.001", 20),
+ new Duration("2017-06-01T1:02:01.001", "2017-06-01T11:02:01.001", 100),
};
public Long[] generateTimes() {
diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java
index 3fdf97a92..dfb3fcebe 100644
--- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java
+++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java
@@ -34,7 +34,7 @@
private static final Logger logger = LoggerFactory.getLogger(TraceSegmentMock.class);
- void mock(ManagedChannel channel, Long[] times) {
+ void mock(ManagedChannel channel, Long[] times, boolean isPrepare) {
TraceSegmentServiceGrpc.TraceSegmentServiceStub stub = TraceSegmentServiceGrpc.newStub(channel);
StreamObserver<UpstreamSegment> segmentStreamObserver = stub.collect(new StreamObserver<Downstream>() {
@Override public void onNext(Downstream downstream) {
@@ -54,15 +54,23 @@ void mock(ManagedChannel channel, Long[] times) {
ConsumerMock consumerMock = new ConsumerMock();
UniqueId.Builder consumerSegmentId = UniqueIdBuilder.INSTANCE.create();
- consumerMock.mock(segmentStreamObserver, globalTraceId, consumerSegmentId, startTimestamp);
+ consumerMock.mock(segmentStreamObserver, globalTraceId, consumerSegmentId, startTimestamp, isPrepare);
ProviderMock providerMock = new ProviderMock();
UniqueId.Builder providerSegmentId = UniqueIdBuilder.INSTANCE.create();
- providerMock.mock(segmentStreamObserver, globalTraceId, providerSegmentId, consumerSegmentId, startTimestamp);
+ providerMock.mock(segmentStreamObserver, globalTraceId, providerSegmentId, consumerSegmentId, startTimestamp, isPrepare);
- if (i % 100 == 0) {
+ if (i % 1000 == 0) {
logger.info("sending segment number: {}", i);
}
+
+ if (i % 8000 == 0) {
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
}
logger.info("sending segment number: {}", times.length);
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java
index 6408b6e1e..70b0f3911 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentSpanListener.java
@@ -50,6 +50,10 @@ private ApplicationComponentSpanListener(ModuleManager moduleManager) {
this.applicationCacheService = moduleManager.find(CacheModule.NAME).getService(ApplicationCacheService.class);
}
+ @Override public boolean containsPoint(Point point) {
+ return Point.Entry.equals(point) || Point.Exit.equals(point) || Point.First.equals(point);
+ }
+
@Override
public void parseExit(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) {
int applicationIdFromPeerId = applicationCacheService.getApplicationIdByAddressId(spanDecorator.getPeerId());
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java
index c0f2e8803..a6a13eb08 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingSpanListener.java
@@ -54,6 +54,10 @@ private ApplicationMappingSpanListener(ModuleManager moduleManager) {
this.applicationCacheService = moduleManager.find(CacheModule.NAME).getService(ApplicationCacheService.class);
}
+ @Override public boolean containsPoint(Point point) {
+ return Point.First.equals(point) || Point.Entry.equals(point);
+ }
+
@Override public void parseEntry(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) {
logger.debug("application mapping listener parse reference");
if (!spanDecorator.getSpanLayer().equals(SpanLayer.MQ)) {
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java
index a13e5e429..57d79b468 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTraceSpanListener.java
@@ -48,11 +48,15 @@
private String segmentId;
private long timeBucket;
+ @Override public boolean containsPoint(Point point) {
+ return Point.First.equals(point) || Point.GlobalTraceIds.equals(point);
+ }
+
@Override
public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId,
String segmentId) {
this.segmentId = segmentId;
-
+
if (spanDecorator.getStartTimeMinuteTimeBucket() == 0) {
long startTimeMinuteTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime());
spanDecorator.setStartTimeMinuteTimeBucket(startTimeMinuteTimeBucket);
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java
index 6c7574418..62cf33944 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingSpanListener.java
@@ -46,6 +46,10 @@
private List<InstanceMapping> instanceMappings = new LinkedList<>();
private long timeBucket;
+ @Override public boolean containsPoint(Point point) {
+ return Point.First.equals(point) || Point.Entry.equals(point);
+ }
+
@Override public void parseEntry(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) {
logger.debug("instance mapping listener parse reference");
if (spanDecorator.getRefsCount() > 0) {
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java
index 9a7a3a253..34645dc4a 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java
@@ -57,6 +57,10 @@ private SegmentDurationSpanListener(ModuleManager moduleManager) {
this.serviceNameCacheService = moduleManager.find(CacheModule.NAME).getService(ServiceNameCacheService.class);
}
+ @Override public boolean containsPoint(Point point) {
+ return Point.Entry.equals(point) || Point.Exit.equals(point) || Point.Local.equals(point) || Point.First.equals(point);
+ }
+
@Override
public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId,
String segmentId) {
diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java
index a1e8d7ac9..e274ef5e3 100644
--- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMetricSpanListener.java
@@ -65,6 +65,10 @@ private ServiceReferenceMetricSpanListener(ModuleManager moduleManager) {
this.applicationCacheService = moduleManager.find(CacheModule.NAME).getService(ApplicationCacheService.class);
}
+ @Override public boolean containsPoint(Point point) {
+ return Point.First.equals(point) || Point.Entry.equals(point) || Point.Exit.equals(point);
+ }
+
@Override
public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId,
String segmentId) {
diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/NetworkAddressIDService.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/NetworkAddressIDService.java
index 1b524ecb4..f429a4887 100644
--- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/NetworkAddressIDService.java
+++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/service/NetworkAddressIDService.java
@@ -107,7 +107,7 @@ private IInstanceIDService getInstanceIDService() {
}
@Override public void update(int addressId, int spanLayer, int serverType) {
- if (!networkAddressCacheService.compare(addressId, spanLayer, serverType)) {
+ if (!this.compare(addressId, spanLayer, serverType)) {
NetworkAddress newNetworkAddress = new NetworkAddress();
newNetworkAddress.setId(String.valueOf(addressId));
newNetworkAddress.setSpanLayer(spanLayer);
@@ -117,4 +117,14 @@ private IInstanceIDService getInstanceIDService() {
getNetworkAddressGraph().start(newNetworkAddress);
}
}
+
+ private boolean compare(int addressId, int spanLayer, int serverType) {
+ NetworkAddress networkAddress = networkAddressCacheService.getAddress(addressId);
+
+ if (ObjectUtils.isNotEmpty(networkAddress)) {
+ return spanLayer == networkAddress.getSpanLayer() && serverType == networkAddress.getServerType();
+ }
+
+ return true;
+ }
}
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/listener/SpanListener.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/listener/SpanListener.java
index 3fd744ed1..45bc9fad7 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/listener/SpanListener.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/listener/SpanListener.java
@@ -23,4 +23,10 @@
*/
public interface SpanListener {
void build();
+
+ boolean containsPoint(Point point);
+
+ enum Point {
+ Entry, Exit, Local, First, GlobalTraceIds
+ }
}
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
index 516ac89f5..a7b5f2b1d 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java
@@ -151,9 +151,9 @@ private boolean preBuild(List<UniqueId> traceIds, SegmentDecorator segmentDecora
SpanDecorator spanDecorator = segmentDecorator.getSpans(i);
if (spanDecorator.getSpanId() == 0) {
- notifyFirstListener(spanDecorator, applicationId, applicationInstanceId, segmentId);
timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime());
spanDecorator.setStartTimeMinuteTimeBucket(timeBucket);
+ notifyFirstListener(spanDecorator, applicationId, applicationInstanceId, segmentId);
}
if (SpanType.Exit.equals(spanDecorator.getSpanType())) {
@@ -197,50 +197,50 @@ private void notifyListenerToBuild() {
@GraphComputingMetric(name = "/segment/parse/notifyExitListener")
private void notifyExitListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId,
String segmentId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof ExitSpanListener) {
+ spanListeners.forEach(listener -> {
+ if (listener.containsPoint(SpanListener.Point.Exit)) {
((ExitSpanListener)listener).parseExit(spanDecorator, applicationId, applicationInstanceId, segmentId);
}
- }
+ });
}
@GraphComputingMetric(name = "/segment/parse/notifyEntryListener")
private void notifyEntryListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId,
String segmentId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof EntrySpanListener) {
+ spanListeners.forEach(listener -> {
+ if (listener.containsPoint(SpanListener.Point.Entry)) {
((EntrySpanListener)listener).parseEntry(spanDecorator, applicationId, applicationInstanceId, segmentId);
}
- }
+ });
}
@GraphComputingMetric(name = "/segment/parse/notifyLocalListener")
private void notifyLocalListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId,
String segmentId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof LocalSpanListener) {
+ spanListeners.forEach(listener -> {
+ if (listener.containsPoint(SpanListener.Point.Local)) {
((LocalSpanListener)listener).parseLocal(spanDecorator, applicationId, applicationInstanceId, segmentId);
}
- }
+ });
}
@GraphComputingMetric(name = "/segment/parse/notifyFirstListener")
private void notifyFirstListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId,
String segmentId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof FirstSpanListener) {
+ spanListeners.forEach(listener -> {
+ if (listener.containsPoint(SpanListener.Point.First)) {
((FirstSpanListener)listener).parseFirst(spanDecorator, applicationId, applicationInstanceId, segmentId);
}
- }
+ });
}
@GraphComputingMetric(name = "/segment/parse/notifyGlobalsListener")
private void notifyGlobalsListener(UniqueId uniqueId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof GlobalTraceIdsListener) {
+ spanListeners.forEach(listener -> {
+ if (listener.containsPoint(SpanListener.Point.GlobalTraceIds)) {
((GlobalTraceIdsListener)listener).parseGlobalTraceId(uniqueId);
}
- }
+ });
}
@GraphComputingMetric(name = "/segment/parse/createSpanListeners")
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
index 806c2a514..e879bd7af 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/ReferenceIdExchanger.java
@@ -24,6 +24,7 @@
import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.ReferenceDecorator;
import org.apache.skywalking.apm.collector.cache.CacheModule;
import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService;
+import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
import org.apache.skywalking.apm.collector.core.util.Const;
import org.apache.skywalking.apm.collector.core.util.StringUtils;
@@ -56,6 +57,7 @@ private ReferenceIdExchanger(ModuleManager moduleManager) {
this.instanceCacheService = moduleManager.find(CacheModule.NAME).getService(InstanceCacheService.class);
}
+ @GraphComputingMetric(name = "/segment/parse/exchange/referenceIdExchanger")
@Override public boolean exchange(ReferenceDecorator standardBuilder, int applicationId) {
if (standardBuilder.getEntryServiceId() == 0) {
String entryServiceName = StringUtils.isNotEmpty(standardBuilder.getEntryServiceName()) ? standardBuilder.getEntryServiceName() : Const.DOMAIN_OPERATION_NAME;
diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
index 85c15eb5e..30ff0c5d5 100644
--- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
+++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/standardization/SpanIdExchanger.java
@@ -22,6 +22,7 @@
import org.apache.skywalking.apm.collector.analysis.register.define.service.INetworkAddressIDService;
import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService;
import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SpanDecorator;
+import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
import org.apache.skywalking.apm.collector.core.util.Const;
import org.apache.skywalking.apm.collector.core.util.StringUtils;
@@ -52,6 +53,7 @@ private SpanIdExchanger(ModuleManager moduleManager) {
this.networkAddressIDService = moduleManager.find(AnalysisRegisterModule.NAME).getService(INetworkAddressIDService.class);
}
+ @GraphComputingMetric(name = "/segment/parse/exchange/spanIdExchanger")
@Override public boolean exchange(SpanDecorator standardBuilder, int applicationId) {
if (standardBuilder.getPeerId() == 0 && StringUtils.isNotEmpty(standardBuilder.getPeer())) {
int peerId = networkAddressIDService.getOrCreate(standardBuilder.getPeer());
diff --git a/apm-collector/apm-collector-cache/collector-cache-caffeine-provider/src/main/java/org/apache/skywalking/apm/collector/cache/caffeine/service/NetworkAddressCacheCaffeineService.java b/apm-collector/apm-collector-cache/collector-cache-caffeine-provider/src/main/java/org/apache/skywalking/apm/collector/cache/caffeine/service/NetworkAddressCacheCaffeineService.java
index e9068e8c9..851acd5ed 100644
--- a/apm-collector/apm-collector-cache/collector-cache-caffeine-provider/src/main/java/org/apache/skywalking/apm/collector/cache/caffeine/service/NetworkAddressCacheCaffeineService.java
+++ b/apm-collector/apm-collector-cache/collector-cache-caffeine-provider/src/main/java/org/apache/skywalking/apm/collector/cache/caffeine/service/NetworkAddressCacheCaffeineService.java
@@ -23,7 +23,6 @@
import java.util.concurrent.TimeUnit;
import org.apache.skywalking.apm.collector.cache.service.NetworkAddressCacheService;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
-import org.apache.skywalking.apm.collector.core.util.Const;
import org.apache.skywalking.apm.collector.core.util.ObjectUtils;
import org.apache.skywalking.apm.collector.core.util.StringUtils;
import org.apache.skywalking.apm.collector.storage.StorageModule;
@@ -39,7 +38,7 @@
private final Logger logger = LoggerFactory.getLogger(NetworkAddressCacheCaffeineService.class);
- private final Cache<String, Integer> addressCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.SECONDS).initialCapacity(100).maximumSize(5000).build();
+ private final Cache<String, Integer> addressCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.SECONDS).initialCapacity(1000).maximumSize(5000).build();
private final ModuleManager moduleManager;
private INetworkAddressCacheDAO networkAddressCacheDAO;
@@ -74,17 +73,17 @@ public int getAddressId(String networkAddress) {
return addressId;
}
- private final Cache<Integer, String> idCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.SECONDS).initialCapacity(100).maximumSize(5000).build();
+ private final Cache<Integer, NetworkAddress> idCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.SECONDS).initialCapacity(1000).maximumSize(5000).build();
- public String getAddress(int addressId) {
- String networkAddress = Const.EMPTY_STRING;
+ public NetworkAddress getAddress(int addressId) {
+ NetworkAddress networkAddress = null;
try {
networkAddress = idCache.get(addressId, key -> getNetworkAddressCacheDAO().getAddressById(key));
} catch (Throwable e) {
logger.error(e.getMessage(), e);
}
- if (StringUtils.isEmpty(networkAddress)) {
+ if (ObjectUtils.isEmpty(networkAddress)) {
networkAddress = getNetworkAddressCacheDAO().getAddressById(addressId);
if (StringUtils.isNotEmpty(networkAddress)) {
idCache.put(addressId, networkAddress);
@@ -92,21 +91,4 @@ public String getAddress(int addressId) {
}
return networkAddress;
}
-
- private final Cache<Integer, NetworkAddress> addressObjCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.SECONDS).initialCapacity(100).maximumSize(5000).build();
-
- @Override public boolean compare(int addressId, int spanLayer, int serverType) {
- try {
- NetworkAddress address = addressObjCache.get(addressId, key -> getNetworkAddressCacheDAO().getAddress(key));
-
- if (ObjectUtils.isNotEmpty(address)) {
- if (spanLayer != address.getSpanLayer() || serverType != address.getServerType()) {
- return false;
- }
- }
- } catch (Throwable e) {
- logger.error(e.getMessage(), e);
- }
- return true;
- }
}
diff --git a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/NetworkAddressCacheService.java b/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/NetworkAddressCacheService.java
index e435301a6..a5d17af80 100644
--- a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/NetworkAddressCacheService.java
+++ b/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/service/NetworkAddressCacheService.java
@@ -19,6 +19,7 @@
package org.apache.skywalking.apm.collector.cache.service;
import org.apache.skywalking.apm.collector.core.module.Service;
+import org.apache.skywalking.apm.collector.storage.table.register.NetworkAddress;
/**
* @author peng-yongsheng
@@ -26,7 +27,5 @@
public interface NetworkAddressCacheService extends Service {
int getAddressId(String networkAddress);
- String getAddress(int addressId);
-
- boolean compare(int addressId, int spanLayer, int serverType);
+ NetworkAddress getAddress(int addressId);
}
diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/NetworkAddressCacheGuavaService.java b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/NetworkAddressCacheGuavaService.java
index 5de4c0399..8e2a8ab2f 100644
--- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/NetworkAddressCacheGuavaService.java
+++ b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/NetworkAddressCacheGuavaService.java
@@ -22,7 +22,6 @@
import com.google.common.cache.CacheBuilder;
import org.apache.skywalking.apm.collector.cache.service.NetworkAddressCacheService;
import org.apache.skywalking.apm.collector.core.module.ModuleManager;
-import org.apache.skywalking.apm.collector.core.util.Const;
import org.apache.skywalking.apm.collector.core.util.ObjectUtils;
import org.apache.skywalking.apm.collector.core.util.StringUtils;
import org.apache.skywalking.apm.collector.storage.StorageModule;
@@ -38,7 +37,7 @@
private final Logger logger = LoggerFactory.getLogger(NetworkAddressCacheGuavaService.class);
- private final Cache<String, Integer> addressCache = CacheBuilder.newBuilder().initialCapacity(100).maximumSize(5000).build();
+ private final Cache<String, Integer> addressCache = CacheBuilder.newBuilder().initialCapacity(1000).maximumSize(5000).build();
private final ModuleManager moduleManager;
private INetworkAddressCacheDAO networkAddressCacheDAO;
@@ -72,17 +71,17 @@ public int getAddressId(String networkAddress) {
return addressId;
}
- private final Cache<Integer, String> idCache = CacheBuilder.newBuilder().maximumSize(5000).build();
+ private final Cache<Integer, NetworkAddress> idCache = CacheBuilder.newBuilder().initialCapacity(1000).maximumSize(5000).build();
- public String getAddress(int addressId) {
- String networkAddress = Const.EMPTY_STRING;
+ public NetworkAddress getAddress(int addressId) {
+ NetworkAddress networkAddress = null;
try {
networkAddress = idCache.get(addressId, () -> getNetworkAddressCacheDAO().getAddressById(addressId));
} catch (Throwable e) {
logger.error(e.getMessage(), e);
}
- if (StringUtils.isEmpty(networkAddress)) {
+ if (ObjectUtils.isEmpty(networkAddress)) {
networkAddress = getNetworkAddressCacheDAO().getAddressById(addressId);
if (StringUtils.isNotEmpty(networkAddress)) {
idCache.put(addressId, networkAddress);
@@ -90,20 +89,4 @@ public String getAddress(int addressId) {
}
return networkAddress;
}
-
- private final Cache<Integer, NetworkAddress> addressObjCache = CacheBuilder.newBuilder().maximumSize(5000).build();
-
- @Override public boolean compare(int addressId, int spanLayer, int serverType) {
- try {
- NetworkAddress address = addressObjCache.get(addressId, () -> getNetworkAddressCacheDAO().getAddress(addressId));
- if (ObjectUtils.isNotEmpty(address)) {
- if (spanLayer != address.getSpanLayer() || serverType != address.getServerType()) {
- return false;
- }
- }
- } catch (Throwable e) {
- logger.error(e.getMessage(), e);
- }
- return true;
- }
}
diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/cache/INetworkAddressCacheDAO.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/cache/INetworkAddressCacheDAO.java
index a4501b13c..c650cf068 100644
--- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/cache/INetworkAddressCacheDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/cache/INetworkAddressCacheDAO.java
@@ -27,7 +27,5 @@
public interface INetworkAddressCacheDAO extends DAO {
int getAddressId(String networkAddress);
- String getAddressById(int addressId);
-
- NetworkAddress getAddress(int addressId);
+ NetworkAddress getAddressById(int addressId);
}
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/NetworkAddressEsCacheDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/NetworkAddressEsCacheDAO.java
index 80c500caf..d132f1d80 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/NetworkAddressEsCacheDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/NetworkAddressEsCacheDAO.java
@@ -62,19 +62,7 @@ public NetworkAddressEsCacheDAO(ElasticSearchClient client) {
return Const.NONE;
}
- @Override public String getAddressById(int addressId) {
- logger.debug("get network address, address id: {}", addressId);
- ElasticSearchClient client = getClient();
- GetRequestBuilder getRequestBuilder = client.prepareGet(NetworkAddressTable.TABLE, String.valueOf(addressId));
-
- GetResponse getResponse = getRequestBuilder.get();
- if (getResponse.isExists()) {
- return (String)getResponse.getSource().get(NetworkAddressTable.COLUMN_NETWORK_ADDRESS);
- }
- return Const.EMPTY_STRING;
- }
-
- @Override public NetworkAddress getAddress(int addressId) {
+ @Override public NetworkAddress getAddressById(int addressId) {
ElasticSearchClient client = getClient();
GetRequestBuilder getRequestBuilder = client.prepareGet(NetworkAddressTable.TABLE, String.valueOf(addressId));
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/NetworkAddressH2CacheDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/NetworkAddressH2CacheDAO.java
index 4602e5497..b804c6ef4 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/NetworkAddressH2CacheDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/cache/NetworkAddressH2CacheDAO.java
@@ -62,22 +62,7 @@ public int getAddressId(String networkAddress) {
return Const.NONE;
}
- @Override public String getAddressById(int addressId) {
- logger.debug("get network address, address id: {}", addressId);
- H2Client client = getClient();
- String sql = SqlBuilder.buildSql(GET_ADDRESS_ID_OR_CODE_SQL, NetworkAddressTable.COLUMN_NETWORK_ADDRESS, NetworkAddressTable.TABLE, NetworkAddressTable.COLUMN_ADDRESS_ID);
- Object[] params = new Object[] {addressId};
- try (ResultSet rs = client.executeQuery(sql, params)) {
- if (rs.next()) {
- return rs.getString(1);
- }
- } catch (SQLException | H2ClientException e) {
- logger.error(e.getMessage(), e);
- }
- return Const.EMPTY_STRING;
- }
-
- @Override public NetworkAddress getAddress(int addressId) {
+ @Override public NetworkAddress getAddressById(int addressId) {
logger.debug("get network address, address id: {}", addressId);
H2Client client = getClient();
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java
index 9d65686f2..9c5364ad1 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java
@@ -88,25 +88,11 @@ public Trace load(String traceId) {
});
}
}
-// minStartTime(sortedSpans);
trace.setSpans(sortedSpans);
return trace;
}
- private void minStartTime(List<Span> spans) {
- long minStartTime = Long.MAX_VALUE;
- for (Span span : spans) {
- if (span.getStartTime() < minStartTime) {
- minStartTime = span.getStartTime();
- }
- }
-
- for (Span span : spans) {
- span.setStartTime(span.getStartTime() - minStartTime);
- }
- }
-
private List<Span> buildSpanList(String traceId, String segmentId, int applicationId,
List<SpanObject> spanObjects) {
List<Span> spans = new ArrayList<>();
@@ -132,7 +118,7 @@ private void minStartTime(List<Span> spans) {
if (spanObject.getPeerId() == 0) {
span.setPeer(spanObject.getPeer());
} else {
- span.setPeer(networkAddressCacheService.getAddress(spanObject.getPeerId()));
+ span.setPeer(networkAddressCacheService.getAddress(spanObject.getPeerId()).getNetworkAddress());
}
String operationName = spanObject.getOperationName();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services