Skip to content

Commit 31e1bb5

Browse files
mark4zdependabot[bot]
mark4z
and
dependabot[bot]
authored
specify loadbalance strategy on dubbo proxy (#615)
* 1.0.0 (#595) * V1.0.0 Changes (#588) * [feature] cors support options request (#591) * V1.0.0 Changes * [feature] cors support options request * 1.0.0 (#602) * V1.0.0 Changes (#588) * [feature] cors support options request (#591) * V1.0.0 Changes * [feature] cors support options request * Move Pixiu cmd files in /cmd/pixiu to pkg/cmd (#596) * remove unused types JTypeMapper check & support default types. (#597) * build(deps): bump jinja2 in /samples/bookinfo/src/productpage (#607) Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.3 to 3.1.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](pallets/jinja@2.11.3...3.1.3) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github.com/lestrrat-go/jwx from 1.2.26 to 1.2.27 (#609) Bumps [github.com/lestrrat-go/jwx](https://github.com/lestrrat-go/jwx) from 1.2.26 to 1.2.27. - [Release notes](https://github.com/lestrrat-go/jwx/releases) - [Changelog](https://github.com/lestrrat-go/jwx/blob/v1.2.27/Changes) - [Commits](lestrrat-go/jwx@v1.2.26...v1.2.27) --- updated-dependencies: - dependency-name: github.com/lestrrat-go/jwx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github.com/lestrrat-go/jwx from 1.2.27 to 1.2.28 (#610) Bumps [github.com/lestrrat-go/jwx](https://github.com/lestrrat-go/jwx) from 1.2.27 to 1.2.28. - [Release notes](https://github.com/lestrrat-go/jwx/releases) - [Changelog](https://github.com/lestrrat-go/jwx/blob/v1.2.28/Changes) - [Commits](lestrrat-go/jwx@v1.2.27...v1.2.28) --- updated-dependencies: - dependency-name: github.com/lestrrat-go/jwx dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 1.0.0 (#614) * V1.0.0 Changes (#588) * [feature] cors support options request (#591) * V1.0.0 Changes * [feature] cors support options request * Move Pixiu cmd files in /cmd/pixiu to pkg/cmd (#596) * remove unused types JTypeMapper check & support default types. (#597) * specify loadbalance strategy on dubbo proxy (#613) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 8654c60 commit 31e1bb5

File tree

5 files changed

+27
-20
lines changed

5 files changed

+27
-20
lines changed

‎go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ require (
7070
github.com/jhump/protoreflect v1.9.0
7171
github.com/kr/pretty v0.3.0
7272
github.com/kylelemons/godebug v1.1.0
73-
github.com/lestrrat-go/jwx v1.2.26
73+
github.com/lestrrat-go/jwx v1.2.28
7474
github.com/lucas-clemente/quic-go v0.27.0
7575
github.com/mattn/go-isatty v0.0.14
7676
github.com/miekg/dns v1.1.48
@@ -110,11 +110,11 @@ require (
110110
go.opentelemetry.io/proto/otlp v0.19.0
111111
go.uber.org/atomic v1.9.0
112112
go.uber.org/zap v1.21.0
113-
golang.org/x/crypto v0.14.0
113+
golang.org/x/crypto v0.17.0
114114
golang.org/x/net v0.17.0
115115
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
116116
golang.org/x/sync v0.1.0
117-
golang.org/x/sys v0.13.0
117+
golang.org/x/sys v0.15.0
118118
golang.org/x/time v0.1.0
119119
gomodules.xyz/jsonpatch/v3 v3.0.1
120120
google.golang.org/api v0.74.0
@@ -233,7 +233,7 @@ require (
233233
github.com/kr/text v0.2.0 // indirect
234234
github.com/leodido/go-urn v1.2.1 // indirect
235235
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
236-
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
236+
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
237237
github.com/lestrrat-go/httpcc v1.0.1 // indirect
238238
github.com/lestrrat-go/iter v1.0.2 // indirect
239239
github.com/lestrrat-go/option v1.0.1 // indirect
@@ -309,8 +309,8 @@ require (
309309
go.uber.org/multierr v1.8.0 // indirect
310310
golang.org/x/arch v0.0.0-20200826200359-b19915210f00 // indirect
311311
golang.org/x/mod v0.8.0 // indirect
312-
golang.org/x/term v0.13.0 // indirect
313-
golang.org/x/text v0.13.0 // indirect
312+
golang.org/x/term v0.15.0 // indirect
313+
golang.org/x/text v0.14.0 // indirect
314314
golang.org/x/tools v0.6.0 // indirect
315315
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
316316
gomodules.xyz/orderedmap v0.1.0 // indirect

‎go.sum

+12-13
Original file line numberDiff line numberDiff line change
@@ -1090,14 +1090,14 @@ github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
10901090
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
10911091
github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A=
10921092
github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y=
1093-
github.com/lestrrat-go/blackmagic v1.0.1 h1:lS5Zts+5HIC/8og6cGHb0uCcNCa3OUt1ygh3Qz2Fe80=
1094-
github.com/lestrrat-go/blackmagic v1.0.1/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
1093+
github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N+AkAr5k=
1094+
github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
10951095
github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
10961096
github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
10971097
github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI=
10981098
github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
1099-
github.com/lestrrat-go/jwx v1.2.26 h1:4iFo8FPRZGDYe1t19mQP0zTRqA7n8HnJ5lkIiDvJcB0=
1100-
github.com/lestrrat-go/jwx v1.2.26/go.mod h1:MaiCdGbn3/cckbOFSCluJlJMmp9dmZm5hDuIkx8ftpQ=
1099+
github.com/lestrrat-go/jwx v1.2.28 h1:uadI6o0WpOVrBSf498tRXZIwPpEtLnR9CvqPFXeI5sA=
1100+
github.com/lestrrat-go/jwx v1.2.28/go.mod h1:nF+91HEMh/MYFVwKPl5HHsBGMPscqbQb+8IDQdIazP8=
11011101
github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
11021102
github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
11031103
github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
@@ -1856,9 +1856,8 @@ golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5y
18561856
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
18571857
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
18581858
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
1859-
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
1860-
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
1861-
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
1859+
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
1860+
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
18621861
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
18631862
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
18641863
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2180,14 +2179,14 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
21802179
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21812180
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21822181
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2183-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
2184-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2182+
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
2183+
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
21852184
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
21862185
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
21872186
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
21882187
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
2189-
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
2190-
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
2188+
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
2189+
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
21912190
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
21922191
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
21932192
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2201,8 +2200,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
22012200
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
22022201
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
22032202
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
2204-
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
2205-
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
2203+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
2204+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
22062205
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
22072206
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
22082207
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎pixiu/pkg/client/dubbo/config.go

+2
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@ type DubboProxyConfig struct {
3333
AutoResolve bool `yaml:"auto_resolve" json:"auto_resolve,omitempty"`
3434
// Protoset path to load protoset files
3535
Protoset []string `yaml:"protoset" json:"protoset,omitempty"`
36+
// Load
37+
LoadBalance string `yaml:"load_balance" json:"load_balance,omitempty"`
3638
}

‎pixiu/pkg/client/dubbo/dubbo.go

+6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ import (
2727

2828
import (
2929
_ "dubbo.apache.org/dubbo-go/v3/cluster/cluster/failover"
30+
_ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance/consistenthashing"
31+
_ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance/leastactive"
32+
_ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance/p2c"
3033
_ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance/random"
34+
_ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance/ringhash"
35+
_ "dubbo.apache.org/dubbo-go/v3/cluster/loadbalance/roundrobin"
3136
"dubbo.apache.org/dubbo-go/v3/common/constant"
3237
_ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory"
3338
dg "dubbo.apache.org/dubbo-go/v3/config"
@@ -313,6 +318,7 @@ func (dc *Client) create(key string, irequest fc.IntegrationRequest) *generic.Ge
313318
Generic: "true",
314319
Version: irequest.DubboBackendConfig.Version,
315320
Group: irequest.Group,
321+
Loadbalance: dc.dubboProxyConfig.LoadBalance,
316322
}
317323

318324
if len(irequest.DubboBackendConfig.Retries) == 0 {

‎samples/bookinfo/src/productpage/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ greenlet==0.4.15
1313
idna==2.8
1414
itsdangerous==1.1.0
1515
jaeger-client==3.13.0
16-
Jinja2==2.11.3
16+
Jinja2==3.1.3
1717
json2html==1.2.1
1818
MarkupSafe==0.23
1919
nose==1.3.7

0 commit comments

Comments
 (0)