This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 384c872 fix(tracing): add StartSpanFromContext to jaeger test case &
fix some error (#145)
384c872 is described below
commit 384c872c5143895edd5cb24680ce85cd177d1938
Author: Mulavar <[email protected]>
AuthorDate: Sat Jun 19 15:38:38 2021 +0800
fix(tracing): add StartSpanFromContext to jaeger test case & fix some error
(#145)
---
go.mod | 2 +-
go.sum | 2 ++
tracing/grpc/README.md | 2 +-
tracing/grpc/go-client/app/client.go | 3 +++
tracing/grpc/go-client/profiles/test/client.yml | 2 +-
tracing/grpc/go-server/app/server.go | 1 +
6 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/go.mod b/go.mod
index 72b8356..f607d0b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,7 @@
module github.com/apache/dubbo-go-samples
require (
- dubbo.apache.org/dubbo-go/v3 v3.0.0-20210616063255-fc7191759069
+ dubbo.apache.org/dubbo-go/v3 v3.0.0-20210618063649-ffb278cb0f53
github.com/alibaba/sentinel-golang v1.0.2
github.com/apache/dubbo-getty v1.4.3
github.com/apache/dubbo-go-hessian2 v1.9.2
diff --git a/go.sum b/go.sum
index bde7c3d..0dd4cfb 100644
--- a/go.sum
+++ b/go.sum
@@ -15,6 +15,8 @@ cloud.google.com/go/storage v1.0.0/go.mod
h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod
h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
dubbo.apache.org/dubbo-go/v3 v3.0.0-20210616063255-fc7191759069
h1:kV5/cbsj3tK+0DD7cw0/l4k4+xkJjupPsWQF/nkMgaw=
dubbo.apache.org/dubbo-go/v3 v3.0.0-20210616063255-fc7191759069/go.mod
h1:2l+IXuSuJvEk2g/ze1la8t1sX+yJH220aHo6JJVriM8=
+dubbo.apache.org/dubbo-go/v3 v3.0.0-20210618063649-ffb278cb0f53
h1:O5cV9vTAzLdO2zCWM3P/9EgzyvHOZt255MJ5BIYlWOM=
+dubbo.apache.org/dubbo-go/v3 v3.0.0-20210618063649-ffb278cb0f53/go.mod
h1:2l+IXuSuJvEk2g/ze1la8t1sX+yJH220aHo6JJVriM8=
github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod
h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-autorest/autorest v0.9.0/go.mod
h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
github.com/Azure/go-autorest/autorest v0.9.3/go.mod
h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0=
diff --git a/tracing/grpc/README.md b/tracing/grpc/README.md
index 1cb0b1f..b43fafd 100644
--- a/tracing/grpc/README.md
+++ b/tracing/grpc/README.md
@@ -30,7 +30,7 @@ Then run go server.
Set Jaeger ENV variable
```
CONF_CONSUMER_FILE_PATH=xxxxxxxxxxxxx
-JAEGER_AGENT_PORT=32769
+JAEGER_AGENT_PORT=6831
JAEGER_AGENT_HOST=localhost
JAEGER_SERVICE_NAME=GrpcClient
JAEGER_SAMPLER_PARAM=1
diff --git a/tracing/grpc/go-client/app/client.go
b/tracing/grpc/go-client/app/client.go
index 619ac1c..52da882 100644
--- a/tracing/grpc/go-client/app/client.go
+++ b/tracing/grpc/go-client/app/client.go
@@ -38,6 +38,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
_ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory"
"dubbo.apache.org/dubbo-go/v3/config"
+ _ "dubbo.apache.org/dubbo-go/v3/config_center/zookeeper"
_ "dubbo.apache.org/dubbo-go/v3/filter/filter_impl"
_ "dubbo.apache.org/dubbo-go/v3/protocol/dubbo"
_ "dubbo.apache.org/dubbo-go/v3/protocol/grpc"
@@ -69,6 +70,7 @@ func main() {
config.Load()
time.Sleep(time.Second)
+ span, _ := opentracing.StartSpanFromContext(context.Background(),
"Test-JAEGER-Client-Service")
gxlog.CInfo("\n\n\nstart to test dubbo")
reply := &HelloReply{}
req := &HelloRequest{
@@ -79,6 +81,7 @@ func main() {
panic(err)
}
gxlog.CInfo("client response result: %v\n", reply)
+ span.Finish()
initSignal()
}
diff --git a/tracing/grpc/go-client/profiles/test/client.yml
b/tracing/grpc/go-client/profiles/test/client.yml
index e0c0737..0573612 100644
--- a/tracing/grpc/go-client/profiles/test/client.yml
+++ b/tracing/grpc/go-client/profiles/test/client.yml
@@ -18,7 +18,7 @@ application:
module : "dubbogo say-hello client"
version : "0.0.1"
owner : "ZX"
- environment : "dev"
+ environment : "test"
registries :
"demoZk":
diff --git a/tracing/grpc/go-server/app/server.go
b/tracing/grpc/go-server/app/server.go
index efc63db..520c52e 100644
--- a/tracing/grpc/go-server/app/server.go
+++ b/tracing/grpc/go-server/app/server.go
@@ -31,6 +31,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
_ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory"
"dubbo.apache.org/dubbo-go/v3/config"
+ _ "dubbo.apache.org/dubbo-go/v3/config_center/zookeeper"
_ "dubbo.apache.org/dubbo-go/v3/filter/filter_impl"
_ "dubbo.apache.org/dubbo-go/v3/protocol/grpc"
_ "dubbo.apache.org/dubbo-go/v3/registry/protocol"
