Skip to content

Commit 2f686e2

Browse files
seefloodseeflood
authored
Merge branch 'main' into update_config
2 parents f231739 + 79772ee commit 2f686e2

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎cmd/layotto/cmd.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,9 @@ func ExtensionsRegister(_ *cli.Context) {
275275
trace.RegisterDriver("SOFATracer", trace.NewDefaultDriverImpl())
276276

277277
// 2. xprotocol action register
278-
// ResgisterXProtocolAction is MOSN's xprotocol framework's extensions.
278+
// RegisterXProtocolAction is MOSN's xprotocol framework's extensions.
279279
// when a xprotocol implementation (defined by api.XProtocolCodec) registered, the registered action will be called.
280-
xprotocol.ResgisterXProtocolAction(xstream.NewConnPool, xstream.NewStreamFactory, func(codec api.XProtocolCodec) {
280+
xprotocol.RegisterXProtocolAction(xstream.NewConnPool, xstream.NewStreamFactory, func(codec api.XProtocolCodec) {
281281
name := codec.ProtocolName()
282282
trace.RegisterTracerBuilder("SOFATracer", name, xtrace.NewTracer)
283283
})

‎cmd/layotto_multiple_api/cmd.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,9 @@ func ExtensionsRegister(_ *cli.Context) {
275275
trace.RegisterDriver("SOFATracer", trace.NewDefaultDriverImpl())
276276

277277
// 2. xprotocol action register
278-
// ResgisterXProtocolAction is MOSN's xprotocol framework's extensions.
278+
// RegisterXProtocolAction is MOSN's xprotocol framework's extensions.
279279
// when a xprotocol implementation (defined by api.XProtocolCodec) registered, the registered action will be called.
280-
xprotocol.ResgisterXProtocolAction(xstream.NewConnPool, xstream.NewStreamFactory, func(codec api.XProtocolCodec) {
280+
xprotocol.RegisterXProtocolAction(xstream.NewConnPool, xstream.NewStreamFactory, func(codec api.XProtocolCodec) {
281281
name := codec.ProtocolName()
282282
trace.RegisterTracerBuilder("SOFATracer", name, xtrace.NewTracer)
283283
})

‎cmd/layotto_without_xds/cmd.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ func ExtensionsRegister(_ *cli.Context) {
172172
trace.RegisterDriver("SOFATracer", trace.NewDefaultDriverImpl())
173173

174174
// 2. xprotocol action register
175-
// ResgisterXProtocolAction is MOSN's xprotocol framework's extensions.
175+
// RegisterXProtocolAction is MOSN's xprotocol framework's extensions.
176176
// when a xprotocol implementation (defined by api.XProtocolCodec) registered, the registered action will be called.
177-
xprotocol.ResgisterXProtocolAction(xstream.NewConnPool, xstream.NewStreamFactory, func(codec api.XProtocolCodec) {
177+
xprotocol.RegisterXProtocolAction(xstream.NewConnPool, xstream.NewStreamFactory, func(codec api.XProtocolCodec) {
178178
name := codec.ProtocolName()
179179
trace.RegisterTracerBuilder("SOFATracer", name, xtrace.NewTracer)
180180
})

‎components/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ require (
4040
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
4141
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 // indirect
4242
google.golang.org/grpc v1.38.0
43-
mosn.io/api v1.0.0
44-
mosn.io/mosn v1.0.2-0.20220624093205-6d37b64a8f06
45-
mosn.io/pkg v1.0.0
43+
mosn.io/api v1.1.0
44+
mosn.io/mosn v1.1.0
45+
mosn.io/pkg v1.1.0
4646
)
4747

4848
replace github.com/klauspost/compress => github.com/klauspost/compress v1.13.1

‎components/go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -1399,14 +1399,14 @@ k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAG
13991399
launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM=
14001400
launchpad.net/xmlpath v0.0.0-20130614043138-000000000004/go.mod h1:vqyExLOM3qBx7mvYRkoxjSCF945s0mbe7YynlKYXtsA=
14011401
mosn.io/api v0.0.0-20210204052134-5b9a826795fd/go.mod h1:TBv4bz2f2RbpgdohbVAFRFVOoN8YyEUiLH3jAh752Qc=
1402-
mosn.io/api v1.0.0 h1:EK5jHRaqeszV3tKzgNKX1NZf1JdPU9QTF6E276xQHPk=
1403-
mosn.io/api v1.0.0/go.mod h1:TBv4bz2f2RbpgdohbVAFRFVOoN8YyEUiLH3jAh752Qc=
1402+
mosn.io/api v1.1.0 h1:9N07gYdtsOLhdBkU4yp9/O1C7AWoBlpFGY9KfgkWfCY=
1403+
mosn.io/api v1.1.0/go.mod h1:UoBKBSsG+ZrRZvCpKcj/x2M9IMFmCg3Wz03D15O5OzM=
14041404
mosn.io/holmes v1.0.1/go.mod h1:pZjPamcZk4Z16xlZySG1rU9psLUCOx6MVNuj/3bfkEk=
1405-
mosn.io/mosn v1.0.2-0.20220624093205-6d37b64a8f06 h1:qOuOZq/AkFdIVv3iVGpua5KuBveTQCrKM3szhmSYNZM=
1406-
mosn.io/mosn v1.0.2-0.20220624093205-6d37b64a8f06/go.mod h1:vPhLsrbmbRfucz9znc08PiYxi0b+890NrAqe1JB7f3E=
1405+
mosn.io/mosn v1.1.0 h1:6FdQhPTVe8vgFUr3GCfvZLi5WmWQD++EzNKXuEMLQDc=
1406+
mosn.io/mosn v1.1.0/go.mod h1:HK6n2cC0j5TT2GTUcmBzS7GaajE+9vu1F59br3mjBmE=
14071407
mosn.io/pkg v0.0.0-20211217101631-d914102d1baf/go.mod h1:tK3Vbw6CcVeJ9H/BGjJ1wn6hRXt4Oxjfq1+gkOM0zG8=
1408-
mosn.io/pkg v1.0.0 h1:zmvPVfk5zZ5il7lEwa9hdtt77vWVtpioKD1DHTQ/PcI=
1409-
mosn.io/pkg v1.0.0/go.mod h1:tK3Vbw6CcVeJ9H/BGjJ1wn6hRXt4Oxjfq1+gkOM0zG8=
1408+
mosn.io/pkg v1.1.0 h1:UVm3iv053WXk8RrsO4JPo1iWZCzPsa2a9W/FPRDYjEk=
1409+
mosn.io/pkg v1.1.0/go.mod h1:tK3Vbw6CcVeJ9H/BGjJ1wn6hRXt4Oxjfq1+gkOM0zG8=
14101410
mosn.io/proxy-wasm-go-host v0.1.1-0.20210524020952-3fb13ba763a6 h1:6aWdJ5db4OHFhSnSDvZcrAfsJSglbuZNW3DdBPt6PGg=
14111411
mosn.io/proxy-wasm-go-host v0.1.1-0.20210524020952-3fb13ba763a6/go.mod h1:wBRY9Xjf77GZhvAuEc6nQXZ6dQK39kNU2ok/+Z8mSU8=
14121412
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ require (
3636
google.golang.org/grpc v1.39.0
3737
google.golang.org/grpc/examples v0.0.0-20210818220435-8ab16ef276a3
3838
google.golang.org/protobuf v1.27.1
39-
mosn.io/api v1.0.0
39+
mosn.io/api v1.1.0
4040
mosn.io/layotto/components v0.0.0-20220413092851-55c58dbb1a23
4141
mosn.io/layotto/spec v0.0.0-20220413092851-55c58dbb1a23
42-
mosn.io/mosn v1.0.2-0.20220624093205-6d37b64a8f06
43-
mosn.io/pkg v1.0.0
42+
mosn.io/mosn v1.1.0
43+
mosn.io/pkg v1.1.0
4444
mosn.io/proxy-wasm-go-host v0.1.1-0.20210524020952-3fb13ba763a6
4545
nhooyr.io/websocket v1.8.7 // indirect
4646
)

‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -2130,14 +2130,14 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
21302130
launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM=
21312131
launchpad.net/xmlpath v0.0.0-20130614043138-000000000004/go.mod h1:vqyExLOM3qBx7mvYRkoxjSCF945s0mbe7YynlKYXtsA=
21322132
mosn.io/api v0.0.0-20210204052134-5b9a826795fd/go.mod h1:TBv4bz2f2RbpgdohbVAFRFVOoN8YyEUiLH3jAh752Qc=
2133-
mosn.io/api v1.0.0 h1:EK5jHRaqeszV3tKzgNKX1NZf1JdPU9QTF6E276xQHPk=
2134-
mosn.io/api v1.0.0/go.mod h1:TBv4bz2f2RbpgdohbVAFRFVOoN8YyEUiLH3jAh752Qc=
2133+
mosn.io/api v1.1.0 h1:9N07gYdtsOLhdBkU4yp9/O1C7AWoBlpFGY9KfgkWfCY=
2134+
mosn.io/api v1.1.0/go.mod h1:UoBKBSsG+ZrRZvCpKcj/x2M9IMFmCg3Wz03D15O5OzM=
21352135
mosn.io/holmes v1.0.1/go.mod h1:pZjPamcZk4Z16xlZySG1rU9psLUCOx6MVNuj/3bfkEk=
2136-
mosn.io/mosn v1.0.2-0.20220624093205-6d37b64a8f06 h1:qOuOZq/AkFdIVv3iVGpua5KuBveTQCrKM3szhmSYNZM=
2137-
mosn.io/mosn v1.0.2-0.20220624093205-6d37b64a8f06/go.mod h1:vPhLsrbmbRfucz9znc08PiYxi0b+890NrAqe1JB7f3E=
2136+
mosn.io/mosn v1.1.0 h1:6FdQhPTVe8vgFUr3GCfvZLi5WmWQD++EzNKXuEMLQDc=
2137+
mosn.io/mosn v1.1.0/go.mod h1:HK6n2cC0j5TT2GTUcmBzS7GaajE+9vu1F59br3mjBmE=
21382138
mosn.io/pkg v0.0.0-20211217101631-d914102d1baf/go.mod h1:tK3Vbw6CcVeJ9H/BGjJ1wn6hRXt4Oxjfq1+gkOM0zG8=
2139-
mosn.io/pkg v1.0.0 h1:zmvPVfk5zZ5il7lEwa9hdtt77vWVtpioKD1DHTQ/PcI=
2140-
mosn.io/pkg v1.0.0/go.mod h1:tK3Vbw6CcVeJ9H/BGjJ1wn6hRXt4Oxjfq1+gkOM0zG8=
2139+
mosn.io/pkg v1.1.0 h1:UVm3iv053WXk8RrsO4JPo1iWZCzPsa2a9W/FPRDYjEk=
2140+
mosn.io/pkg v1.1.0/go.mod h1:tK3Vbw6CcVeJ9H/BGjJ1wn6hRXt4Oxjfq1+gkOM0zG8=
21412141
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
21422142
nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
21432143
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=

0 commit comments

Comments
 (0)