You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2020/12/27 05:15:41 UTC

[dubbo-go] 01/02: Merge pull request #958 from yakecanlee/feature/fix-tracing-filter

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

alexstocks pushed a commit to branch imp/lint
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git

commit f002d8a7add00d609c1db761c763dbff83cdba40
Merge: de2dad9 44f7199
Author: Xin.Zh <dr...@foxmail.com>
AuthorDate: Sat Dec 26 07:21:30 2020 +0800

    Merge pull request #958 from yakecanlee/feature/fix-tracing-filter
    
    Fix: fix the wrong judgment in rpc result error

 .github/workflows/github-actions.yml | 7 ++++++-
 filter/filter_impl/tracing_filter.go | 2 +-
 go.mod                               | 1 +
 go.sum                               | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --cc .github/workflows/github-actions.yml
index 76aa42d,76aa42d..7b082d1
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@@ -54,11 -54,11 +54,16 @@@ jobs
              go get -v -t -d ./...
          fi
  
++    - name: Install go ci lint
++      run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.33.0
++
++    - name: Run Linter
++      run: golangci-lint run --timeout=10m -v
++
      - name: Verify
        run: |
          make verify
  
--
      - name: Integrate Test
        run: |
          chmod +x integrate_test.sh && ./integrate_test.sh
diff --cc go.mod
index 94509de,94509de..2e3f077
--- a/go.mod
+++ b/go.mod
@@@ -39,6 -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 --cc go.sum
index 201f03e,201f03e..afcd5c7
--- a/go.sum
+++ b/go.sum
@@@ -999,6 -999,6 +999,8 @@@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyR
  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=