fixup all tests

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2025-01-18 15:17:58 +03:00
parent 356e20440b
commit 4c0469d1f0
33 changed files with 175 additions and 281 deletions
--- a/server/combo/combo_test.go
+++ b/server/combo/combo_test.go
@@ -22,7 +22,7 @@ import (
 	pb "go.unistack.org/micro-tests/server/combo/proto"
 	"go.unistack.org/micro/v3/client"
 	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/register"
+	mregister "go.unistack.org/micro/v3/register/memory"
 	"go.unistack.org/micro/v3/server"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
@@ -70,7 +70,7 @@ func (h *Handler) Call(ctx context.Context, req *pb.CallReq, rsp *pb.CallRsp) er
 }

 func TestComboServer(t *testing.T) {
-	reg := register.NewRegister()
+	reg := mregister.NewRegister()
 	ctx := context.Background()

 	h := &Handler{t: t}
@@ -111,7 +111,7 @@ func TestComboServer(t *testing.T) {
 	hs := &http.Server{Handler: h2c.NewHandler(newComboMux(hsrv, gsrv.GRPCServer(), nil), &http2.Server{})}

 	// init http server
-	if err := hsrv.Init(httpsrv.Server(hs)); err != nil {
+	if err := hsrv.Init(httpsrv.HTTPServer(hs)); err != nil {
 		t.Fatal(err)
 	}

--- a/server/combo/generate.go
+++ b/server/combo/generate.go
@@ -2,9 +2,11 @@ package combo

 //go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go_out=paths=source_relative:./proto proto/proto.proto"

-//go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out=components='micro|grpc',standalone=true,debug=true,paths=source_relative:./mgpb proto/proto.proto"
+//go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out=components='micro',standalone=false,debug=true,paths=source_relative:./proto proto/proto.proto"

-//go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out=components='micro|http',standalone=true,debug=true,paths=source_relative:./mhpb proto/proto.proto"
+//go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out=components='grpc',standalone=true,debug=true,paths=source_relative:./mgpb proto/proto.proto"
+
+//go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out=components='http',standalone=true,debug=true,paths=source_relative:./mhpb proto/proto.proto"

 //go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out=components='openapiv3',openapi_file=./apidocs.swagger.yaml,standalone=true,debug=true,paths=source_relative:./proto proto/proto.proto"

@@ -14,8 +16,6 @@ package combo
 ////go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go_out=paths=source_relative:./ndpb proto/proto.proto"
 ////go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-drpc_out=json=false,paths=source_relative:./ndpb proto/proto.proto"

-////go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out=components='micro|http',standalone=true,debug=true,paths=source_relative:./mhpb proto/proto.proto"
-
 ////go:generate sh -c "protoc -I./proto -I. -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out=components='micro|drpc',standalone=true,debug=true,paths=source_relative:./mdpb proto/proto.proto"

 //go:generate sh -c "mkdir -p swagger-ui && cp proto/apidocs.swagger.yaml swagger-ui/swagger.yaml && curl -L https://github.com/swagger-api/swagger-ui/archive/refs/tags/v4.17.0.tar.gz -o v4.17.0.tar.gz && tar -C swagger-ui --strip-components=2 -zxvf v4.17.0.tar.gz swagger-ui-4.17.0/dist && rm -f v4.17.0.tar.gz && sed -i '' 's|https://petstore.swagger.io/v2/swagger.json|./swagger.yaml|g' swagger-ui/index.html swagger-ui/swagger-initializer.js && sed -i '' 's|deepLinking: true,|deepLinking: true, displayOperationId: true, tryItOutEnabled: true,|g' swagger-ui/swagger-initializer.js "
--- a/server/combo/mhpb/micro_errors.pb.go
+++ b/server/combo/mhpb/micro_errors.pb.go
@@ -1,17 +0,0 @@
-// Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.10.4
-
-package pb
-
-import (
-	protojson "google.golang.org/protobuf/encoding/protojson"
-)
-
-var (
-	marshaler = protojson.MarshalOptions{}
-)
-
-func (m *Error) Error() string {
-	buf, _ := marshaler.Marshal(m)
-	return string(buf)
-}
--- a/server/combo/mhpb/proto_micro_http.pb.go
+++ b/server/combo/mhpb/proto_micro_http.pb.go
@@ -37,7 +37,7 @@ func NewTestClient(name string, c client.Client) proto.TestClient {

 func (c *testClient) Call(ctx context.Context, req *proto.CallReq, opts ...client.CallOption) (*proto.CallRsp, error) {
 	errmap := make(map[string]interface{}, 1)
-	errmap["default"] = &proto.Error{}
+	errmap["default"] = &proto.ErrorRsp{}
 	opts = append(opts,
 		v31.ErrorMap(errmap),
 	)
--- a/server/combo/proto/apidocs.swagger.yaml
+++ b/server/combo/proto/apidocs.swagger.yaml
@@ -22,7 +22,7 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/Error'
+                                $ref: '#/components/schemas/ErrorRsp'
                "200":
                    description: OK
                    content:
@@ -41,7 +41,7 @@ components:
            properties:
                rsp:
                    type: string
-        Error:
+        ErrorRsp:
            type: object
            properties:
                err:
--- a/server/combo/proto/micro_errors.pb.go
+++ b/server/combo/proto/micro_errors.pb.go
@@ -11,7 +11,7 @@ var (
 	marshaler = protojson.MarshalOptions{}
 )

-func (m *Error) Error() string {
+func (m *ErrorRsp) Error() string {
 	buf, _ := marshaler.Marshal(m)
 	return string(buf)
 }
--- a/server/combo/proto/proto.pb.go
+++ b/server/combo/proto/proto.pb.go
@@ -118,7 +118,7 @@ func (x *CallRsp) GetRsp() string {
 	return ""
 }

-type Error struct {
+type ErrorRsp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -126,8 +126,8 @@ type Error struct {
 	Err string `protobuf:"bytes,1,opt,name=err,proto3" json:"err,omitempty"`
 }

-func (x *Error) Reset() {
-	*x = Error{}
+func (x *ErrorRsp) Reset() {
+	*x = ErrorRsp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_proto_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -135,13 +135,13 @@ func (x *Error) Reset() {
 	}
 }

-func (x *Error) String() string {
+func (x *ErrorRsp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }

-func (*Error) ProtoMessage() {}
+func (*ErrorRsp) ProtoMessage() {}

-func (x *Error) ProtoReflect() protoreflect.Message {
+func (x *ErrorRsp) ProtoReflect() protoreflect.Message {
 	mi := &file_proto_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -153,12 +153,12 @@ func (x *Error) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }

-// Deprecated: Use Error.ProtoReflect.Descriptor instead.
-func (*Error) Descriptor() ([]byte, []int) {
+// Deprecated: Use ErrorRsp.ProtoReflect.Descriptor instead.
+func (*ErrorRsp) Descriptor() ([]byte, []int) {
 	return file_proto_proto_rawDescGZIP(), []int{2}
 }

-func (x *Error) GetErr() string {
+func (x *ErrorRsp) GetErr() string {
 	if x != nil {
 		return x.Err
 	}
@@ -179,20 +179,20 @@ var file_proto_proto_rawDesc = []byte{
 	0x1b, 0x0a, 0x07, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x65,
 	0x71, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x65, 0x71, 0x22, 0x1b, 0x0a, 0x07,
 	0x43, 0x61, 0x6c, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x73, 0x70, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x73, 0x70, 0x22, 0x19, 0x0a, 0x05, 0x45, 0x72, 0x72,
-	0x6f, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x65, 0x72, 0x72, 0x32, 0x77, 0x0a, 0x04, 0x54, 0x65, 0x73, 0x74, 0x12, 0x6f, 0x0a, 0x04,
-	0x43, 0x61, 0x6c, 0x6c, 0x12, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x74,
-	0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x61, 0x6c,
-	0x6c, 0x52, 0x73, 0x70, 0x22, 0x37, 0xaa, 0x84, 0x9e, 0x03, 0x22, 0x2a, 0x04, 0x43, 0x61, 0x6c,
-	0x6c, 0x42, 0x1a, 0x0a, 0x18, 0x12, 0x16, 0x0a, 0x14, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76,
-	0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0xb2, 0xea, 0xff,
-	0xf9, 0x01, 0x0a, 0x22, 0x05, 0x2f, 0x43, 0x61, 0x6c, 0x6c, 0x3a, 0x01, 0x2a, 0x42, 0x33, 0x5a,
-	0x31, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67,
-	0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2f, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b,
-	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x73, 0x70, 0x22, 0x1c, 0x0a, 0x08, 0x45, 0x72, 0x72,
+	0x6f, 0x72, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x72, 0x72, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x65, 0x72, 0x72, 0x32, 0x7a, 0x0a, 0x04, 0x54, 0x65, 0x73, 0x74, 0x12,
+	0x72, 0x0a, 0x04, 0x43, 0x61, 0x6c, 0x6c, 0x12, 0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76,
+	0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x1a,
+	0x16, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x43, 0x61, 0x6c, 0x6c, 0x52, 0x73, 0x70, 0x22, 0x3a, 0xaa, 0x84, 0x9e, 0x03, 0x25, 0x2a, 0x04,
+	0x43, 0x61, 0x6c, 0x6c, 0x42, 0x1d, 0x0a, 0x1b, 0x12, 0x19, 0x0a, 0x17, 0x2e, 0x74, 0x65, 0x73,
+	0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72,
+	0x52, 0x73, 0x70, 0xb2, 0xea, 0xff, 0xf9, 0x01, 0x0a, 0x22, 0x05, 0x2f, 0x43, 0x61, 0x6c, 0x6c,
+	0x3a, 0x01, 0x2a, 0x42, 0x33, 0x5a, 0x31, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61,
+	0x63, 0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x74, 0x65, 0x73,
+	0x74, 0x73, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x2f,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }

 var (
@@ -209,9 +209,9 @@ func file_proto_proto_rawDescGZIP() []byte {

 var file_proto_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_proto_proto_goTypes = []interface{}{
-	(*CallReq)(nil), // 0: test.v1.proto.CallReq
-	(*CallRsp)(nil), // 1: test.v1.proto.CallRsp
-	(*Error)(nil),   // 2: test.v1.proto.Error
+	(*CallReq)(nil),  // 0: test.v1.proto.CallReq
+	(*CallRsp)(nil),  // 1: test.v1.proto.CallRsp
+	(*ErrorRsp)(nil), // 2: test.v1.proto.ErrorRsp
 }
 var file_proto_proto_depIdxs = []int32{
 	0, // 0: test.v1.proto.Test.Call:input_type -> test.v1.proto.CallReq
@@ -254,7 +254,7 @@ func file_proto_proto_init() {
 			}
 		}
 		file_proto_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Error); i {
+			switch v := v.(*ErrorRsp); i {
 			case 0:
 				return &v.state
 			case 1:
--- a/server/combo/proto/proto.proto
+++ b/server/combo/proto/proto.proto
@@ -16,7 +16,7 @@ service Test {
      responses: {
        default: {
          reference: {
-            _ref: ".test.v1.proto.Error";
+            _ref: ".test.v1.proto.ErrorRsp";
          };
        };
      };
@@ -33,6 +33,6 @@ message CallRsp {
  string rsp = 1;
 };

-message Error {
+message ErrorRsp {
 	string err = 1;
 };
--- a/server/combo/proto/proto_micro.pb.go
+++ b/server/combo/proto/proto_micro.pb.go
@@ -0,0 +1,24 @@
+// Code generated by protoc-gen-go-micro. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-micro v3.10.4
+// - protoc              v5.29.2
+// source: proto.proto
+
+package pb
+
+import (
+	context "context"
+	client "go.unistack.org/micro/v3/client"
+)
+
+var (
+	TestName = "Test"
+)
+
+type TestClient interface {
+	Call(ctx context.Context, req *CallReq, opts ...client.CallOption) (*CallRsp, error)
+}
+
+type TestServer interface {
+	Call(ctx context.Context, req *CallReq, rsp *CallRsp) error
+}
--- a/server/combo/swagger-ui/swagger.yaml
+++ b/server/combo/swagger-ui/swagger.yaml
@@ -22,7 +22,7 @@ paths:
                    content:
                        application/json:
                            schema:
-                                $ref: '#/components/schemas/Error'
+                                $ref: '#/components/schemas/ErrorRsp'
                "200":
                    description: OK
                    content:
@@ -41,7 +41,7 @@ components:
            properties:
                rsp:
                    type: string
-        Error:
+        ErrorRsp:
            type: object
            properties:
                err:
--- a/server/grpc/generate.go
+++ b/server/grpc/generate.go
@@ -1,4 +1,6 @@
 package grpc

 //go:generate go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-//go:generate sh -c "protoc -I./proto -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --go-micro_out=components='micro|grpc',debug=true,standalone=true,paths=source_relative:./gproto proto/test.proto"
+//go:generate sh -c "protoc -I./proto -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto proto/test.proto"
+//go:generate sh -c "protoc -I./proto -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --go-micro_out=components='micro',debug=true,standalone=true,paths=source_relative:./gproto proto/test.proto"
+//go:generate sh -c "protoc -I./proto -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --go-micro_out=components='grpc',debug=true,standalone=true,paths=source_relative:./gproto proto/test.proto"
--- a/server/grpc/gproto/test_micro_grpc.pb.go
+++ b/server/grpc/gproto/test_micro_grpc.pb.go
@@ -17,7 +17,7 @@ type testClient struct {
 	name string
 }

-func NewTestClient(name string, c client.Client) proto.TestClient {
+func NewTestClient(name string, c client.Client) TestClient {
 	return &testClient{c: c, name: name}
 }

@@ -30,7 +30,7 @@ func (c *testClient) Call(ctx context.Context, req *proto.Request, opts ...clien
 	return rsp, nil
 }

-func (c *testClient) StreamCall(ctx context.Context, opts ...client.CallOption) (proto.Test_StreamCallClient, error) {
+func (c *testClient) StreamCall(ctx context.Context, opts ...client.CallOption) (Test_StreamCallClient, error) {
 	stream, err := c.c.Stream(ctx, c.c.NewRequest(c.name, "Test.StreamCall", &proto.Request{}), opts...)
 	if err != nil {
 		return nil, err
@@ -91,7 +91,7 @@ func (s *testClientStreamCall) Recv() (*proto.Response, error) {
 }

 type testServer struct {
-	proto.TestServer
+	TestServer
 }

 func (h *testServer) Call(ctx context.Context, req *proto.Request, rsp *proto.Response) error {
@@ -141,7 +141,7 @@ func (s *testStreamCallStream) Recv() (*proto.Request, error) {
 	return msg, nil
 }

-func RegisterTestServer(s server.Server, sh proto.TestServer, opts ...server.HandlerOption) error {
+func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOption) error {
 	type test interface {
 		Call(ctx context.Context, req *proto.Request, rsp *proto.Response) error
 		StreamCall(ctx context.Context, stream server.Stream) error
--- a/server/grpc/grpc_test.go
+++ b/server/grpc/grpc_test.go
@@ -18,11 +18,10 @@ import (
 	pb "go.unistack.org/micro-tests/server/grpc/proto"
 	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/errors"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/register"
+	mregister "go.unistack.org/micro/v3/register/memory"
 	"go.unistack.org/micro/v3/router"
 	"go.unistack.org/micro/v3/server"
 	"google.golang.org/grpc"
@@ -39,8 +38,8 @@ type testnServer struct {
 	pb.UnimplementedTestServer
 }

-func NewServerHandlerWrapper() server.HandlerWrapper {
-	return func(fn server.HandlerFunc) server.HandlerFunc {
+func NewServerHandlerWrapper() server.HookHandler {
+	return func(fn server.FuncHandler) server.FuncHandler {
 		return func(ctx context.Context, req server.Request, rsp interface{}) error {
 			// fmt.Printf("wrap ctx: %#+v req: %#+v\n", ctx, req)
 			return fn(ctx, req, rsp)
@@ -62,6 +61,10 @@ func (g *testServer) Call(ctx context.Context, req *pb.Request, rsp *pb.Response
 	return nil
 }

+func (g *testServer) StreamCall(ctx context.Context, stream gpb.Test_StreamCallStream) error {
+	return nil
+}
+
 func (g *testnServer) Call(ctx context.Context, req *pb.Request) (*pb.Response, error) {
 	_, ok := gmetadata.FromIncomingContext(ctx)
 	if !ok {
@@ -81,11 +84,10 @@ func (g *testnServer) Call(ctx context.Context, req *pb.Request) (*pb.Response,

 func TestGRPCServer(t *testing.T) {
 	var err error
-	codec.DefaultMaxMsgSize = 8 * 1024 * 1024
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	_ = logger.DefaultLogger.Init(logger.WithLevel(logger.ErrorLevel))
-	r := register.NewRegister()
+	r := mregister.NewRegister()
 	b := broker.NewBroker(broker.Register(r))
 	s := gserver.NewServer(
 		server.Codec("application/grpc+proto", protocodec.NewCodec()),
@@ -93,8 +95,8 @@ func TestGRPCServer(t *testing.T) {
 		server.Address("127.0.0.1:0"),
 		server.Register(r),
 		server.Name("helloworld"),
-		gserver.Reflection(true),
-		server.WrapHandler(NewServerHandlerWrapper()),
+		// gserver.Reflection(true),
+		server.Hooks(server.HookHandler(NewServerHandlerWrapper())),
 	)
 	// create router
 	rtr := regRouter.NewRouter(router.Register(r))
--- a/server/http/http_test.go
+++ b/server/http/http_test.go
@@ -3,6 +3,7 @@ package http_test
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -25,7 +26,7 @@ import (
 	pb "go.unistack.org/micro-tests/server/http/proto"
 	"go.unistack.org/micro/v3/client"
 	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/register"
+	mregister "go.unistack.org/micro/v3/register/memory"
 	"go.unistack.org/micro/v3/server"
 	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
@@ -82,7 +83,7 @@ func upload(client *http.Client, url string, values map[string]io.Reader) error
 }

 func TestMultipart(t *testing.T) {
-	reg := register.NewRegister()
+	reg := mregister.NewRegister()
 	ctx := context.Background()

 	// create server
@@ -133,27 +134,28 @@ func TestMultipart(t *testing.T) {
 	}
 }

-func NewServerHandlerWrapper(t *testing.T) server.HandlerWrapper {
-	return func(fn server.HandlerFunc) server.HandlerFunc {
+func NewServerHandlerWrapper(t *testing.T) server.HookHandler {
+	return func(fn server.FuncHandler) server.FuncHandler {
 		return func(ctx context.Context, req server.Request, rsp interface{}) error {
-			md, ok := metadata.FromIncomingContext(ctx)
+			// return fn(ctx, req, rsp)
+			imd, ok := metadata.FromIncomingContext(ctx)
 			if !ok {
-				t.Fatal("metadata empty")
+				return errors.New("missing metadata")
 			}
-			if v, ok := md.Get("Authorization"); ok && v == "test" {
-				nmd := metadata.New(1)
+			nmd, ok := metadata.FromOutgoingContext(ctx)
+			if !ok {
+				return errors.New("missing metadata")
+			}
+			if v, ok := imd.Get("Authorization"); ok && v == "test" {
 				nmd.Set("my-key", "my-val")
 				nmd.Set("Content-Type", "text/xml")
-				metadata.SetOutgoingContext(ctx, nmd)
 				httpsrv.SetRspCode(ctx, http.StatusUnauthorized)
 				return httpsrv.SetError(&pb.CallRsp{Rsp: "name_my_name"})
 			}

-			if v, ok := md.Get("Test-Content-Type"); ok && v != "" {
-				nmd := metadata.New(1)
+			if v, ok := imd.Get("Test-Content-Type"); ok && v != "" {
 				nmd.Set("my-key", "my-val")
 				nmd.Set("Content-Type", v)
-				metadata.SetOutgoingContext(ctx, nmd)
 			}

 			return fn(ctx, req, rsp)
@@ -196,20 +198,29 @@ func (h *Handler) Call(ctx context.Context, req *pb.CallReq, rsp *pb.CallRsp) er
 	if !ok {
 		h.t.Fatalf("context without metadata")
 	}
+	omd, ok := metadata.FromOutgoingContext(ctx)
+	if !ok {
+		h.t.Fatalf("context without metadata")
+	}
 	if _, ok := md.Get("User-Agent"); !ok {
 		h.t.Fatalf("context metadata does not have User-Agent header")
 	}
 	if req.Name != "my_name" {
 		h.t.Fatalf("invalid req received: %#+v", req)
 	}
-	if req.Clientid != "1234567890" {
-		h.t.Fatalf("invalid req recevided %#+v", req)
+	if v, ok := md.Get("Authorization"); ok && v == "test" {
+		rsp.Rsp = "name_my_name"
+		httpsrv.SetRspCode(ctx, http.StatusUnauthorized)
+		omd.Set("my-key", "my-val")
+		omd.Set("Content-Type", "text/xml")
+		return httpsrv.SetError(&pb.CallRsp{Rsp: "name_my_name"})
 	}
+
 	rsp.Rsp = "name_my_name"
 	httpsrv.SetRspCode(ctx, http.StatusCreated)
-	md = metadata.New(1)
-	md.Set("my-key", "my-val")
-	metadata.SetOutgoingContext(ctx, md)
+	if omd, ok := metadata.FromOutgoingContext(ctx); ok {
+		omd.Set("my-key", "my-val")
+	}
 	return nil
 }

@@ -225,7 +236,7 @@ func (h *Handler) CallError(ctx context.Context, req *pb.CallReq1, rsp *pb.CallR
 }

 func TestNativeFormUrlencoded(t *testing.T) {
-	reg := register.NewRegister()
+	reg := mregister.NewRegister()
 	ctx := context.Background()

 	// create server
@@ -340,7 +351,7 @@ func TestNativeFormUrlencoded(t *testing.T) {
 }

 func TestNativeClientServer(t *testing.T) {
-	reg := register.NewRegister()
+	reg := mregister.NewRegister()
 	ctx := context.Background()

 	var mwfOk bool
@@ -361,7 +372,7 @@ func TestNativeClientServer(t *testing.T) {
 		server.Codec("application/json", jsonpbcodec.NewCodec()),
 		server.Codec("application/x-www-form-urlencoded", urlencodecodec.NewCodec()),
 		httpsrv.Middleware(mwf),
-		server.WrapHandler(NewServerHandlerWrapper(t)),
+		server.Hooks(server.HookHandler(NewServerHandlerWrapper(t))),
 	)

 	h := &Handler{t: t}
@@ -493,7 +504,7 @@ func TestNativeClientServer(t *testing.T) {
 }

 func TestNativeServer(t *testing.T) {
-	reg := register.NewRegister()
+	reg := mregister.NewRegister()
 	ctx := context.Background()

 	// create server
@@ -504,7 +515,7 @@ func TestNativeServer(t *testing.T) {
 		server.Codec("text/xml", xmlcodec.NewCodec()),
 		server.Codec("application/json", jsoncodec.NewCodec()),
 		server.Codec("application/x-www-form-urlencoded", urlencodecodec.NewCodec()),
-		server.WrapHandler(NewServerHandlerWrapper(t)),
+		// server.Hooks(server.HookHandler(NewServerHandlerWrapper(t))),
 	)

 	h := &Handler{t: t}
@@ -522,7 +533,7 @@ func TestNativeServer(t *testing.T) {
 	}

 	// start server
-	if err := srv.Start(); err != nil {
+	if err = srv.Start(); err != nil {
 		t.Fatal(err)
 	}

@@ -546,7 +557,7 @@ func TestNativeServer(t *testing.T) {
 		t.Fatal(err)
 	}
 	req.Header.Set("Authorization", "test")
-	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Content-Type", "text/xml")
 	rsp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		t.Fatal(err)
@@ -598,7 +609,7 @@ func TestNativeServer(t *testing.T) {
 	}
 	fn(rr, rq)
 	if rr.Code != http.StatusBadRequest {
-		t.Fatalf("invalid status received: %s\n", rr.Body.String())
+		t.Fatalf("invalid status received: %#+v %s\n", rr.Header(), rr.Body.String())
 	}
 	if s := rr.Body.String(); s != `{"msg":"my_error_test"}` {
 		t.Fatalf("Expected response %s, got %s", `{"msg":"my_error_test"}`, s)
@@ -657,7 +668,7 @@ func TestNativeServer(t *testing.T) {
 }

 func TestHTTPHandler(t *testing.T) {
-	reg := register.NewRegister()
+	reg := mregister.NewRegister()
 	ctx := context.Background()

 	// create server
@@ -736,7 +747,7 @@ func (h *handlerSwapper) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }

 func TestHTTPServer(t *testing.T) {
-	reg := register.NewRegister()
+	reg := mregister.NewRegister()
 	ctx := context.Background()

 	// create server mux
@@ -754,7 +765,7 @@ func TestHTTPServer(t *testing.T) {
 	srv := httpsrv.NewServer(
 		server.Address("127.0.0.1:0"),
 		server.Register(reg),
-		httpsrv.Server(&http.Server{Handler: h}),
+		httpsrv.HTTPServer(&http.Server{Handler: h}),
 		server.Codec("application/json", jsoncodec.NewCodec()),
 	)

--- a/server/http/proto/test_micro_http.pb.go
+++ b/server/http/proto/test_micro_http.pb.go
@@ -234,8 +234,8 @@ func (h *testServer) Call(ctx context.Context, req *CallReq, rsp *CallRsp) error
 	ctx, cancel = context.WithTimeout(ctx, td)
 	defer cancel()
 	v3.FillRequest(ctx, req,
-		v3.Cookie("Csrftoken", "true"),
 		v3.Header("Clientid", "true"),
+		v3.Cookie("Csrftoken", "true"),
 	)
 	return h.TestServer.Call(ctx, req, rsp)
 }
--- a/server/tcp/tcp_test.go
+++ b/server/tcp/tcp_test.go
@@ -10,7 +10,7 @@ import (

 	tcp "go.unistack.org/micro-server-tcp/v3"
 	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/register"
+	mregister "go.unistack.org/micro/v3/register/memory"
 	"go.unistack.org/micro/v3/server"
 )

@@ -22,7 +22,7 @@ type testHandler struct {
 func TestTCPServer(t *testing.T) {
 	ctx := context.Background()

-	reg := register.NewRegister()
+	reg := mregister.NewRegister()
 	if err := reg.Init(); err != nil {
 		t.Fatal(err)
 	}