merge 3.0 to ensure samples runnable

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,5 @@
 <!--  Thanks for sending a pull request!
-Read https://github.com/apache/dubbo-go/blob/master/contributing.md before commit pull request.
+Read https://github.com/apache/dubbo-go/blob/master/CONTRIBUTING.md before commit pull request.
 -->
 
 **What this PR does**:

.github/dependabot.yml

@@ -9,12 +9,12 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
-    target-branch: "develop"
+    target-branch: "3.0"
 
   - package-ecosystem: "github-actions"
     # Workflow files stored in the
     # default location of `.github/workflows`
     directory: "/"
     schedule:
       interval: "weekly"
-    target-branch: "develop"
+    target-branch: "3.0"

.github/workflows/github-actions.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [master, develop]
+    branches: [master, develop, "1.5", "3.0"]
   pull_request:
     branches: "*"
 
@@ -59,7 +59,7 @@ jobs:
         # diff -u <(echo -n) <(gofmt -d -s .)
 
     - 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.27.0
+      run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.41.1
 
     - name: Run Linter
       run: golangci-lint run --timeout=10m -v

.gitignore

@@ -5,6 +5,7 @@
 *.so
 *.dylib
 *.jar
+*.log
 
 # Test binary, build with `go test -c`
 *.test

README.md

