From 3fdab2fb95f47af6de2bf1765ab2b4246cea2e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E7=8E=89=E6=A1=94?= <769213327@qq.com> Date: Mon, 17 Dec 2018 00:33:48 +0800 Subject: [PATCH] fix some obvious minor bugs (#2055) --- .../apm/toolkit/opentracing/SkywalkingSpanBuilder.java | 2 +- .../apm/plugin/trace/ignore/matcher/AntPathMatcher.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java index ba7ded3cf..e335c3a0d 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java +++ b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java @@ -107,7 +107,7 @@ public class SkywalkingSpanBuilder implements Tracer.SpanBuilder { @Override public Tracer.SpanBuilder withTag(String key, boolean value) { - if (Tags.ERROR.equals(key)) { + if (Tags.ERROR.getKey().equals(key)) { isError = value; } else { tags.add(new Tag(key, value ? "true" : "false")); diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/AntPathMatcher.java b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/AntPathMatcher.java index 49f80cf2c..9ed1afc6b 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/AntPathMatcher.java +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/src/main/java/org/apache/skywalking/apm/plugin/trace/ignore/matcher/AntPathMatcher.java @@ -200,7 +200,7 @@ public class AntPathMatcher implements TracePathMatcher { * use pattern match path */ private static boolean matchStrings(String pattern, String path) { - if (StringUtil.isEmpty(pattern) || StringUtil.isEmpty(pattern)) { + if (StringUtil.isEmpty(pattern) || StringUtil.isEmpty(path)) { return false; } // if this pattern has been compiled