Skip to content

Commit c3d6f7a

Browse files
xuzhijvnxuzhijvn
committed
upgrade dubbo-go version
1 parent f9da5bc commit c3d6f7a

File tree

6 files changed

+167
-79
lines changed

6 files changed

+167
-79
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* compatibility/apisix: Example integrating apache/apisix with Dubbo-go
1111
* compatibility/async: Callback (asynchronous) and one-way RPC example
1212
* compatibility/config-api: How to use Dubbo-go by APIs without configuration files
13-
* compatibility/configcenter: Usage of different config centers, including zookeeper and nacos
13+
* compatibility/configcenter: Usage of different config centers, including zookeeper, nacos and apollo
1414
* compatibility/context: How to transfer request context between multiple producers/consumers
1515
* compatibility/direct: Direct invocation example
1616
* compatibility/error: Error handling and triple protocol examples

‎README_CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatibility/apisix：apache/apisix 与 Dubbo-go 整合示例
77
* compatibility/async：通过 callback 方式进行异步 RPC 及单向调用示例
88
* compatibility/config-api：无需配置文件，使用 API 启动 Dubbo-go 服务
9-
* compatibility/configcenter：多种配置中心（如 zookeeper、nacos）用法示例
9+
* compatibility/configcenter：多种配置中心（如 zookeeper、nacos、apollo）用法示例
1010
* compatibility/context：多生产者/消费者间传递请求 context 示例
1111
* compatibility/direct：直连调用示例，无需注册中心
1212
* compatibility/error：错误处理与 triple 协议示例

‎config_center/apollo/go-client/cmd/main.go‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,28 @@ package main
1919

2020
import (
2121
"context"
22+
)
2223

24+
import (
2325
"dubbo.apache.org/dubbo-go/v3"
2426
"dubbo.apache.org/dubbo-go/v3/config_center"
2527
_ "dubbo.apache.org/dubbo-go/v3/imports"
26-
greet "github.com/apache/dubbo-go-samples/config_center/apollo/proto"
28+
2729
"github.com/dubbogo/gost/log/logger"
2830
)
2931

32+
import (
33+
greet "github.com/apache/dubbo-go-samples/config_center/apollo/proto"
34+
)
35+
3036
// Apollo Configuration Center Parameters
3137
const (
32-
apolloMetaAddress = "tony2c4g:8080"
38+
apolloMetaAddress = "127.0.0.1:8080"
3339
apolloAppID = "SampleApp"
3440
apolloCluster = "default"
3541
apolloNamespace = "dubbo.yml"
3642
)
3743

