Merge pull request apache#958 from yakecanlee/feature/fix-tracing-filter

Fix: fix the wrong judgment in rpc result error
Uarealoser · Dec 27, 2020 · 8aba190 · 8aba190
2 parents de2dad9 + 44f7199
commit 8aba190
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -58,7 +58,6 @@ jobs:
       run: |
         make verify
 
-
     - name: Integrate Test
       run: |
         chmod +x integrate_test.sh && ./integrate_test.sh

diff --git a/filter/filter_impl/tracing_filter.go b/filter/filter_impl/tracing_filter.go
@@ -83,7 +83,7 @@ func (tf *tracingFilter) Invoke(ctx context.Context, invoker protocol.Invoker, i
 	}()
 
 	result := invoker.Invoke(spanCtx, invocation)
-	span.SetTag(successKey, result.Error() != nil)
+	span.SetTag(successKey, result.Error() == nil)
 	if result.Error() != nil {
 		span.LogFields(log.String(errorKey, result.Error().Error()))
 	}

diff --git a/go.mod b/go.mod
@@ -39,6 +39,7 @@ require (
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.6.1
 	github.com/zouyx/agollo/v3 v3.4.5
+	go.etcd.io/bbolt v1.3.5 // indirect
 	go.uber.org/atomic v1.7.0
 	go.uber.org/zap v1.16.0
 	google.golang.org/grpc v1.26.0

diff --git a/go.sum b/go.sum
@@ -999,6 +999,8 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
 go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
+go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,7 +58,6 @@ jobs: @@
           run: |
             make verify
         - name: Integrate Test
           run: |
             chmod +x integrate_test.sh && ./integrate_test.sh
@@ Expand Down @@