[skywalking] branch master updated: Fix: TraceIgnorePathPatterns can't set empty value (#7059)

[wu...@apache.org]

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

wusheng 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 d5348c9  Fix: TraceIgnorePathPatterns can't set empty value (#7059)
d5348c9 is described below

commit d5348c93dee66adae4230eb88618c007eec768e5
Author: Leon Yang <13...@qq.com>
AuthorDate: Wed Jun 2 23:18:31 2021 +0800

    Fix: TraceIgnorePathPatterns can't set empty value (#7059)
---
 CHANGES.md                                                              | 1 +
 .../skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d741d93..632f88d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -33,6 +33,7 @@ Release Notes.
 * Fix ClassCast issue for RequestHolder/ResponseHolder.
 * fixed `jdk-threading-plugin` memory leak.
 * Optimize multiple field reflection operation in Feign plugin.
+* Fix `trace-ignore-plugin` TraceIgnorePathPatterns can't set empty value
 
 #### OAP-Backend
 * BugFix: filter invalid Envoy access logs whose socket address is empty.
diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java
index 5f4dc6a..eaabd0e 100644
--- a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java
+++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/TraceIgnoreExtendService.java
@@ -89,6 +89,8 @@ public class TraceIgnoreExtendService extends SamplingService {
     void handleTraceIgnorePatternsChanged() {
         if (StringUtil.isNotBlank(traceIgnorePatternWatcher.getTraceIgnorePathPatterns())) {
             patterns = traceIgnorePatternWatcher.getTraceIgnorePathPatterns().split(PATTERN_SEPARATOR);
+        } else {
+            patterns = new String[] {};
         }
     }
 }