38-
const configCenterApolloClientConfig = `## set in config center, namespace is 'dubbo.yml', appId is 'SampleApp'
39-
dubbo:
40-
registries:
41-
demoZK:
42-
protocol: zookeeper
43-
timeout: 3s
44-
address: 127.0.0.1:2181
45-
consumer:
46-
references:
47-
GreeterClientImpl:
48-
protocol: tri
49-
interface: com.apache.dubbo.sample.basic.IGreeter
50-
`
51-
5244
func main() {
5345
// Initialize client using configuration center
5446
ins, err := dubbo.NewInstance(
@@ -59,7 +51,7 @@ func main() {
5951
config_center.WithDataID(apolloNamespace),
6052
config_center.WithAppID(apolloAppID),
6153
config_center.WithCluster(apolloCluster),
62-
config_center.WithFileExtProperties(),
54+
//config_center.WithFileExtProperties(),
6355
),
6456
)
6557
if err != nil {

‎config_center/apollo/go-server/cmd/main.go‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,23 @@ package main
1919

2020
import (
2121
"context"
22+
)
2223

24+
import (
2325
"dubbo.apache.org/dubbo-go/v3"
2426
"dubbo.apache.org/dubbo-go/v3/config_center"
2527
_ "dubbo.apache.org/dubbo-go/v3/imports"
26-
greet "github.com/apache/dubbo-go-samples/config_center/apollo/proto"
28+
2729
"github.com/dubbogo/gost/log/logger"
2830
)
2931

32+
import (
33+
greet "github.com/apache/dubbo-go-samples/config_center/apollo/proto"
34+
)
35+
3036
// Apollo Configuration Center Parameters
3137
const (
32-
apolloMetaAddress = "tony2c4g:8080"
38+
apolloMetaAddress = "127.0.0.1:8080"
3339
apolloAppID = "SampleApp"
3440
apolloCluster = "default"
3541
apolloNamespace = "dubbo.yml"
@@ -43,23 +49,6 @@ func (srv *GreetTripleServer) Greet(ctx context.Context, req *greet.GreetRequest
4349
return resp, nil
4450
}
4551

46-
const configCenterApolloServerConfig = `## set in config center, namespace is 'dubbo.yml', appId is 'SampleApp'
47-
dubbo:
48-
registries:
49-
demoZK:
50-
protocol: zookeeper
51-
timeout: 3s
52-
address: '127.0.0.1:2181'
53-
protocols:
54-
triple:
55-
name: tri
56-
port: 20000
57-
provider:
58-
services:
59-
GreeterProvider:
60-
interface: com.apache.dubbo.sample.basic.IGreeter
61-
`
62-
6352
func main() {
6453
ins, err := dubbo.NewInstance(
6554
dubbo.WithConfigCenter(
@@ -69,7 +58,7 @@ func main() {
6958
config_center.WithDataID(apolloNamespace),
7059
config_center.WithAppID(apolloAppID),
7160
config_center.WithCluster(apolloCluster),
72-
config_center.WithFileExtProperties(),
61+
//config_center.WithFileExtProperties(),
7362
),
7463
)
7564
if err != nil {

‎go.mod‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module github.com/apache/dubbo-go-samples
22

33
require (
4-
dubbo.apache.org/dubbo-go/v3 v3.3.0
4+
dubbo.apache.org/dubbo-go/v3 v3.3.1-0.20250712115945-43c8bd03adb0
55
github.com/SkyAPM/go2sky v1.5.0
66
github.com/SkyAPM/go2sky-plugins/dubbo-go v0.0.0-20220718123631-cb8f743b16cf
77
github.com/alibaba/sentinel-golang v1.0.4
@@ -34,24 +34,21 @@ require (
3434
)
3535

3636
require (
37-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
3837
github.com/RoaringBitmap/roaring v1.2.3 // indirect
3938
github.com/Workiva/go-datastructures v1.0.52 // indirect
4039
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 // indirect
4140
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704 // indirect
4241
github.com/apache/dubbo-getty v1.4.10 // indirect
42+
github.com/apolloconfig/agollo/v4 v4.4.0 // indirect
4343
github.com/beorn7/perks v1.0.1 // indirect
4444
github.com/bits-and-blooms/bitset v1.2.0 // indirect
4545
github.com/buger/jsonparser v1.1.1 // indirect
4646
github.com/bytedance/sonic v1.11.6 // indirect
4747
github.com/bytedance/sonic/loader v0.1.1 // indirect
4848
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
49-
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
5049
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5150
github.com/cloudwego/base64x v0.1.4 // indirect
5251
github.com/cloudwego/iasm v0.2.0 // indirect
53-
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
54-
github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50 // indirect
5552
github.com/coreos/go-semver v0.3.0 // indirect
5653
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 // indirect
5754
github.com/creasty/defaults v1.5.2 // indirect
@@ -60,8 +57,7 @@ require (
6057
github.com/dop251/goja v0.0.0-20240220182346-e401ed450204 // indirect
6158
github.com/dustin/go-humanize v1.0.1 // indirect
6259
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
63-
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
64-
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
60+
github.com/fsnotify/fsnotify v1.6.0 // indirect
6561
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
6662
github.com/gin-contrib/sse v0.1.0 // indirect
6763
github.com/go-logr/logr v1.4.1 // indirect
@@ -72,6 +68,7 @@ require (
7268
github.com/go-playground/validator/v10 v10.20.0 // indirect
7369
github.com/go-resty/resty/v2 v2.7.0 // indirect
7470
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
71+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
7572
github.com/goccy/go-json v0.10.2 // indirect
7673
github.com/golang/mock v1.6.0 // indirect
7774
github.com/golang/snappy v0.0.4 // indirect
@@ -85,6 +82,7 @@ require (
8582
github.com/hashicorp/errwrap v1.1.0 // indirect
8683
github.com/hashicorp/go-multierror v1.1.1 // indirect
8784
github.com/hashicorp/golang-lru v0.5.4 // indirect
85+
github.com/hashicorp/hcl v1.0.0 // indirect
8886
github.com/hashicorp/vault/sdk v0.7.0 // indirect
8987
github.com/influxdata/tdigest v0.0.1 // indirect
9088
github.com/jinzhu/copier v0.3.5 // indirect
@@ -98,7 +96,6 @@ require (
9896
github.com/magiconair/properties v1.8.7 // indirect
9997
github.com/mattn/go-colorable v0.1.13 // indirect
10098
github.com/mattn/go-isatty v0.0.20 // indirect
101-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
10299
github.com/mitchellh/copystructure v1.2.0 // indirect
103100
github.com/mitchellh/go-homedir v1.1.0 // indirect
104101
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -108,6 +105,7 @@ require (
108105
github.com/mschoch/smat v0.2.0 // indirect
109106
github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
110107
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect
108+
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
111109
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
112110
github.com/pelletier/go-toml v1.9.3 // indirect
113111
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
@@ -116,14 +114,22 @@ require (
116114
github.com/pmezard/go-difflib v1.0.0 // indirect
117115
github.com/polarismesh/polaris-go v1.3.0 // indirect
118116
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
119-
github.com/prometheus/client_golang v1.13.0 // indirect
117+
github.com/prometheus/client_golang v1.19.1 // indirect
120118
github.com/prometheus/client_model v0.5.0 // indirect
121-
github.com/prometheus/common v0.37.0 // indirect
122-
github.com/prometheus/procfs v0.8.0 // indirect
119+
github.com/prometheus/common v0.48.0 // indirect
120+
github.com/prometheus/procfs v0.12.0 // indirect
121+
github.com/quic-go/qpack v0.5.1 // indirect
122+
github.com/quic-go/quic-go v0.52.0 // indirect
123123
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
124124
github.com/shoenig/go-m1cpu v0.1.6 // indirect
125125
github.com/sirupsen/logrus v1.9.3 // indirect
126126
github.com/spaolacci/murmur3 v1.1.0 // indirect
127+
github.com/spf13/afero v1.10.0 // indirect
128+
github.com/spf13/cast v1.3.1 // indirect
129+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
130+
github.com/spf13/pflag v1.0.5 // indirect
131+
github.com/spf13/viper v1.8.1 // indirect
132+
github.com/subosito/gotenv v1.2.0 // indirect
127133
github.com/tklauser/go-sysconf v0.3.12 // indirect
128134
github.com/tklauser/numcpus v0.6.1 // indirect
129135
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -143,16 +149,18 @@ require (
143149
go.opentelemetry.io/otel/trace v1.26.0 // indirect
144150
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
145151
go.uber.org/atomic v1.10.0 // indirect
152+
go.uber.org/mock v0.5.0 // indirect
146153
go.uber.org/multierr v1.8.0 // indirect
147154
go.uber.org/zap v1.21.0 // indirect
148155
golang.org/x/arch v0.8.0 // indirect
149156
golang.org/x/crypto v0.31.0 // indirect
157+
golang.org/x/mod v0.18.0 // indirect
150158
golang.org/x/net v0.33.0 // indirect
151-
golang.org/x/oauth2 v0.21.0 // indirect
152159
golang.org/x/sync v0.10.0 // indirect
153160
golang.org/x/sys v0.28.0 // indirect
154161
golang.org/x/text v0.21.0 // indirect
155162
golang.org/x/time v0.5.0 // indirect
163+
golang.org/x/tools v0.22.0 // indirect
156164
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
157165
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
158166
gopkg.in/ini.v1 v1.66.2 // indirect

0 commit comments

Comments
 (0)