fix and regen

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

broker/segmentio/broker_test.go

@@ -60,7 +60,7 @@ func TestConsumerGroup(t *testing.T) {
 	if err := s.Init(); err != nil {
 		t.Fatal(err)
 	}
-	if err := meterhandler.RegisterMeterServer(s, meterhandler.NewHandler()); err != nil {
+	if err := meterhandler.RegisterMeterServiceServer(s, meterhandler.NewHandler()); err != nil {
 		t.Fatal(err)
 	}
 
@@ -220,7 +220,7 @@ func TestSub(t *testing.T) {
 	if err := s.Init(); err != nil {
 		t.Fatal(err)
 	}
-	if err := meterhandler.RegisterMeterServer(s, meterhandler.NewHandler()); err != nil {
+	if err := meterhandler.RegisterMeterServiceServer(s, meterhandler.NewHandler()); err != nil {
 		t.Fatal(err)
 	}
 
@@ -355,7 +355,7 @@ func BenchmarkPub(b *testing.B) {
 	if err := s.Init(); err != nil {
 		b.Fatal(err)
 	}
-	if err := meterhandler.RegisterMeterServer(s, meterhandler.NewHandler()); err != nil {
+	if err := meterhandler.RegisterMeterServiceServer(s, meterhandler.NewHandler()); err != nil {
 		b.Fatal(err)
 	}
 
@@ -532,7 +532,7 @@ func TestPubSub(t *testing.T) {
 	if err := s.Init(); err != nil {
 		t.Fatal(err)
 	}
-	if err := meterhandler.RegisterMeterServer(s, meterhandler.NewHandler()); err != nil {
+	if err := meterhandler.RegisterMeterServiceServer(s, meterhandler.NewHandler()); err != nil {
 		t.Fatal(err)
 	}
 

client/drpc/proto/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -8,19 +8,16 @@ package pb
 
 import (
 	context "context"
-	api "go.unistack.org/micro/v3/api"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	TestServiceName = "TestService"
-
-	TestServiceEndpoints = []api.Endpoint{}
 )
-
+var (
-func NewTestServiceEndpoints() []api.Endpoint {
+	TestServiceServerEndpoints = []v3.EndpointMetadata{}
-	return TestServiceEndpoints
+)
-}
 
 type TestServiceClient interface {
 	Call(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error)

client/drpc/proto/test_micro_rpc.pb.go

@@ -1,12 +1,12 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: test.proto
 
 package pb
 
 import (
 	context "context"
-	api "go.unistack.org/micro/v3/api"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 )
@@ -60,8 +60,6 @@ func RegisterTestServiceServer(s server.Server, sh TestServiceServer, opts ...se
 	}
 	h := &testServiceServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestServiceEndpoints {
+	nopts = append(nopts, v3.HandlerEndpoints(TestServiceServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&TestService{h}, append(nopts, opts...)...))
 }

client/grpc/gproto/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -8,21 +8,18 @@ package helloworld
 
 import (
 	context "context"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/client/grpc/proto"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 	metadata "go.unistack.org/micro/v3/metadata"
 )
 
 var (
 	TestName = "Test"
-
-	TestEndpoints = []api.Endpoint{}
 )
-
+var (
-func NewTestEndpoints() []api.Endpoint {
+	TestServerEndpoints = []v3.EndpointMetadata{}
-	return TestEndpoints
+)
-}
 
 type TestClient interface {
 	Call(ctx context.Context, req *proto.Request, opts ...client.CallOption) (*proto.Response, error)

client/grpc/gproto/test_micro_rpc.pb.go

@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: test.proto
 
 package helloworld
 
 import (
 	context "context"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/client/grpc/proto"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 	metadata "go.unistack.org/micro/v3/metadata"
 	server "go.unistack.org/micro/v3/server"
@@ -133,8 +133,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestEndpoints {
+	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }

client/http/proto/github_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: github.proto
 
@@ -8,33 +8,32 @@ package pb
 
 import (
 	context "context"
-	api "go.unistack.org/micro/v3/api"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	GithubName = "Github"
-
+)
-	GithubEndpoints = []api.Endpoint{
+var (
+	GithubServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "Github.LookupUser",
-			Path:    []string{"/users/{username}"},
+			Path:   "/users/{username}",
-			Method:  []string{"GET"},
+			Method: "GET",
-			Handler: "rpc",
+			Body:   "",
+			Stream: false,
 		},
 		{
 			Name:   "Github.LookupUserWithoutPath",
-			Path:    []string{"/{username}"},
+			Path:   "/{username}",
-			Method:  []string{"GET"},
+			Method: "GET",
-			Handler: "rpc",
+			Body:   "",
+			Stream: false,
 		},
 	}
 )
 
-func NewGithubEndpoints() []api.Endpoint {
-	return GithubEndpoints
-}
-
 type GithubClient interface {
 	LookupUser(ctx context.Context, req *LookupUserReq, opts ...client.CallOption) (*LookupUserRsp, error)
 	LookupUserWithoutPath(ctx context.Context, req *LookupUserReq, opts ...client.CallOption) (*LookupUserRsp, error)

client/http/proto/github_micro_http.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: github.proto
 
 package pb
@@ -7,7 +7,7 @@ package pb
 import (
 	context "context"
 	v3 "go.unistack.org/micro-client-http/v3"
-	api "go.unistack.org/micro/v3/api"
+	v31 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	http "net/http"
@@ -80,8 +80,6 @@ func RegisterGithubServer(s server.Server, sh GithubServer, opts ...server.Handl
 	}
 	h := &githubServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range GithubEndpoints {
+	nopts = append(nopts, v31.HandlerEndpoints(GithubServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&Github{h}, append(nopts, opts...)...))
 }

codec/proto/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -8,20 +8,17 @@ package pb
 
 import (
 	context "context"
-	api "go.unistack.org/micro/v3/api"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 	codec "go.unistack.org/micro/v3/codec"
 )
 
 var (
 	TestName = "Test"
-
-	TestEndpoints = []api.Endpoint{}
 )
-
+var (
-func NewTestEndpoints() []api.Endpoint {
+	TestServerEndpoints = []v3.EndpointMetadata{}
-	return TestEndpoints
+)
-}
 
 type TestClient interface {
 	Call(ctx context.Context, req *codec.Frame, opts ...client.CallOption) (*codec.Frame, error)

codec/proto/test_micro_http.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: test.proto
 
 package pb
@@ -7,7 +7,7 @@ package pb
 import (
 	context "context"
 	_ "go.unistack.org/micro-client-http/v3"
-	api "go.unistack.org/micro/v3/api"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 	codec "go.unistack.org/micro/v3/codec"
 	server "go.unistack.org/micro/v3/server"
@@ -48,8 +48,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestEndpoints {
+	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }

codec/segmentio/proto/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -8,19 +8,16 @@ package pb
 
 import (
 	context "context"
-	api "go.unistack.org/micro/v3/api"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	TestName = "Test"
-
-	TestEndpoints = []api.Endpoint{}
 )
-
+var (
-func NewTestEndpoints() []api.Endpoint {
+	TestServerEndpoints = []v3.EndpointMetadata{}
-	return TestEndpoints
+)
-}
 
 type TestClient interface {
 	Call(ctx context.Context, req *Request, opts ...client.CallOption) (*Response, error)

codec/segmentio/proto/test_micro_http.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: test.proto
 
 package pb
@@ -7,7 +7,7 @@ package pb
 import (
 	context "context"
 	_ "go.unistack.org/micro-client-http/v3"
-	api "go.unistack.org/micro/v3/api"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 )
@@ -47,8 +47,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestEndpoints {
+	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }

flow/proto/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -8,47 +8,46 @@ package pb
 
 import (
 	context "context"
-	api "go.unistack.org/micro/v3/api"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	TestServiceName = "TestService"
-
+)
-	TestServiceEndpoints = []api.Endpoint{
+var (
+	TestServiceServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "TestService.LookupUser",
-			Path:    []string{"/v1/user/{name}"},
+			Path:   "/v1/user/{name}",
-			Method:  []string{"GET"},
+			Method: "GET",
-			Handler: "rpc",
+			Body:   "",
+			Stream: false,
 		},
 		{
 			Name:   "TestService.UpdateUser",
-			Path:    []string{"/v1/user/{name}"},
+			Path:   "/v1/user/{name}",
-			Method:  []string{"PUT"},
+			Method: "PUT",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 		{
 			Name:   "TestService.DeleteUser",
-			Path:    []string{"/v1/user/{name}"},
+			Path:   "/v1/user/{name}",
-			Method:  []string{"DELETE"},
+			Method: "DELETE",
-			Handler: "rpc",
+			Body:   "",
+			Stream: false,
 		},
 		{
 			Name:   "TestService.MailUser",
-			Path:    []string{"/v1/user/{name}/mail"},
+			Path:   "/v1/user/{name}/mail",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 	}
 )
 
-func NewTestServiceEndpoints() []api.Endpoint {
-	return TestServiceEndpoints
-}
-
 type TestServiceClient interface {
 	LookupUser(ctx context.Context, req *LookupUserReq, opts ...client.CallOption) (*LookupUserRsp, error)
 	UpdateUser(ctx context.Context, req *UpdateUserReq, opts ...client.CallOption) (*UpdateUserRsp, error)

flow/proto/test_micro_http.pb.go

@@ -1,13 +1,14 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: test.proto
 
 package pb
 
 import (
+	"fmt"
 	context "context"
 	v3 "go.unistack.org/micro-client-http/v3"
-	api "go.unistack.org/micro/v3/api"
+	v31 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	http "net/http"
@@ -38,6 +39,7 @@ func (c *testServiceClient) LookupUser(ctx context.Context, req *LookupUserReq,
 	rsp := &LookupUserRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.LookupUser", req), rsp, opts...)
 	if err != nil {
+		fmt.Printf("AAA1 %v\n", err)
 		return nil, err
 	}
 	return rsp, nil
@@ -59,6 +61,7 @@ func (c *testServiceClient) UpdateUser(ctx context.Context, req *UpdateUserReq,
 	rsp := &UpdateUserRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.UpdateUser", req), rsp, opts...)
 	if err != nil {
+		fmt.Printf("AAA2 %v\n", err)
 		return nil, err
 	}
 	return rsp, nil
@@ -79,6 +82,7 @@ func (c *testServiceClient) DeleteUser(ctx context.Context, req *DeleteUserReq,
 	rsp := &DeleteUserRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.DeleteUser", req), rsp, opts...)
 	if err != nil {
+		fmt.Printf("AAA3 %v\n", err)
 		return nil, err
 	}
 	return rsp, nil
@@ -100,6 +104,7 @@ func (c *testServiceClient) MailUser(ctx context.Context, req *MailUserReq, opts
 	rsp := &MailUserRsp{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "TestService.MailUser", req), rsp, opts...)
 	if err != nil {
+		fmt.Printf("AAA4 %v\n", err)
 		return nil, err
 	}
 	return rsp, nil
@@ -153,8 +158,6 @@ func RegisterTestServiceServer(s server.Server, sh TestServiceServer, opts ...se
 	}
 	h := &testServiceServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestServiceEndpoints {
+	nopts = append(nopts, v31.HandlerEndpoints(TestServiceServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&TestService{h}, append(nopts, opts...)...))
 }

go.mod

@@ -8,20 +8,16 @@ require (
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/hashicorp/go-hclog v1.4.0 // indirect
-	github.com/hashicorp/go-plugin v1.4.8 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
-	github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
-	github.com/hashicorp/vault/api v1.8.3 // indirect
+	github.com/hashicorp/vault/api v1.9.0 // indirect
-	github.com/hashicorp/vault/sdk v0.7.0 // indirect
-	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/segmentio/kafka-go v0.4.38
 	github.com/stretchr/testify v1.8.1
-	github.com/twmb/franz-go v1.11.5
+	github.com/twmb/franz-go v1.12.1
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/zeebo/errs v1.3.0 // indirect
@@ -45,31 +41,28 @@ require (
 	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.9
+	go.unistack.org/micro-server-http/v3 v3.10.11
 	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.11
+	go.unistack.org/micro/v3 v3.10.13
-	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa // indirect
+	google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect
-	google.golang.org/grpc v1.52.3
+	google.golang.org/grpc v1.53.0
 	google.golang.org/protobuf v1.28.1
 	modernc.org/sqlite v1.20.3
 	storj.io/drpc v0.0.32
 )
 
-require github.com/golang/protobuf v1.5.2
-
 require (
-	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/fatih/color v1.14.1 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/consul/api v1.18.0 // indirect
@@ -84,39 +77,37 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/klauspost/compress v1.15.15 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/oklog/run v1.1.0 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
 	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
+	github.com/prometheus/common v0.40.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/segmentio/asm v1.0.1 // indirect
 	github.com/segmentio/encoding v0.2.21 // indirect
 	github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35 // indirect
-	github.com/twmb/franz-go/pkg/kmsg v1.3.0 // indirect
+	github.com/twmb/franz-go/pkg/kmsg v1.4.0 // indirect
 	github.com/valyala/fastrand v1.1.0 // indirect
 	github.com/valyala/histogram v1.2.0 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.5.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
 	golang.org/x/tools v0.1.12 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -383,7 +383,6 @@ github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb
 github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
 github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -440,13 +439,11 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
 github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
-github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
-github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk=
 github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
@@ -503,7 +500,6 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -596,8 +592,6 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ=
-github.com/hashicorp/go-plugin v1.4.8 h1:CHGwpxYDOttQOY7HOWgETU9dyVjOXzniXDqJcYJE1zM=
-github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
@@ -607,8 +601,6 @@ github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5O
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
 github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 h1:p4AKXPPS24tO8Wc8i1gLvSKdmkiSY5xuju57czJ/IJQ=
-github.com/hashicorp/go-secure-stdlib/mlock v0.1.2/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 h1:UpiO20jno/eV1eVZcxqWnUohyKRe1g8FPV/xH1s/2qs=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
@@ -643,21 +635,16 @@ github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4
 github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
 github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
 github.com/hashicorp/vault/api v1.3.1/go.mod h1:QeJoWxMFt+MsuWcYhmwRLwKEXrjwAFFywzhptMsTIUw=
-github.com/hashicorp/vault/api v1.8.3 h1:cHQOLcMhBR+aVI0HzhPxO62w2+gJhIrKguQNONPzu6o=
+github.com/hashicorp/vault/api v1.9.0 h1:ab7dI6W8DuCY7yCU8blo0UCYl2oHre/dloCmzMWg9w8=
-github.com/hashicorp/vault/api v1.8.3/go.mod h1:4g/9lj9lmuJQMtT6CmVMHC5FW1yENaVv+Nv4ZfG8fAg=
+github.com/hashicorp/vault/api v1.9.0/go.mod h1:lloELQP4EyhjnCQhF8agKvWIVTmxbpEJj70b98959sM=
 github.com/hashicorp/vault/sdk v0.3.0/go.mod h1:aZ3fNuL5VNydQk8GcLJ2TV8YCRVvyaakYkhZRoVuhj0=
-github.com/hashicorp/vault/sdk v0.7.0 h1:2pQRO40R1etpKkia5fb4kjrdYMx3BHklPxl1pxpxDHg=
-github.com/hashicorp/vault/sdk v0.7.0/go.mod h1:KyfArJkhooyba7gYCKSq8v66QdqJmnbAxtV/OX1+JTs=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
-github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
 github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
 github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
@@ -666,6 +653,7 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
@@ -721,14 +709,10 @@ github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJys
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
-github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
-github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
-github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
@@ -736,19 +720,17 @@ github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
-github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
-github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -758,7 +740,6 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
 github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
@@ -790,8 +771,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI=
+github.com/prometheus/common v0.40.0 h1:Afz7EVRqGg2Mqqf4JuF9vdvp1pi220m55Pi9T2JnO4Q=
-github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
+github.com/prometheus/common v0.40.0/go.mod h1:L65ZJPSmfn/UBWLQIHV7dBrKFidB/wPlF1y5TlSt9OE=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
@@ -842,10 +823,10 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/twmb/franz-go v1.11.5 h1:TTv5lVJd+87XkmP9dWN9Jgpf7IUUr7a7jee+byR8LBE=
+github.com/twmb/franz-go v1.12.1 h1:8lWT8q0spL40Nfw6eonJ8OoPGLvF9arvadRRmcSiu9Y=
-github.com/twmb/franz-go v1.11.5/go.mod h1:FvaHNlpT6woVYIl6LAuIeL7yHol1Fp6Gv2Dn21AvH78=
+github.com/twmb/franz-go v1.12.1/go.mod h1:Ofc5tSSUJKLmpRNUYSejUsAZKYAHDHywTS322KWdChQ=
-github.com/twmb/franz-go/pkg/kmsg v1.3.0 h1:ouBETB7nTqRxiO5E8/pySoFZtVEW2VWw55z3/bsUzTw=
+github.com/twmb/franz-go/pkg/kmsg v1.4.0 h1:tbp9hxU6m8qZhQTlpGiaIJOm4BXix5lsuEZ7K00dF0s=
-github.com/twmb/franz-go/pkg/kmsg v1.3.0/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
+github.com/twmb/franz-go/pkg/kmsg v1.4.0/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
 github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
 github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
@@ -925,8 +906,8 @@ go.unistack.org/micro-router-register/v3 v3.9.0 h1:1TFfUmKwy39zmkqp+a82WvGdpaxJF
 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.9 h1:oZtHGBGWNylt6MYtue9YtXkdACJ1Eh4G6ad3S+my06s=
+go.unistack.org/micro-server-http/v3 v3.10.11 h1:lLrZufToHr8kNEhcxnIy+nvyyHhHYk+QwAJ4JHixkr0=
-go.unistack.org/micro-server-http/v3 v3.10.9/go.mod h1:Mu2ebExztpoNEdBQ39H6MRmvecZAakXRSpouei1Rtuo=
+go.unistack.org/micro-server-http/v3 v3.10.11/go.mod h1:kvEBu/lQv1mEQ6MfiNL8RidbGSB0RZY/OYRTHSPgb9g=
 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=
@@ -945,8 +926,10 @@ go.unistack.org/micro/v3 v3.9.14/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIH
 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 h1:IPUEVQ5oGZ6Ft2/2zQAOIkp+Ztt6GIHxwMoG4l+eJGQ=
 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=
 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=
@@ -959,8 +942,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1061,8 +1044,8 @@ 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 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+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=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1185,11 +1168,12 @@ 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 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+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/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=
@@ -1202,8 +1186,8 @@ 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 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+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=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1442,8 +1426,8 @@ google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnp
 google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa h1:GZXdWYIKckxQE2EcLHLvF+KLF+bIwoxGdMUxTZizueg=
+google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 h1:EfLuoKW5WfkgVdDy7dTK8qSbH37AX5mj/MFh+bGPz14=
-google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA=
 google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1483,8 +1467,8 @@ google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD
 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 h1:pf7sOysg4LdgBqduXveGKrcEwbStiK2rtfghdzlUYDQ=
+google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
-google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
+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=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

logger/unwrap/unwrap_test.go

@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/ptypes/wrappers"
 	pb "go.unistack.org/micro-tests/client/grpc/proto"
 	"go.unistack.org/micro/v3/logger/unwrap"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 func TestProtoMessage(t *testing.T) {
@@ -26,12 +26,12 @@ func TestProtoMessage(t *testing.T) {
 
 func TestWrappers(t *testing.T) {
 	type CustomerInfo struct {
-		MainPhone    *wrappers.StringValue `logger:"take"`
+		MainPhone    *wrapperspb.StringValue `logger:"take"`
 		BankClientId string                  `logger:"take"`
 		NullString   sql.NullString          `logger:"take"`
 	}
 
-	c := &CustomerInfo{MainPhone: &wrappers.StringValue{Value: "+712334"}, BankClientId: "12345", NullString: sql.NullString{String: "test"}}
+	c := &CustomerInfo{MainPhone: &wrapperspb.StringValue{Value: "+712334"}, BankClientId: "12345", NullString: sql.NullString{String: "test"}}
 
 	buf := fmt.Sprintf("%#v", unwrap.Unwrap(c, unwrap.Tagged(true)))
 	cmp := `&unwrap_test.CustomerInfo{MainPhone:(*wrapperspb.StringValue){Value:"+712334"}, BankClientId:"12345", NullString:(sql.NullString){String:"test"}}`

protoc-gen-go-micro/proto/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -9,58 +9,60 @@ package pb
 import (
 	context "context"
 	codec "go.unistack.org/micro-proto/v3/codec"
-	api "go.unistack.org/micro/v3/api"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	TestServiceName = "TestService"
-
+)
-	TestServiceEndpoints = []api.Endpoint{
+var (
+	TestServiceServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "TestService.TestMultipart",
-			Path:    []string{"/users/multipart"},
+			Path:   "/users/multipart",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 		{
 			Name:   "TestService.TestEndpoint",
-			Path:    []string{"/users/test"},
+			Path:   "/users/test",
-			Method:  []string{"GET"},
+			Method: "GET",
-			Handler: "rpc",
+			Body:   "",
+			Stream: false,
 		},
 		{
 			Name:   "TestService.UserByID",
-			Path:    []string{"/users/{id}"},
+			Path:   "/users/{id}",
-			Method:  []string{"GET"},
+			Method: "GET",
-			Handler: "rpc",
+			Body:   "",
+			Stream: false,
 		},
 		{
 			Name:   "TestService.UserImageByID",
-			Path:    []string{"/users/{id}/image"},
+			Path:   "/users/{id}/image",
-			Method:  []string{"GET"},
+			Method: "GET",
-			Handler: "rpc",
+			Body:   "",
+			Stream: false,
 		},
 		{
 			Name:   "TestService.UploadFile",
-			Path:    []string{"/users/image/upload"},
+			Path:   "/users/image/upload",
-			Method:  []string{"POST"},
+			Method: "POST",
-			Handler: "rpc",
+			Body:   "",
+			Stream: false,
 		},
 		{
 			Name:   "TestService.KzAmlRs",
-			Path:    []string{"/aml"},
+			Path:   "/aml",
-			Method:  []string{"POST"},
+			Method: "POST",
-			Handler: "rpc",
+			Body:   "",
+			Stream: false,
 		},
 	}
 )
 
-func NewTestServiceEndpoints() []api.Endpoint {
-	return TestServiceEndpoints
-}
-
 type TestServiceClient interface {
 	TestMultipart(ctx context.Context, req *MultipartReq, opts ...client.CallOption) (*MultipartRsp, error)
 	TestEndpoint(ctx context.Context, req *Request, opts ...client.CallOption) (*Response, error)

protoc-gen-go-micro/proto/test_micro_http.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: test.proto
 
 package pb
@@ -9,7 +9,6 @@ import (
 	v3 "go.unistack.org/micro-client-http/v3"
 	codec "go.unistack.org/micro-proto/v3/codec"
 	v31 "go.unistack.org/micro-server-http/v3"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	http "net/http"
@@ -117,8 +116,8 @@ func (h *testServiceServer) TestMultipart(ctx context.Context, req *MultipartReq
 
 func (h *testServiceServer) TestEndpoint(ctx context.Context, req *Request, rsp *Response) error {
 	v31.FillRequest(ctx, req,
-		v31.Cookie("csrftoken", "true"),
 		v31.Header("client_uid", "true"),
+		v31.Cookie("csrftoken", "true"),
 	)
 	return h.TestServiceServer.TestEndpoint(ctx, req, rsp)
 }
@@ -153,8 +152,6 @@ func RegisterTestServiceServer(s server.Server, sh TestServiceServer, opts ...se
 	}
 	h := &testServiceServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestServiceEndpoints {
+	nopts = append(nopts, v31.HandlerEndpoints(TestServiceServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&TestService{h}, append(nopts, opts...)...))
 }

server/combo/mdpb/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -8,29 +8,26 @@ package pb
 
 import (
 	context "context"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	TestName = "Test"
-
+)
-	TestEndpoints = []api.Endpoint{
+var (
+	TestServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "Test.Call",
-			Path:    []string{"/v1/call"},
+			Path:   "/v1/call",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 	}
 )
 
-func NewTestEndpoints() []api.Endpoint {
-	return TestEndpoints
-}
-
 type TestClient interface {
 	Call(ctx context.Context, req *proto.CallReq, opts ...client.CallOption) (*proto.CallRsp, error)
 }

server/combo/mdpb/test_micro_drpc.pb.go

@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: test.proto
 
 package pb
 
 import (
 	context "context"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	time "time"
@@ -54,8 +54,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestEndpoints {
+	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }

server/combo/mgpb/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -8,29 +8,26 @@ package pb
 
 import (
 	context "context"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	TestName = "Test"
-
+)
-	TestEndpoints = []api.Endpoint{
+var (
+	TestServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "Test.Call",
-			Path:    []string{"/v1/call"},
+			Path:   "/v1/call",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 	}
 )
 
-func NewTestEndpoints() []api.Endpoint {
-	return TestEndpoints
-}
-
 type TestClient interface {
 	Call(ctx context.Context, req *proto.CallReq, opts ...client.CallOption) (*proto.CallRsp, error)
 }

server/combo/mgpb/test_micro_grpc.pb.go

@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: test.proto
 
 package pb
 
 import (
 	context "context"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	time "time"
@@ -54,8 +54,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestEndpoints {
+	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }

server/combo/mhpb/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -8,29 +8,26 @@ package pb
 
 import (
 	context "context"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	TestName = "Test"
-
+)
-	TestEndpoints = []api.Endpoint{
+var (
+	TestServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "Test.Call",
-			Path:    []string{"/v1/call"},
+			Path:   "/v1/call",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 	}
 )
 
-func NewTestEndpoints() []api.Endpoint {
-	return TestEndpoints
-}
-
 type TestClient interface {
 	Call(ctx context.Context, req *proto.CallReq, opts ...client.CallOption) (*proto.CallRsp, error)
 }

server/combo/mhpb/test_micro_http.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: test.proto
 
 package pb
@@ -7,8 +7,8 @@ package pb
 import (
 	context "context"
 	v3 "go.unistack.org/micro-client-http/v3"
+	v31 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/combo/proto"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	http "net/http"
@@ -66,8 +66,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestEndpoints {
+	nopts = append(nopts, v31.HandlerEndpoints(TestServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }

server/grpc/gproto/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.1
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -8,29 +8,26 @@ package helloworld
 
 import (
 	context "context"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/grpc/proto"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	TestName = "Test"
-
+)
-	TestEndpoints = []api.Endpoint{
+var (
+	TestServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "Test.Call",
-			Path:    []string{"/api/v0/test/call/TEST"},
+			Path:   "/api/v0/test/call/TEST",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 	}
 )
 
-func NewTestEndpoints() []api.Endpoint {
-	return TestEndpoints
-}
-
 type TestClient interface {
 	Call(ctx context.Context, req *proto.Request, opts ...client.CallOption) (*proto.Response, error)
 }

server/grpc/gproto/test_micro_grpc.pb.go

@@ -1,13 +1,13 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.1
 // source: test.proto
 
 package helloworld
 
 import (
 	context "context"
+	v3 "go.unistack.org/micro-server-http/v3"
 	proto "go.unistack.org/micro-tests/server/grpc/proto"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 )
@@ -47,8 +47,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestEndpoints {
+	nopts = append(nopts, v3.HandlerEndpoints(TestServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }

server/grpc/grpc_test.go

@@ -107,7 +107,7 @@ func TestGRPCServer(t *testing.T) {
 		server.Address("127.0.0.1:0"),
 		server.Codec("text/plain", codec.NewCodec()),
 	)
-	if err = health.RegisterHealthServer(srv, health.NewHandler(health.Version("0.0.1"))); err != nil {
+	if err = health.RegisterHealthServiceServer(srv, health.NewHandler(health.Version("0.0.1"))); err != nil {
 		t.Fatalf("cant register health handler: %v", err)
 	}
 

server/grpc/proto/test.proto

@@ -2,13 +2,17 @@ syntax = "proto3";
 
 package helloworld;
 
-option go_package = "go.unistack.org/micro-tests/server/grpc/proto;helloworld";
 import "api/annotations.proto";
 
+option go_package = "go.unistack.org/micro-tests/server/grpc/proto;helloworld";
+
 service Test {
   rpc Call(Request) returns (Response) {
-    option (micro.api.http) = { post: "/api/v0/test/call/TEST"; body: "*"; };
+    option (micro.api.http) = {
+      post: "/api/v0/test/call/TEST";
+      body: "*";
     };
+  }
 }
 
 message Request {
@@ -16,13 +20,13 @@ message Request {
   string name = 2;
 
   Broken broken = 4;
-};
+}
 
 message Broken {
   string field = 1;
-};
+}
 
 message Response {
   string msg = 1;
-Broken broken = 4;
+  Broken broken = 4;
-};
+}

server/http/http_test.go

@@ -316,9 +316,9 @@ func TestNativeFormUrlencoded(t *testing.T) {
 		Clientid:  "1234567890",
 		Csrftoken: "csrftoken",
 		Nested: &pb.Nested{Uint64Args: []*wrapperspb.UInt64Value{
-			&wrapperspb.UInt64Value{Value: 1},
+			{Value: 1},
-			&wrapperspb.UInt64Value{Value: 2},
+			{Value: 2},
-			&wrapperspb.UInt64Value{Value: 3},
+			{Value: 3},
 		}},
 	})
 	if err != nil {
@@ -375,7 +375,7 @@ func TestNativeClientServer(t *testing.T) {
 	if err := pb.RegisterTestDoubleServer(srv, h); err != nil {
 		t.Fatal(err)
 	}
-	if err := handler.RegisterMeterServer(srv, handler.NewHandler(handler.Meter(srv.Options().Meter))); err != nil {
+	if err := handler.RegisterMeterServiceServer(srv, handler.NewHandler(handler.Meter(srv.Options().Meter))); err != nil {
 		t.Fatal(err)
 	}
 	// start server
@@ -406,9 +406,9 @@ func TestNativeClientServer(t *testing.T) {
 		Clientid:  "1234567890",
 		Csrftoken: "csrftoken",
 		Nested: &pb.Nested{Uint64Args: []*wrapperspb.UInt64Value{
-			&wrapperspb.UInt64Value{Value: 1},
+			{Value: 1},
-			&wrapperspb.UInt64Value{Value: 2},
+			{Value: 2},
-			&wrapperspb.UInt64Value{Value: 3},
+			{Value: 3},
 		}},
 	})
 	if err != nil {
@@ -427,9 +427,9 @@ func TestNativeClientServer(t *testing.T) {
 		Clientid:  "1234567890",
 		Csrftoken: "csrftoken",
 		Nested: &pb.Nested{Uint64Args: []*wrapperspb.UInt64Value{
-			&wrapperspb.UInt64Value{Value: 1},
+			{Value: 1},
-			&wrapperspb.UInt64Value{Value: 2},
+			{Value: 2},
-			&wrapperspb.UInt64Value{Value: 3},
+			{Value: 3},
 		}},
 	})
 	if err != nil {

server/http/proto/test_micro.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.5.3
+// - protoc-gen-go-micro v3.10.2
 // - protoc              v3.21.12
 // source: test.proto
 
@@ -8,28 +8,25 @@ package pb
 
 import (
 	context "context"
-	api "go.unistack.org/micro/v3/api"
+	v3 "go.unistack.org/micro-server-http/v3"
 	client "go.unistack.org/micro/v3/client"
 )
 
 var (
 	TestDoubleName = "TestDouble"
-
+)
-	TestDoubleEndpoints = []api.Endpoint{
+var (
+	TestDoubleServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "TestDouble.CallDouble",
-			Path:    []string{"/v1/testdouble/call/name/{name}"},
+			Path:   "/v1/testdouble/call/name/{name}",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 	}
 )
 
-func NewTestDoubleEndpoints() []api.Endpoint {
-	return TestDoubleEndpoints
-}
-
 type TestDoubleClient interface {
 	CallDouble(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error)
 }
@@ -40,43 +37,40 @@ type TestDoubleServer interface {
 
 var (
 	TestName = "Test"
-
+)
-	TestEndpoints = []api.Endpoint{
+var (
+	TestServerEndpoints = []v3.EndpointMetadata{
 		{
 			Name:   "Test.CallRepeatedString",
-			Path:    []string{"/v1/test/call_repeated_string"},
+			Path:   "/v1/test/call_repeated_string",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 		{
 			Name:   "Test.CallRepeatedInt64",
-			Path:    []string{"/v1/test/call_repeated_int64"},
+			Path:   "/v1/test/call_repeated_int64",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 		{
 			Name:   "Test.Call",
-			Path:    []string{"/v1/test/call/{name}"},
+			Path:   "/v1/test/call/{name}",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 		{
 			Name:   "Test.CallError",
-			Path:    []string{"/v1/test/callerror/{name}"},
+			Path:   "/v1/test/callerror/{name}",
-			Method:  []string{"POST"},
+			Method: "POST",
 			Body:   "*",
-			Handler: "rpc",
+			Stream: false,
 		},
 	}
 )
 
-func NewTestEndpoints() []api.Endpoint {
-	return TestEndpoints
-}
-
 type TestClient interface {
 	CallRepeatedString(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error)
 	CallRepeatedInt64(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error)

server/http/proto/test_micro_http.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// protoc-gen-go-micro version: v3.10.2
 // source: test.proto
 
 package pb
@@ -8,7 +8,6 @@ import (
 	context "context"
 	v3 "go.unistack.org/micro-client-http/v3"
 	v31 "go.unistack.org/micro-server-http/v3"
-	api "go.unistack.org/micro/v3/api"
 	client "go.unistack.org/micro/v3/client"
 	server "go.unistack.org/micro/v3/server"
 	http "net/http"
@@ -66,9 +65,7 @@ func RegisterTestDoubleServer(s server.Server, sh TestDoubleServer, opts ...serv
 	}
 	h := &testDoubleServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestDoubleEndpoints {
+	nopts = append(nopts, v31.HandlerEndpoints(TestDoubleServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&TestDouble{h}, append(nopts, opts...)...))
 }
 
@@ -135,8 +132,8 @@ func (c *testClient) Call(ctx context.Context, req *CallReq, opts ...client.Call
 		v3.Body("*"),
 	)
 	opts = append(opts,
-		v3.Cookie("Csrftoken", "true"),
 		v3.Header("Clientid", "true"),
+		v3.Cookie("Csrftoken", "true"),
 	)
 	td := time.Duration(5000000000)
 	opts = append(opts, client.WithRequestTimeout(td))
@@ -215,8 +212,6 @@ func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOp
 	}
 	h := &testServer{sh}
 	var nopts []server.HandlerOption
-	for _, endpoint := range TestEndpoints {
+	nopts = append(nopts, v31.HandlerEndpoints(TestServerEndpoints))
-		nopts = append(nopts, api.WithEndpoint(&endpoint))
-	}
 	return s.Handle(s.NewHandler(&Test{h}, append(nopts, opts...)...))
 }

tracer/opentracing/tracer_test.go

@@ -17,7 +17,6 @@ import (
 	rrouter "go.unistack.org/micro-router-register/v3"
 	srv "go.unistack.org/micro-server-grpc/v3"
 	ot "go.unistack.org/micro-tracer-opentracing/v3"
-	"go.unistack.org/micro/v3/api"
 	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/client"
 	"go.unistack.org/micro/v3/errors"
@@ -156,11 +155,12 @@ func TestClient(t *testing.T) {
 			}
 
 			nopts := []server.HandlerOption{
-				api.WithEndpoint(&api.Endpoint{
+				server.EndpointMetadata("Test", map[string]string{
-					Name:    "Test.Method",
+					"Name":    "Test.Method",
-					Method:  []string{"POST"},
+					"Method":  "POST",
-					Handler: "rpc",
+					"Handler": "rpc",
-				}),
+				},
+				),
 			}
 
 			if err := s.Handle(s.NewHandler(&Test{new(testHandler)}, nopts...)); err != nil {
@@ -206,6 +206,5 @@ func TestClient(t *testing.T) {
 				}
 			*/
 		})
-
 	}
 }