You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/12/16 16:04:13 UTC
[incubator-skywalking] branch 5.x updated: bugfix (#2046)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 5.x
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/5.x by this push:
new 3174e1a bugfix (#2046)
3174e1a is described below
commit 3174e1ae894d8c7cfe8b36ae05a11a9588c5e5c3
Author: 于玉桔 <76...@qq.com>
AuthorDate: Mon Dec 17 00:04:07 2018 +0800
bugfix (#2046)
---
.../skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java | 2 +-
.../skywalking/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 ba7ded3..e335c3a 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 49f80cf..9ed1afc 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