application service discovery nacos reporter example (apache#123)

* service discovery nacos * service discovery nacos * service discovery nacos * change dubbo-go version * recover run xml * docker health check for nacos lazy init * prolong sleep time * change curl ip * recover run xml * print server log if test fail * add registry group param * change nacos docker:latest to 1.4.1 because 2.0.1 is not compatible * bugfix
LaurenceLiZhixin · Jun 14, 2021 · 848b52b · 848b52b
1 parent 0cbbc12
commit 848b52b
Show file tree

Hide file tree

Showing 34 changed files with 817 additions and 547 deletions.
diff --git a/.run/configcenter-nacos-server.run.xml b/.run/configcenter-nacos-server.run.xml
diff --git a/.run/zk-client.run.xml b/.run/zk-client.run.xml
@@ -1,15 +1,15 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="zk-client" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="v3service-discovery">
-    <module name="dubbo-go-samples" />
-    <working_directory value="$PROJECT_DIR$" />
-    <envs>
-      <env name="APP_LOG_CONF_FILE" value="$PROJECT_DIR$/registry/serviecdiscovery/zookeeper/go-client/conf/log.yml" />
-      <env name="CONF_CONSUMER_FILE_PATH" value="$PROJECT_DIR$/registry/servicediscovery/zookeeper/go-client/conf/client.yml" />
-    </envs>
-    <kind value="PACKAGE" />
-    <filePath value="$PROJECT_DIR$" />
-    <package value="github.com/apache/dubbo-go-samples/registry/servicediscovery/zookeeper/go-client/cmd" />
-    <directory value="$PROJECT_DIR$" />
-    <method v="2" />
-  </configuration>
+    <configuration default="false" name="zk-client" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="v3service-discovery">
+        <module name="dubbo-go-samples" />
+        <working_directory value="$PROJECT_DIR$" />
+        <envs>
+            <env name="APP_LOG_CONF_FILE" value="$PROJECT_DIR$/registry/serviecdiscovery/zookeeper/go-client/conf/log.yml" />
+            <env name="CONF_CONSUMER_FILE_PATH" value="$PROJECT_DIR$/registry/servicediscovery/zookeeper/go-client/conf/client.yml" />
+        </envs>
+        <kind value="PACKAGE" />
+        <filePath value="$PROJECT_DIR$" />
+        <package value="github.com/apache/dubbo-go-samples/registry/servicediscovery/zookeeper/go-client/cmd" />
+        <directory value="$PROJECT_DIR$" />
+        <method v="2" />
+    </configuration>
 </component>
diff --git a/.run/zk-server.run.xml b/.run/zk-server.run.xml
@@ -1,15 +1,15 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="zk-server" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="v3service-discovery">
-    <module name="dubbo-go-samples" />
-    <working_directory value="$PROJECT_DIR$" />
-    <envs>
-      <env name="APP_LOG_CONF_FILE" value="$PROJECT_DIR$/registry/serviecdiscovery/zookeeper/go-server/conf/log.yml" />
-      <env name="CONF_PROVIDER_FILE_PATH" value="$PROJECT_DIR$/registry/servicediscovery/zookeeper/go-server/conf/server.yml" />
-    </envs>
-    <kind value="PACKAGE" />
-    <filePath value="$PROJECT_DIR$" />
-    <package value="github.com/apache/dubbo-go-samples/registry/servicediscovery/zookeeper/go-server/cmd" />
-    <directory value="$PROJECT_DIR$" />
-    <method v="2" />
-  </configuration>
+    <configuration default="false" name="zk-server" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="v3service-discovery">
+        <module name="dubbo-go-samples" />
+        <working_directory value="$PROJECT_DIR$" />
+        <envs>
+            <env name="APP_LOG_CONF_FILE" value="$PROJECT_DIR$/registry/serviecdiscovery/zookeeper/go-server/conf/log.yml" />
+            <env name="CONF_PROVIDER_FILE_PATH" value="$PROJECT_DIR$/registry/servicediscovery/zookeeper/go-server/conf/server.yml" />
+        </envs>
+        <kind value="PACKAGE" />
+        <filePath value="$PROJECT_DIR$" />
+        <package value="github.com/apache/dubbo-go-samples/registry/servicediscovery/zookeeper/go-server/cmd" />
+        <directory value="$PROJECT_DIR$" />
+        <method v="2" />
+    </configuration>
 </component>
diff --git a/build/Makefile b/build/Makefile
@@ -87,6 +87,12 @@ config:
 	@-test -f $(PROJECT_DIR)/conf/client.yml && cat $(PROJECT_DIR)/conf/client.yml | sed "s#\$$HOST_IP#$(DOCKER_HOST_IP)#g" > $(OUT_DIR)/conf/client.yml && echo "  > $(OUT_DIR)/conf/client.yml"
 	@-test -f $(PROJECT_DIR)/conf/router_config.yml && cat $(PROJECT_DIR)/conf/router_config.yml | sed "s#\$$HOST_IP#$(DOCKER_HOST_IP)#g" > $(OUT_DIR)/conf/router_config.yml && echo "  > $(OUT_DIR)/conf/router_config.yml"
 
+## docker-health-check: check services health on docker
+.PHONY: docker-health-check
+docker-health-check:
+	$(info   >  run docker health check with $(PROJECT_DIR)/docker/docker-health-check.sh)
+	@-test -f $(PROJECT_DIR)/docker/docker-health-check.sh && bash -f $(PROJECT_DIR)/docker/docker-health-check.sh
+
 ## docker-up: Shutdown dependency services on docker
 .PHONY: docker-up
 docker-up:
@@ -114,6 +120,12 @@ start: build
 	@-$(OUT_DIR)/$(PROJECT_NAME)$(EXT_NAME) > $(LOG_FILE) 2>&1 & echo $$! > $(PID)
 	@cat $(PID) | sed "/^/s/^/  \>  PID: /"
 
+## start: print application log (for server)
+.PHONY: print-server-log
+print-server-log:
+	$(info   >  print server log with $(LOG_FILE))
+	@-cat $(LOG_FILE)
+
 ## run: Run the application (for client)
 .PHONY: run
 run: export CONF_CONSUMER_FILE_PATH ?= $(OUT_DIR)/conf/client.yml

diff --git a/chain/backend/tests/integration/main_test.go b/chain/backend/tests/integration/main_test.go
@@ -20,15 +20,15 @@
 package integration
 
 import (
-	_ "dubbo.apache.org/dubbo-go/v3cluster/cluster_impl"
-	_ "dubbo.apache.org/dubbo-go/v3cluster/loadbalance"
-	_ "dubbo.apache.org/dubbo-go/v3common/proxy/proxy_factory"
-	"dubbo.apache.org/dubbo-go/v3config"
-	_ "dubbo.apache.org/dubbo-go/v3filter/filter_impl"
-	_ "dubbo.apache.org/dubbo-go/v3metadata/service/inmemory"
-	_ "dubbo.apache.org/dubbo-go/v3protocol/dubbo"
-	_ "dubbo.apache.org/dubbo-go/v3registry/protocol"
-	_ "dubbo.apache.org/dubbo-go/v3registry/zookeeper"
+	_ "dubbo.apache.org/dubbo-go/v3/cluster/cluster_impl"
+	_ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance"
+	_ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory"
+	"dubbo.apache.org/dubbo-go/v3/config"
+	_ "dubbo.apache.org/dubbo-go/v3/filter/filter_impl"
+	_ "dubbo.apache.org/dubbo-go/v3/metadata/service/inmemory"
+	_ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo"
+	_ "dubbo.apache.org/dubbo-go/v3/registry/protocol"
+	_ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper"
 )
 
 import (

diff --git a/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/pkg/greeter.go b/general/dubbo3/pb/dubbogo-grpc/server/dubbogo-server/pkg/greeter.go
@@ -76,4 +76,4 @@ func (s *GreeterProvider) SayHello(ctx context.Context, in *dubbo3.HelloRequest)
 	fmt.Println("get triple header tri-req-id = ", ctx.Value(tripleConstant.TripleCtxKey(tripleConstant.TripleRequestID)))
 	fmt.Println("get triple header tri-service-version = ", ctx.Value(tripleConstant.TripleCtxKey(tripleConstant.TripleServiceVersion)))
 	return &dubbo3.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil
-}
+}
diff --git a/general/grpc/go-client/cmd/client.go b/general/grpc/go-client/cmd/client.go
@@ -35,7 +35,7 @@ import (
 	"github.com/dubbogo/gost/log"
 )
 
