From c514f9891e0d3165c5dc83b56a1dc27fb9a370b1 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Sat, 4 Mar 2023 23:31:46 +0300 Subject: [PATCH] update deps Signed-off-by: Vasiliy Tolstov --- broker/segmentio/broker_test.go | 2 +- go.mod | 6 +++--- go.sum | 21 +++++++++++---------- server/grpc/grpc_test.go | 2 +- server/http/http_test.go | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/broker/segmentio/broker_test.go b/broker/segmentio/broker_test.go index a308548..197e213 100644 --- a/broker/segmentio/broker_test.go +++ b/broker/segmentio/broker_test.go @@ -16,11 +16,11 @@ import ( segmentio "go.unistack.org/micro-broker-segmentio/v3" victoriameter "go.unistack.org/micro-meter-victoriametrics/v3" https "go.unistack.org/micro-server-http/v3" + meterhandler "go.unistack.org/micro-server-http/v3/handler/meter" "go.unistack.org/micro/v3/broker" "go.unistack.org/micro/v3/codec" "go.unistack.org/micro/v3/logger" "go.unistack.org/micro/v3/meter" - meterhandler "go.unistack.org/micro/v3/meter/handler" "go.unistack.org/micro/v3/server" ) diff --git a/go.mod b/go.mod index b89862d..1633bc1 100644 --- a/go.mod +++ b/go.mod @@ -40,13 +40,13 @@ require ( go.unistack.org/micro-meter-victoriametrics/v3 v3.8.6 go.unistack.org/micro-proto/v3 v3.3.1 go.unistack.org/micro-router-register/v3 v3.9.0 - go.unistack.org/micro-server-grpc/v3 v3.10.1 - go.unistack.org/micro-server-http/v3 v3.10.11 + go.unistack.org/micro-server-grpc/v3 v3.10.3 + go.unistack.org/micro-server-http/v3 v3.10.12 go.unistack.org/micro-server-tcp/v3 v3.10.0 go.unistack.org/micro-tracer-opentracing/v3 v3.10.1 go.unistack.org/micro-wrapper-recovery/v3 v3.8.3 go.unistack.org/micro-wrapper-sql/v3 v3.10.3 - go.unistack.org/micro/v3 v3.10.13 + go.unistack.org/micro/v3 v3.10.14 golang.org/x/crypto v0.6.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect diff --git a/go.sum b/go.sum index 8f1c864..69437b1 100644 --- a/go.sum +++ b/go.sum @@ -904,10 +904,10 @@ go.unistack.org/micro-proto/v3 v3.3.1 h1:nQ0MtWvP2G3QrpOgawVOPhpZZYkq6umTGDqs8Fx go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE= go.unistack.org/micro-router-register/v3 v3.9.0 h1:1TFfUmKwy39zmkqp+a82WvGdpaxJF2+7DY/Gx481jbc= go.unistack.org/micro-router-register/v3 v3.9.0/go.mod h1:pt4a4hOJn8tniXObwDSAx1cdYR75k35FIp9fiqdWxNc= -go.unistack.org/micro-server-grpc/v3 v3.10.1 h1:53OGnSOKSRN5SGu8oOvrbf+zh85+fLqctXIGB9jBAi0= -go.unistack.org/micro-server-grpc/v3 v3.10.1/go.mod h1:9XEDMLU3lkBRo0GJv/xrWQPraKy7NyK0HhG4XkaJIC8= -go.unistack.org/micro-server-http/v3 v3.10.11 h1:lLrZufToHr8kNEhcxnIy+nvyyHhHYk+QwAJ4JHixkr0= -go.unistack.org/micro-server-http/v3 v3.10.11/go.mod h1:kvEBu/lQv1mEQ6MfiNL8RidbGSB0RZY/OYRTHSPgb9g= +go.unistack.org/micro-server-grpc/v3 v3.10.3 h1:CElbqru8XDsurppuw9natEKNBgEHL0m/SymJYT9r+AA= +go.unistack.org/micro-server-grpc/v3 v3.10.3/go.mod h1:n0mNurVocRBOt7iydDgORGWQ4M/wFaJFmdKHNX57IiQ= +go.unistack.org/micro-server-http/v3 v3.10.12 h1:pJgsycMP/hC0iizP1JO1G7QskAB9/rbL3VEzWCTclfI= +go.unistack.org/micro-server-http/v3 v3.10.12/go.mod h1:vTSaZCg+ImB6qj/3pU04NT1AxLu7j0eeF4WF85zebik= go.unistack.org/micro-server-tcp/v3 v3.10.0 h1:6Z4tY4Pt/bdYe7Kq/kerya3uxkZPJj/mMzOCwAegjcI= go.unistack.org/micro-server-tcp/v3 v3.10.0/go.mod h1:Q17E4lWRsx6dmT7eGEhV29v1DrneKgs/stKfCZkCI6o= go.unistack.org/micro-tracer-opentracing/v3 v3.10.1 h1:IF1kzISQuHQBKfy6mqWifBm7sbpNYccH1KM5DOyW2Hg= @@ -924,12 +924,10 @@ go.unistack.org/micro/v3 v3.9.2/go.mod h1:7ssIWk+PJXvb2nSl8NUnQRs32JJEId2IDi9Pob go.unistack.org/micro/v3 v3.9.13/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI= go.unistack.org/micro/v3 v3.9.14/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI= go.unistack.org/micro/v3 v3.9.18/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI= -go.unistack.org/micro/v3 v3.10.1/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI= go.unistack.org/micro/v3 v3.10.4/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI= go.unistack.org/micro/v3 v3.10.11/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI= -go.unistack.org/micro/v3 v3.10.12/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI= -go.unistack.org/micro/v3 v3.10.13 h1:GtQwCXvOw3ywwgNKRPE/NA7hNoHnVIvFElDjjfy5Xtc= -go.unistack.org/micro/v3 v3.10.13/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI= +go.unistack.org/micro/v3 v3.10.14 h1:7fgLpwGlCN67twhwtngJDEQvrMkUBDSA5vzZqxIDqNE= +go.unistack.org/micro/v3 v3.10.14/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -1044,6 +1042,7 @@ golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1168,12 +1167,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1186,6 +1186,7 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1466,7 +1467,7 @@ google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= -google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= +google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= diff --git a/server/grpc/grpc_test.go b/server/grpc/grpc_test.go index 0255d08..dc5ce89 100644 --- a/server/grpc/grpc_test.go +++ b/server/grpc/grpc_test.go @@ -12,6 +12,7 @@ import ( regRouter "go.unistack.org/micro-router-register/v3" gserver "go.unistack.org/micro-server-grpc/v3" httpsrv "go.unistack.org/micro-server-http/v3" + health "go.unistack.org/micro-server-http/v3/handler/health" gpb "go.unistack.org/micro-tests/server/grpc/gproto" pb "go.unistack.org/micro-tests/server/grpc/proto" "go.unistack.org/micro/v3/broker" @@ -23,7 +24,6 @@ import ( "go.unistack.org/micro/v3/register" "go.unistack.org/micro/v3/router" "go.unistack.org/micro/v3/server" - health "go.unistack.org/micro/v3/server/health" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/encoding/gzip" diff --git a/server/http/http_test.go b/server/http/http_test.go index 3d8a583..39e4acf 100644 --- a/server/http/http_test.go +++ b/server/http/http_test.go @@ -20,12 +20,12 @@ import ( xmlcodec "go.unistack.org/micro-codec-xml/v3" vmeter "go.unistack.org/micro-meter-victoriametrics/v3" httpsrv "go.unistack.org/micro-server-http/v3" + meterhandler "go.unistack.org/micro-server-http/v3/handler/meter" pb "go.unistack.org/micro-tests/server/http/proto" "go.unistack.org/micro/v3/client" "go.unistack.org/micro/v3/logger" lwrapper "go.unistack.org/micro/v3/logger/wrapper" "go.unistack.org/micro/v3/metadata" - handler "go.unistack.org/micro/v3/meter/handler" mwrapper "go.unistack.org/micro/v3/meter/wrapper" "go.unistack.org/micro/v3/register" "go.unistack.org/micro/v3/server" @@ -375,7 +375,7 @@ func TestNativeClientServer(t *testing.T) { if err := pb.RegisterTestDoubleServer(srv, h); err != nil { t.Fatal(err) } - if err := handler.RegisterMeterServiceServer(srv, handler.NewHandler(handler.Meter(srv.Options().Meter))); err != nil { + if err := meterhandler.RegisterMeterServiceServer(srv, meterhandler.NewHandler(meterhandler.Meter(srv.Options().Meter))); err != nil { t.Fatal(err) } // start server