From 720c1dd92f3883fc8841b0dbbb3508b40a122168 Mon Sep 17 00:00:00 2001 From: zifeihan Date: Wed, 26 Aug 2020 16:45:02 +0800 Subject: [PATCH] Use traceId as the judgment condition for sampling trace. (#5386) --- .../trace/parser/listener/SegmentAnalysisListener.java | 2 +- .../provider/trace/parser/listener/TraceSegmentSampler.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/SegmentAnalysisListener.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/SegmentAnalysisListener.java index bb887862b..9f4afdc97 100644 --- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/SegmentAnalysisListener.java +++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/SegmentAnalysisListener.java @@ -126,7 +126,7 @@ public class SegmentAnalysisListener implements FirstAnalysisListener, EntryAnal @Override public void parseSegment(SegmentObject segmentObject) { if (sampleStatus.equals(SAMPLE_STATUS.UNKNOWN) || sampleStatus.equals(SAMPLE_STATUS.IGNORE)) { - if (sampler.shouldSample(segmentObject.getTraceSegmentId())) { + if (sampler.shouldSample(segmentObject.getTraceId())) { sampleStatus = SAMPLE_STATUS.SAMPLED; } else { sampleStatus = SAMPLE_STATUS.IGNORE; diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/TraceSegmentSampler.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/TraceSegmentSampler.java index 39cf88aa7..493897c74 100644 --- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/TraceSegmentSampler.java +++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/TraceSegmentSampler.java @@ -31,7 +31,7 @@ public class TraceSegmentSampler { this.traceSampleRateWatcher = traceSampleRateWatcher; } - public boolean shouldSample(String segmentId) { - return segmentId.hashCode() % 10000 < traceSampleRateWatcher.getSampleRate(); + public boolean shouldSample(String traceId) { + return traceId.hashCode() % 10000 < traceSampleRateWatcher.getSampleRate(); } }