From 17abef4c5980ff8349e3d1eb4944a5599e4f5e6b Mon Sep 17 00:00:00 2001 From: Jared Tan Date: Sat, 5 Jun 2021 19:23:46 +0800 Subject: [PATCH] polish debug logging avoid null value when segment be ignored. (#7070) * polish debug logging avoid null value. * update CHANGES.md. --- CHANGES.md | 1 + .../parser/listener/SegmentAnalysisListener.java | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b13efb519..ee757accf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -61,6 +61,7 @@ Release Notes. * Make metrics exporter still work even when storage layer failed. * Fix Jetty HTTP `TRACE` issue, disable HTTP methods except `POST`. * CVE: upgrade snakeyaml to prevent [billion laughs attack](https://en.wikipedia.org/wiki/Billion_laughs#Variations) in dynamic configuration. +* polish debug logging avoids null value when the segment ignored. #### UI * Add logo for kong plugin. 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 6fc5a76f7..4c8c96d44 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 @@ -170,12 +170,15 @@ public class SegmentAnalysisListener implements FirstAnalysisListener, EntryAnal @Override public void build() { - if (log.isDebugEnabled()) { - log.debug("segment listener build, segment id: {}", segment.getSegmentId()); + if (sampleStatus.equals(SAMPLE_STATUS.IGNORE)) { + if (log.isDebugEnabled()) { + log.debug("segment ignored, trace id: {}", segment.getTraceId()); + } + return; } - if (sampleStatus.equals(SAMPLE_STATUS.IGNORE)) { - return; + if (log.isDebugEnabled()) { + log.debug("segment listener build, segment id: {}", segment.getSegmentId()); } segment.setEndpointId(endpointId);