@@ -151,6 +151,11 @@ If you are using [apache/dubbo-go](https://github.com/apache/dubbo-go) and think
              <img width="222px"  src="https://gw.alicdn.com/tfs/TB1HPATMrrpK1RjSZTEXXcWAVXa-260-74.png">
           </a>
       </td>
+      <td align="center"  valign="middle">
+          <a href="https://www.autohome.com.cn" target="_blank">
+             <img width="222px"  src="https://avatars.githubusercontent.com/u/18279051?s=200&v=4">
+          </a>
+      </td>      
     </tr>
     <tr></tr>
   </tbody>

README_CN.md

@@ -150,6 +150,11 @@ go get dubbo.apache.org/dubbo-go/v3
            <img width="222px"  src="https://gw.alicdn.com/tfs/TB1HPATMrrpK1RjSZTEXXcWAVXa-260-74.png">
         </a>
       </td>
+      <td align="center"  valign="middle">
+          <a href="https://www.autohome.com.cn" target="_blank">
+             <img width="222px"  src="https://avatars.githubusercontent.com/u/18279051?s=200&v=4">
+          </a>
+      </td>       
     </tr>
     <tr></tr>
   </tbody>

cluster/cluster_impl/available_cluster_invoker_test.go

@@ -26,6 +26,7 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/base_cluster_invoker.go

@@ -19,6 +19,7 @@ package cluster_impl
 
 import (
 	perrors "github.com/pkg/errors"
+
 	"go.uber.org/atomic"
 )
 

cluster/cluster_impl/broadcast_cluster_invoker_test.go

@@ -26,6 +26,7 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/failback_cluster_test.go

@@ -27,7 +27,9 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	perrors "github.com/pkg/errors"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/failfast_cluster_test.go

@@ -25,7 +25,9 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	perrors "github.com/pkg/errors"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/failover_cluster_test.go

@@ -26,6 +26,7 @@ import (
 
 import (
 	perrors "github.com/pkg/errors"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -40,10 +41,6 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
 )
 
-// ///////////////////////////
-// mock invoker
-// ///////////////////////////
-
 // nolint
 type MockInvoker struct {
 	url       *common.URL

cluster/cluster_impl/failsafe_cluster_test.go

@@ -25,7 +25,9 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	perrors "github.com/pkg/errors"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/forking_cluster_test.go

@@ -28,6 +28,7 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/cluster_impl/zone_aware_cluster_invoker_test.go

@@ -25,6 +25,7 @@ import (
 
 import (
 	"github.com/golang/mock/gomock"
+
 	"github.com/stretchr/testify/assert"
 )
 

cluster/router/chain/chain.go

@@ -24,6 +24,7 @@ import (
 
 import (
 	perrors "github.com/pkg/errors"
+
 	"go.uber.org/atomic"
 )
 

cluster/router/v3router/judger/attachment_match_judger_test.go

@@ -18,7 +18,6 @@
 package judger
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	"testing"
 )
 
@@ -27,6 +26,7 @@ import (
 )
 
 import (
+	"dubbo.apache.org/dubbo-go/v3/config"
 	"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
 )
 

cluster/router/v3router/judger/bool_match_judger_test.go

@@ -18,14 +18,17 @@
 package judger
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	"testing"
 )
 
 import (
 	"github.com/stretchr/testify/assert"
 )
 
+import (
+	"dubbo.apache.org/dubbo-go/v3/config"
+)
+
 func TestBoolMatchJudger(t *testing.T) {
 	assert.True(t, newBoolMatchJudger(&config.BoolMatch{
 		Exact: true,

cluster/router/v3router/judger/double_match_judger_test.go

@@ -18,14 +18,17 @@
 package judger
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	"testing"
 )
 
 import (
 	"github.com/stretchr/testify/assert"
 )
 
+import (
+	"dubbo.apache.org/dubbo-go/v3/config"
+)
+
 func TestDoubleMatchJudger(t *testing.T) {
 	assert.True(t, newDoubleMatchJudger(&config.DoubleMatch{
 		Exact: 3.14159,

cluster/router/v3router/judger/double_range_match_judger_test.go

@@ -18,14 +18,17 @@
 package judger
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	"testing"
 )
 
 import (
 	"github.com/stretchr/testify/assert"
 )
 
+import (
+	"dubbo.apache.org/dubbo-go/v3/config"
+)
+
 func TestDoubleRangeMatchJudger(t *testing.T) {
 	assert.True(t, newDoubleRangeMatchJudger(&config.DoubleRangeMatch{
 		Start: 1.0,

cluster/router/v3router/judger/list_double_match_judger_test.go

@@ -18,14 +18,17 @@
 package judger
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	"testing"
 )
 
 import (
 	"github.com/stretchr/testify/assert"
 )
 
+import (
+	"dubbo.apache.org/dubbo-go/v3/config"
+)
+
 func TestListDoubleMatchJudger_Judge(t *testing.T) {
 	assert.True(t, newListDoubleMatchJudger(&config.ListDoubleMatch{
 		Oneof: []*config.DoubleMatch{

cluster/router/v3router/judger/list_string_match_judger_test.go

@@ -18,14 +18,17 @@
 package judger
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	"testing"
 )
 
 import (
 	"github.com/stretchr/testify/assert"
 )
 
+import (
+	"dubbo.apache.org/dubbo-go/v3/config"
+)
+
 func TestListStringMatchJudger(t *testing.T) {
 	assert.True(t, newListStringMatchJudger(&config.ListStringMatch{
 		Oneof: []*config.StringMatch{{Exact: "abd"}},

cluster/router/v3router/judger/method_match_judger_test.go

@@ -18,7 +18,6 @@
 package judger
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	"reflect"
 	"testing"
 )
@@ -28,6 +27,7 @@ import (
 )
 
 import (
+	"dubbo.apache.org/dubbo-go/v3/config"
 	"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
 )
 

cluster/router/v3router/judger/string_match_judger.go

@@ -18,11 +18,14 @@
 package judger
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	"regexp"
 	"strings"
 )
 
+import (
+	"dubbo.apache.org/dubbo-go/v3/config"
+)
+
 // nolint
 type StringMatchJudger struct {
 	config.StringMatch

cluster/router/v3router/judger/string_match_judger_test.go

@@ -18,14 +18,17 @@
 package judger
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	"testing"
 )
 
 import (
 	"github.com/stretchr/testify/assert"
 )
 
+import (
+	"dubbo.apache.org/dubbo-go/v3/config"
+)
+
 func TestNewStringMatchJudger(t *testing.T) {
 	assert.True(t, NewStringMatchJudger(&config.StringMatch{
 		Exact: "abc",

cluster/router/v3router/k8s_api/listener_handler_impl.go

@@ -18,16 +18,18 @@
 package k8s_api
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	metav "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
+
 	"k8s.io/client-go/kubernetes/scheme"
+
 	"k8s.io/client-go/rest"
 )
 
 import (
 	"dubbo.apache.org/dubbo-go/v3/cluster/router/v3router/k8s_crd"
+	"dubbo.apache.org/dubbo-go/v3/config"
 	"dubbo.apache.org/dubbo-go/v3/config_center"
 	"dubbo.apache.org/dubbo-go/v3/remoting"
 )

cluster/router/v3router/k8s_crd/client.go

@@ -29,8 +29,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
+
 	"k8s.io/client-go/kubernetes/scheme"
+
 	"k8s.io/client-go/rest"
+
 	"k8s.io/client-go/tools/cache"
 )
 

cluster/router/v3router/k8s_crd/listener_handler.go

@@ -21,6 +21,7 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
+
 	"k8s.io/client-go/rest"
 )
 

cluster/router/v3router/router_chain.go

@@ -18,7 +18,6 @@
 package v3router
 
 import (
-	"dubbo.apache.org/dubbo-go/v3/config"
 	"encoding/json"
 	"io"
 	"strings"
@@ -33,6 +32,7 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/cluster/router/v3router/k8s_api"
 	"dubbo.apache.org/dubbo-go/v3/common"
 	"dubbo.apache.org/dubbo-go/v3/common/logger"
+	"dubbo.apache.org/dubbo-go/v3/config"
 	"dubbo.apache.org/dubbo-go/v3/config_center"
 	"dubbo.apache.org/dubbo-go/v3/protocol"
 	"dubbo.apache.org/dubbo-go/v3/remoting"