[skywalking] branch master updated: polish debug logging avoid null value when segment be ignored. (#7070)

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 17abef4  polish debug logging avoid null value when segment be ignored. (#7070)
17abef4 is described below

commit 17abef4c5980ff8349e3d1eb4944a5599e4f5e6b
Author: Jared Tan <ji...@daocloud.io>
AuthorDate: Sat Jun 5 19:23:46 2021 +0800

    polish debug logging avoid null value when segment be ignored. (#7070)
    
    * polish debug logging avoid null value.
    
    * update CHANGES.md.
---
 CHANGES.md                                                    |  1 +
 .../trace/parser/listener/SegmentAnalysisListener.java        | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b13efb5..ee757ac 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 6fc5a76..4c8c96d 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,14 +170,17 @@ 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 (log.isDebugEnabled()) {
+            log.debug("segment listener build, segment id: {}", segment.getSegmentId());
+        }
+
         segment.setEndpointId(endpointId);
         segment.setEndpointName(endpointName);