Merge pull request #2 from apache/3.0

3.0
WilliamLeaves · May 22, 2021 · cbbbd8d · cbbbd8d
2 parents 1721de0 + 0f83b1a
commit cbbbd8d
Show file tree

Hide file tree

Showing 471 changed files with 5,470 additions and 2,721 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -35,7 +35,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Cache dependencies
-      uses: actions/[email protected].4
+      uses: actions/[email protected].5
       with:
         # Cache
         path: ~/go/pkg/mod
@@ -71,11 +71,10 @@ jobs:
 
     - name: Integrate Test
       run: |
-        chmod +x integrate_test.sh && ./integrate_test.sh ${{github.event.pull_request.head.repo.full_name}} ${{github.event.pull_request.head.sha}}
+        chmod +x integrate_test.sh && [[ -n "${{github.event.pull_request.head.repo.full_name}}" ]] && [[ -n "${{github.event.pull_request.head.sha}}" ]] && ./integrate_test.sh ${{github.event.pull_request.head.repo.full_name}} ${{github.event.pull_request.head.sha}} || ./integrate_test.sh $GITHUB_REPOSITORY $GITHUB_SHA
 
     - name: Post Coverage
       run: bash <(curl -s https://codecov.io/bash)
 
     - name: Hello world
-      run: echo Hello world ${{ secrets.DING_TOKEN }} ${{ secrets.DING_SIGN }}
-
+      run: echo Hello world ${{ secrets.DING_TOKEN }} ${{ secrets.DING_SIGN }}
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,5 +1,36 @@
 # Release Notes
 ---
+
+## 3.0.0
+
+### New Features
+- [Add triple protocol](https://github.com/apache/dubbo-go/pull/1071)
+- [Add dubbo3 router](https://github.com/apache/dubbo-go/pull/1187)
+- [Add app-level remote service discovery](https://github.com/apache/dubbo-go/pull/1161)
+- [Add default config](https://github.com/apache/dubbo-go/pull/1073)
+- [Add pass through proxy factory](https://github.com/apache/dubbo-go/pull/1081)
+
+### Enhancement
+- [Replace default config string with const value](https://github.com/apache/dubbo-go/pull/1182)
+- [Add retry times in zookeeper starting](https://github.com/apache/dubbo-go/pull/1179)
+- [Client pool enhance](https://github.com/apache/dubbo-go/pull/1119)
+- [Impl the way of load configure file](https://github.com/apache/dubbo-go/pull/1099)
+
+### Bugfixes
+- [Fix: get failback error](https://github.com/apache/dubbo-go/pull/1177)
+- [Fix: delete a service provider when using k8s hpa](https://github.com/apache/dubbo-go/pull/1157)
+- [Fix: fix reExporter bug when config-center {applicationName}.configurator data change](https://github.com/apache/dubbo-go/pull/1144)
+- [Fix: stop the provider app panic error](https://github.com/apache/dubbo-go/pull/1129)
+
+### Dependencies
+- [bump github.com/RoaringBitmap/roaring from 0.6.0 to 0.6.1](https://github.com/apache/dubbo-go/pull/1195)
+- [bump github.com/RoaringBitmap/roaring from 0.5.5 to 0.6.0](https://github.com/apache/dubbo-go/pull/1175)
+- [bump github.com/RoaringBitmap/roaring from 0.5.5 to 0.6.0](https://github.com/apache/dubbo-go/pull/1163)
+- [Bump github.com/magiconair/properties from 1.8.4 to 1.8.5](https://github.com/apache/dubbo-go/pull/1115)
+
+Milestone:
+- [https://github.com/apache/dubbo-go/milestone/9](https://github.com/apache/dubbo-go/milestone/9?closed=1)
+
 ## 1.5.6
 
 ### New Features

diff --git a/README.md b/README.md
@@ -65,17 +65,17 @@ Finished List:
     * JsonRPC V2
     * Hessian V2
     * [json for grpc](https://github.com/apache/dubbo-go/pull/582)
+    * protobuf
 
 - Protocol
     * Dubbo
+    * [Triple](https://github.com/dubbogo/triple)
     * Jsonrpc2.0
     * [gRPC](https://github.com/apache/dubbo-go/pull/311)
     * [RESTful](https://github.com/apache/dubbo-go/pull/352)
 
 - Router
-    * [Condition router](https://github.com/apache/dubbo-go/pull/294)
-    * [Health check router](https://github.com/apache/dubbo-go/pull/389)
-    * [Dynamic_tag_router](https://github.com/apache/dubbo-go/pull/703)
+    * [Dubbo3 router](https://github.com/apache/dubbo-go/pull/1187)
 
 - Registry
     * ZooKeeper
@@ -128,17 +128,12 @@ Finished List:
     * [For grpc](https://github.com/apache/dubbo-go/pull/397)
 
 - Metadata Center
-    * [Nacos](https://github.com/apache/dubbo-go/pull/522)
-    * [Zookeeper](https://github.com/apache/dubbo-go/pull/633)
-    * [Etcd](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/metadata/report/etcd/report.go)
-    * [Consul](https://github.com/apache/dubbo-go/pull/633)
-
-- Service discovery
-    * [Nacos](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/nacos/service_discovery.go)
-    * [Zookeeper](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/zookeeper/service_discovery.go)
-    * [Etcd](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/etcdv3/service_discovery.go)
-    * [File](https://github.com/apache/dubbo-go/pull/732)
-
+    * [Nacos(Local)](https://github.com/apache/dubbo-go/pull/522)
+    * [Zookeeper(Local)](https://github.com/apache/dubbo-go/pull/633)
+    * [Etcd(Local)](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/metadata/report/etcd/report.go)
+    * [Consul(Local)](https://github.com/apache/dubbo-go/pull/633)
+    * [Zookeeper(Remoting)](https://github.com/apache/dubbo-go/pull/1161)
+
 - Tool
     * [Dubbo-go-cli](https://github.com/apache/dubbo-go/pull/818)
 
@@ -202,7 +197,22 @@ If u want to communicate with our community, pls scan the following dubbobo Ding
 </table>
 </div>
 
-If u want to visit the wechat group, pls add my wechat AlexanderStocks.
+If u want to visit the wechat group, pls add my wechat AlexanderStocks or scan the following wechat picture.
+
+<div>
+<table>
+  <tbody>
+  <tr></tr>
+    <tr>
+      <td align="center"  valign="middle">
+          <img width="80px" height="115px" src="./doc/pic/misc/dubbogo-wechat.png">
+        </a>
+      </td>
+    </tr>
+    <tr></tr>
+  </tbody>
+</table>
+</div>
 
 We welcome the friends who can give us constructing suggestions instead of known-nothing.
 
@@ -288,8 +298,21 @@ If you are using [apache/dubbo-go](https://github.com/apache/dubbo-go) and think
           <img width="222px"  src="https://mosn.io/images/community/duodian.png">
         </a>
       </td>
+      <td align="center"  valign="middle">
+        <a href="http://www.ruubypay.com" target="_blank">
+           <img width="222px"  src="http://website.ruubypay.com/wifi/image/line5.png">
+        </a>
+      </td>
+      <td align="center"  valign="middle">
+          <a href="https://www.dingtalk.com" target="_blank">
+             <img width="222px"  src="https://gw.alicdn.com/tfs/TB1HPATMrrpK1RjSZTEXXcWAVXa-260-74.png">
+          </a>
+      </td>
     </tr>
     <tr></tr>
   </tbody>
 </table>
 </div>
+
+[MORE USER CASE](https://github.com/apache/dubbo-go/issues/2)
+
diff --git a/README_CN.md b/README_CN.md
@@ -64,17 +64,17 @@ Apache License, Version 2.0
     * JsonRPC V2
     * Hessian V2
     * [json for grpc](https://github.com/apache/dubbo-go/pull/582)
+    * protobuf
 
 - 协议
     * Dubbo
+    * [Triple](https://github.com/dubbogo/triple)
     * Jsonrpc2.0
     * [gRPC](https://github.com/apache/dubbo-go/pull/311)
     * [RESTful](https://github.com/apache/dubbo-go/pull/352)
 
 - 路由器
-    * [Condition router](https://github.com/apache/dubbo-go/pull/294)
-    * [Health check router](https://github.com/apache/dubbo-go/pull/389)
-    * [Dynamic_tag_router](https://github.com/apache/dubbo-go/pull/703)
+    * [Dubbo3统一路由规则](https://github.com/apache/dubbo-go/pull/1187)
 
 - 注册中心
     * ZooKeeper
@@ -127,17 +127,12 @@ Apache License, Version 2.0
     * [For grpc](https://github.com/apache/dubbo-go/pull/397)
 
 - 元数据中心
-    * [Nacos](https://github.com/apache/dubbo-go/pull/522)
-    * [Zookeeper](https://github.com/apache/dubbo-go/pull/633)
-    * [Etcd](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/metadata/report/etcd/report.go)
-    * [Consul](https://github.com/apache/dubbo-go/pull/633)
-
-- 服务发现
-    * [Nacos](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/nacos/service_discovery.go)
-    * [Zookeeper](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/zookeeper/service_discovery.go)
-    * [Etcd](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/registry/etcdv3/service_discovery.go)
-    * [File](https://github.com/apache/dubbo-go/pull/732)
-
+    * [Nacos(Local)](https://github.com/apache/dubbo-go/pull/522)
+    * [Zookeeper(Local)](https://github.com/apache/dubbo-go/pull/633)
+    * [Etcd(Local)](https://github.com/apache/dubbo-go/blob/9a5990d9a9c3d5e6633c0d7d926c156416bcb931/metadata/report/etcd/report.go)
+    * [Consul(Local)](https://github.com/apache/dubbo-go/pull/633)
+    * [Zookeeper(Remoting)](https://github.com/apache/dubbo-go/pull/1161)
+
 - 工具箱
     * [Dubbo-go-cli](https://github.com/apache/dubbo-go/pull/818)
 
@@ -201,7 +196,7 @@ make test
 </table>
 </div>
 
-dubbogo 社区已经开通微信公众号 "dubbogo大区"，可在微信搜索 "dubbogo大区" 或者扫描如下二维码关注，可通过公众号私信留言加入 dubbogo 微信社区。
+dubbogo 社区已经开通微信公众号，可在微信搜索 "dubbogo示土区" 或者扫描如下二维码关注，可通过公众号私信留言加入 dubbogo 微信社区。
 
 <div>
 <table>
@@ -301,8 +296,21 @@ dubbogo 社区已经开通微信公众号 "dubbogo大区"，可在微信搜索 "
           <img width="222px"  src="https://mosn.io/images/community/duodian.png">
         </a>
       </td>
+      <td align="center"  valign="middle">
+        <a href="http://www.ruubypay.com" target="_blank">
+           <img width="222px"  src="http://website.ruubypay.com/wifi/image/line5.png">
+        </a>
+      </td>
+      <td align="center"  valign="middle">
+        <a href="https://www.dingtalk.com" target="_blank">
+           <img width="222px"  src="https://gw.alicdn.com/tfs/TB1HPATMrrpK1RjSZTEXXcWAVXa-260-74.png">
+        </a>
+      </td>
     </tr>
     <tr></tr>
   </tbody>
 </table>
 </div>
+
+[更多用户示例](https://github.com/apache/dubbo-go/issues/2)
+
diff --git a/cluster/cluster.go b/cluster/cluster.go
@@ -18,7 +18,7 @@
 package cluster
 
 import (
-	"github.com/apache/dubbo-go/protocol"
+	"dubbo.apache.org/dubbo-go/v3/protocol"
 )
 
 // Cluster

diff --git a/cluster/cluster_impl/available_cluster.go b/cluster/cluster_impl/available_cluster.go
@@ -18,9 +18,9 @@
 package cluster_impl
 
 import (
-	"github.com/apache/dubbo-go/cluster"
-	"github.com/apache/dubbo-go/common/extension"
-	"github.com/apache/dubbo-go/protocol"
+	"dubbo.apache.org/dubbo-go/v3/cluster"
+	"dubbo.apache.org/dubbo-go/v3/common/extension"
+	"dubbo.apache.org/dubbo-go/v3/protocol"
 )
 
 type availableCluster struct{}
@@ -40,5 +40,5 @@ func NewAvailableCluster() cluster.Cluster {
 
 // Join returns a baseClusterInvoker instance
 func (cluster *availableCluster) Join(directory cluster.Directory) protocol.Invoker {
-	return NewAvailableClusterInvoker(directory)
+	return buildInterceptorChain(NewAvailableClusterInvoker(directory))
 }
diff --git a/cluster/cluster_impl/available_cluster_invoker.go b/cluster/cluster_impl/available_cluster_invoker.go
@@ -27,8 +27,8 @@ import (
 )
 
 import (
-	"github.com/apache/dubbo-go/cluster"
-	"github.com/apache/dubbo-go/protocol"
+	"dubbo.apache.org/dubbo-go/v3/cluster"
+	"dubbo.apache.org/dubbo-go/v3/protocol"
 )
 
 type availableClusterInvoker struct {

diff --git a/cluster/cluster_impl/available_cluster_invoker_test.go b/cluster/cluster_impl/available_cluster_invoker_test.go
@@ -30,14 +30,14 @@ import (
 )
 
 import (
-	"github.com/apache/dubbo-go/cluster/directory"
-	"github.com/apache/dubbo-go/cluster/loadbalance"
-	"github.com/apache/dubbo-go/common"
-	"github.com/apache/dubbo-go/common/constant"
-	"github.com/apache/dubbo-go/common/extension"
-	"github.com/apache/dubbo-go/protocol"
-	"github.com/apache/dubbo-go/protocol/invocation"
-	"github.com/apache/dubbo-go/protocol/mock"
+	"dubbo.apache.org/dubbo-go/v3/cluster/directory"
+	"dubbo.apache.org/dubbo-go/v3/cluster/loadbalance"
+	"dubbo.apache.org/dubbo-go/v3/common"
+	"dubbo.apache.org/dubbo-go/v3/common/constant"
+	"dubbo.apache.org/dubbo-go/v3/common/extension"
+	"dubbo.apache.org/dubbo-go/v3/protocol"
+	"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
+	"dubbo.apache.org/dubbo-go/v3/protocol/mock"
 )
 
 var availableUrl, _ = common.NewURL(fmt.Sprintf("dubbo://%s:%d/com.ikurento.user.UserProvider",

diff --git a/cluster/cluster_impl/base_cluster_invoker.go b/cluster/cluster_impl/base_cluster_invoker.go
@@ -17,30 +17,25 @@
 
 package cluster_impl
 
-import (
-	"context"
-)
-
 import (
 	perrors "github.com/pkg/errors"
 	"go.uber.org/atomic"
 )
 
 import (
-	"github.com/apache/dubbo-go/cluster"
-	"github.com/apache/dubbo-go/common"
-	"github.com/apache/dubbo-go/common/constant"
-	"github.com/apache/dubbo-go/common/extension"
-	"github.com/apache/dubbo-go/common/logger"
-	"github.com/apache/dubbo-go/protocol"
+	"dubbo.apache.org/dubbo-go/v3/cluster"
+	"dubbo.apache.org/dubbo-go/v3/common"
+	"dubbo.apache.org/dubbo-go/v3/common/constant"
+	"dubbo.apache.org/dubbo-go/v3/common/extension"
+	"dubbo.apache.org/dubbo-go/v3/common/logger"
+	"dubbo.apache.org/dubbo-go/v3/protocol"
 )
 
 type baseClusterInvoker struct {
 	directory      cluster.Directory
 	availablecheck bool
 	destroyed      *atomic.Bool
 	stickyInvoker  protocol.Invoker
-	interceptor    cluster.ClusterInterceptor
 }
 
 func newBaseClusterInvoker(directory cluster.Directory) baseClusterInvoker {
@@ -165,20 +160,6 @@ func (invoker *baseClusterInvoker) doSelectInvoker(lb cluster.LoadBalance, invoc
 	return nil
 }
 
-func (invoker *baseClusterInvoker) Invoke(ctx context.Context, invocation protocol.Invocation) protocol.Result {
-	if invoker.interceptor != nil {
-		invoker.interceptor.BeforeInvoker(ctx, invocation)
-
-		result := invoker.interceptor.DoInvoke(ctx, invocation)
-
-		invoker.interceptor.AfterInvoker(ctx, invocation)
-
-		return result
-	}
-
-	return nil
-}
-
 func isInvoked(selectedInvoker protocol.Invoker, invoked []protocol.Invoker) bool {
 	for _, i := range invoked {
 		if i == selectedInvoker {

diff --git a/cluster/cluster_impl/base_cluster_invoker_test.go b/cluster/cluster_impl/base_cluster_invoker_test.go
@@ -27,10 +27,10 @@ import (
 )
 
 import (
-	"github.com/apache/dubbo-go/cluster/loadbalance"
-	"github.com/apache/dubbo-go/common"
-	"github.com/apache/dubbo-go/protocol"
-	"github.com/apache/dubbo-go/protocol/invocation"
+	"dubbo.apache.org/dubbo-go/v3/cluster/loadbalance"
+	"dubbo.apache.org/dubbo-go/v3/common"
+	"dubbo.apache.org/dubbo-go/v3/protocol"
+	"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
 )
 
 const (

diff --git a/cluster/cluster_impl/broadcast_cluster.go b/cluster/cluster_impl/broadcast_cluster.go
@@ -18,9 +18,9 @@
 package cluster_impl
 
 import (
-	"github.com/apache/dubbo-go/cluster"
-	"github.com/apache/dubbo-go/common/extension"
-	"github.com/apache/dubbo-go/protocol"
+	"dubbo.apache.org/dubbo-go/v3/cluster"
+	"dubbo.apache.org/dubbo-go/v3/common/extension"
+	"dubbo.apache.org/dubbo-go/v3/protocol"
 )
 
 type broadcastCluster struct{}
@@ -41,5 +41,5 @@ func NewBroadcastCluster() cluster.Cluster {
 
 // Join returns a baseClusterInvoker instance
 func (cluster *broadcastCluster) Join(directory cluster.Directory) protocol.Invoker {
-	return newBroadcastClusterInvoker(directory)
+	return buildInterceptorChain(newBroadcastClusterInvoker(directory))
 }
diff --git a/cluster/cluster_impl/broadcast_cluster_invoker.go b/cluster/cluster_impl/broadcast_cluster_invoker.go
@@ -22,9 +22,9 @@ import (
 )
 
 import (
-	"github.com/apache/dubbo-go/cluster"
-	"github.com/apache/dubbo-go/common/logger"
-	"github.com/apache/dubbo-go/protocol"
+	"dubbo.apache.org/dubbo-go/v3/cluster"
+	"dubbo.apache.org/dubbo-go/v3/common/logger"
+	"dubbo.apache.org/dubbo-go/v3/protocol"
 )
 
 type broadcastClusterInvoker struct {