-import(
+import (
 	"github.com/apache/dubbo-go-samples/general/grpc/protobuf"
 )
 

diff --git a/general/grpc/go-server/pkg/greeter.go b/general/grpc/go-server/pkg/greeter.go
@@ -37,4 +37,3 @@ func (g *GreeterProvider) SayHello(ctx context.Context, req *protobuf.HelloReque
 	fmt.Printf("req: %v", req)
 	return &protobuf.HelloReply{Message: "this is message from reply"}, nil
 }
-
diff --git a/general/grpc/go-server/tests/integration/main_test.go b/general/grpc/go-server/tests/integration/main_test.go
@@ -37,7 +37,7 @@ import (
 	_ "dubbo.apache.org/dubbo-go/v3/registry/zookeeper"
 )
 
-import(
+import (
 	"github.com/apache/dubbo-go-samples/general/grpc/protobuf"
 )
 
@@ -49,4 +49,4 @@ func TestMain(m *testing.M) {
 	time.Sleep(3 * time.Second)
 
 	os.Exit(m.Run())
-}
+}
diff --git a/general/grpc/stream/go-server/app/greeter.go b/general/grpc/stream/go-server/app/greeter.go
@@ -97,4 +97,3 @@ func (g *GreeterProvider) SayHelloServerStream(req *HelloRequest, server Greeter
 	}
 	return nil
 }
-
diff --git a/go.mod b/go.mod
@@ -20,7 +20,6 @@ require (
 	github.com/transaction-wg/seata-golang v0.2.0
 	github.com/uber/jaeger-client-go v2.22.1+incompatible
 	github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
-	github.com/willf/bitset v1.1.10 // indirect
 	golang.org/x/net v0.0.0-20201224014010-6772e930b67b
 	google.golang.org/grpc v1.36.0
 	google.golang.org/protobuf v1.26.0