add server type in metrics and tracing

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

.gitignore

@@ -0,0 +1,24 @@
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+bin
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+# Go workspace file
+go.work
+
+# General
+.DS_Store
+.idea
+.vscode

codec.go

@@ -1,8 +1,6 @@
 package grpc
 
 import (
-	"io"
-
 	"go.unistack.org/micro/v3/codec"
 	"google.golang.org/grpc/encoding"
 )
@@ -49,29 +47,3 @@ func (w *wrapGrpcCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option)
 	}
 	return w.Codec.Unmarshal(d, v)
 }
-
-func (w *wrapGrpcCodec) ReadHeader(conn io.Reader, m *codec.Message, mt codec.MessageType) error {
-	return nil
-}
-
-func (w *wrapGrpcCodec) ReadBody(conn io.Reader, v interface{}) error {
-	if m, ok := v.(*codec.Frame); ok {
-		_, err := conn.Read(m.Data)
-		return err
-	}
-	return codec.ErrInvalidMessage
-}
-
-func (w *wrapGrpcCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
-	// if we don't have a body
-	if v != nil {
-		b, err := w.Marshal(v)
-		if err != nil {
-			return err
-		}
-		m.Body = b
-	}
-	// write the body using the framing codec
-	_, err := conn.Write(m.Body)
-	return err
-}

generate.go

@@ -0,0 +1,4 @@
+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 proto/test.proto"

go.mod

@@ -1,17 +1,20 @@
 module go.unistack.org/micro-server-grpc/v3
 
-go 1.20
+go 1.22
+
+toolchain go1.23.1
 
 require (
-	github.com/golang/protobuf v1.5.3
-	go.unistack.org/micro/v3 v3.10.31
-	golang.org/x/net v0.17.0
-	google.golang.org/grpc v1.59.0
-	google.golang.org/protobuf v1.31.0
+	github.com/golang/protobuf v1.5.4
+	go.unistack.org/micro/v3 v3.10.97
+	golang.org/x/net v0.30.0
+	google.golang.org/grpc v1.67.1
+	google.golang.org/protobuf v1.35.1
 )
 
 require (
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
+	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
 )

go.sum

@@ -1,24 +1,20 @@
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-go.unistack.org/micro/v3 v3.10.31 h1:H5mowuB5i3AjG4GOj//V9oTldFZqfKtd5gJD+TeZYCM=
-go.unistack.org/micro/v3 v3.10.31/go.mod h1:eUgtvbtiiz6te93m0ZdmoecbitWwjdBmmr84srmEIKA=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE=
-google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
-google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
+go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
+google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
+google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

grpc.go

@@ -1,5 +1,5 @@
 // Package grpc provides a grpc server
-package grpc // import "go.unistack.org/micro-server-grpc/v3"
+package grpc
 
 import (
 	"context"
@@ -7,22 +7,30 @@ import (
 	"fmt"
 	"net"
 	"reflect"
-	"runtime/debug"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	greflection "google.golang.org/grpc/reflection"
+	reflectionv1pb "google.golang.org/grpc/reflection/grpc_reflection_v1"
+
 	// nolint: staticcheck
 	oldproto "github.com/golang/protobuf/proto"
 	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/errors"
 	"go.unistack.org/micro/v3/logger"
-	metadata "go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v3/options"
 	"go.unistack.org/micro/v3/register"
+	"go.unistack.org/micro/v3/semconv"
 	"go.unistack.org/micro/v3/server"
+	msync "go.unistack.org/micro/v3/sync"
+	"go.unistack.org/micro/v3/tracer"
 	"golang.org/x/net/netutil"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -44,15 +52,28 @@ type ServerReflection struct {
 }
 */
 
+type streamWrapper struct {
+	ctx context.Context
+	grpc.ServerStream
+}
+
+func (w *streamWrapper) Context() context.Context {
+	if w.ctx != nil {
+		return w.ctx
+	}
+	return w.ServerStream.Context()
+}
+
 type Server struct {
 	handlers       map[string]server.Handler
 	srv            *grpc.Server
 	exit           chan chan error
-	wg          *sync.WaitGroup
+	wg             *msync.WaitGroup
 	rsvc           *register.Service
 	subscribers    map[*subscriber][]broker.Subscriber
 	rpc            *rServer
 	opts           server.Options
+	unknownHandler grpc.StreamHandler
 	sync.RWMutex
 	started    bool
 	registered bool
@@ -71,6 +92,8 @@ func newServer(opts ...server.Option) *Server {
 		exit:        make(chan chan error),
 	}
 
+	g.opts.Meter = g.opts.Meter.Clone(meter.Labels("type", "grpc"))
+
 	return g
 }
 
@@ -98,27 +121,6 @@ func (g *Server) configure(opts ...server.Option) error {
 		o(&g.opts)
 	}
 
-	if err := g.opts.Register.Init(); err != nil {
-		return err
-	}
-	if err := g.opts.Broker.Init(); err != nil {
-		return err
-	}
-	if err := g.opts.Tracer.Init(); err != nil {
-		return err
-	}
-	if err := g.opts.Logger.Init(); err != nil {
-		return err
-	}
-	if err := g.opts.Meter.Init(); err != nil {
-		return err
-	}
-	if err := g.opts.Transport.Init(); err != nil {
-		return err
-	}
-
-	g.wg = g.opts.Wait
-
 	if g.opts.Context != nil {
 		if codecs, ok := g.opts.Context.Value(codecsKey{}).(map[string]encoding.Codec); ok && codecs != nil {
 			for k, v := range codecs {
@@ -153,8 +155,19 @@ func (g *Server) configure(opts ...server.Option) error {
 	}
 	g.srv = grpc.NewServer(gopts...)
 
-	if v, ok := g.opts.Context.Value(reflectionKey{}).(bool); ok {
-		g.reflection = v
+	if v, ok := g.opts.Context.Value(reflectionKey{}).(Reflector); ok {
+		reflectionv1pb.RegisterServerReflectionServer(
+			g.srv,
+			greflection.NewServerV1(greflection.ServerOptions{
+				Services:           v,
+				DescriptorResolver: v,
+				ExtensionResolver:  v,
+			}),
+		)
+	}
+
+	if h, ok := g.opts.Context.Value(unknownServiceHandlerKey{}).(grpc.StreamHandler); ok {
+		g.unknownHandler = h
 	}
 
 	if restart {
@@ -165,12 +178,9 @@ func (g *Server) configure(opts ...server.Option) error {
 }
 
 func (g *Server) getMaxMsgSize() int {
-	if g.opts.Context == nil {
-		return codec.DefaultMaxMsgSize
-	}
 	s, ok := g.opts.Context.Value(maxMsgSizeKey{}).(int)
 	if !ok {
-		return codec.DefaultMaxMsgSize
+		return 4 * 1024 * 1024
 	}
 	return s
 }
@@ -188,51 +198,53 @@ func (g *Server) getGrpcOptions() []grpc.ServerOption {
 	return opts
 }
 
-func (g *Server) handler(srv interface{}, stream grpc.ServerStream) (err error) {
+func (g *Server) handler(srv interface{}, stream grpc.ServerStream) error {
+	var err error
+
+	ctx := stream.Context()
+
 	fullMethod, ok := grpc.MethodFromServerStream(stream)
 	if !ok {
 		return status.Errorf(codes.Internal, "method does not exist in context")
 	}
 
-	serviceName, methodName, err := serviceMethod(fullMethod)
-	if err != nil {
-		return status.New(codes.InvalidArgument, err.Error()).Err()
-	}
-
-	defer func() {
-		if r := recover(); r != nil {
-			g.RLock()
-			config := g.opts
-			g.RUnlock()
-			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Errorf(config.Context, "panic in %s.%s recovered: %v", serviceName, methodName, r)
-				config.Logger.Error(config.Context, string(debug.Stack()))
-			}
-			err = errors.InternalServerError(g.opts.Name, "panic in %s.%s recovered: %v", serviceName, methodName, r)
-		} else if err != nil {
-			g.RLock()
-			config := g.opts
-			g.RUnlock()
-			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Errorf(config.Context, "grpc handler %s.%s got error: %s", serviceName, methodName, err)
-			}
-		}
-	}()
-
-	if g.wg != nil {
-		g.wg.Add(1)
-		defer g.wg.Done()
-	}
-
 	// get grpc metadata
-	gmd, ok := gmetadata.FromIncomingContext(stream.Context())
+	gmd, ok := gmetadata.FromIncomingContext(ctx)
 	if !ok {
 		gmd = gmetadata.MD{}
 	}
 
+	var serviceName, methodName string
+	serviceName, methodName, err = serviceMethod(fullMethod)
+	if err != nil {
+		err = status.New(codes.InvalidArgument, err.Error()).Err()
+		return err
+	}
+
+	endpointName := serviceName + "/" + methodName
+
+	ts := time.Now()
+	var sp tracer.Span
+	if !slices.Contains(tracer.DefaultSkipEndpoints, endpointName) {
+		ctx, sp = g.opts.Tracer.Start(ctx, "rpc-server",
+			tracer.WithSpanKind(tracer.SpanKindServer),
+			tracer.WithSpanLabels(
+				"endpoint", endpointName,
+				"server", "grpc",
+			),
+		)
+		defer func() {
+			st := status.Convert(err)
+			if st != nil || st.Code() != codes.OK {
+				sp.SetStatus(tracer.SpanStatusError, err.Error())
+			}
+			sp.Finish()
+		}()
+	}
+
 	md := metadata.New(len(gmd))
 	for k, v := range gmd {
-		md.Set(k, strings.Join(v, ", "))
+		md[k] = strings.Join(v, ", ")
 	}
 	md.Set("Path", fullMethod)
 	md.Set("Micro-Server", "grpc")
@@ -275,17 +287,42 @@ func (g *Server) handler(srv interface{}, stream grpc.ServerStream) (err error)
 	}
 
 	// create new context
-	ctx := metadata.NewIncomingContext(stream.Context(), md)
+	ctx = metadata.NewIncomingContext(ctx, md)
+
+	stream = &streamWrapper{ctx, stream}
+
+	if !slices.Contains(meter.DefaultSkipEndpoints, endpointName) {
+		g.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", endpointName, "server", "grpc").Inc()
+		defer func() {
+			te := time.Since(ts)
+			g.opts.Meter.Summary(semconv.ServerRequestLatencyMicroseconds, "endpoint", endpointName, "server", "grpc").Update(te.Seconds())
+			g.opts.Meter.Histogram(semconv.ServerRequestDurationSeconds, "endpoint", endpointName, "server", "grpc").Update(te.Seconds())
+			g.opts.Meter.Counter(semconv.ServerRequestInflight, "endpoint", endpointName, "server", "grpc").Dec()
+
+			st := status.Convert(err)
+			if st == nil || st.Code() == codes.OK {
+				g.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", endpointName, "server", "grpc", "status", "success", "code", strconv.Itoa(int(codes.OK))).Inc()
+			} else {
+				g.opts.Meter.Counter(semconv.ServerRequestTotal, "endpoint", endpointName, "server", "grpc", "status", "failure", "code", strconv.Itoa(int(st.Code()))).Inc()
+			}
+		}()
+	}
+
+	if g.opts.Wait != nil {
+		g.opts.Wait.Add(1)
+		defer g.opts.Wait.Done()
+	}
 
 	// get peer from context
-	if p, ok := peer.FromContext(stream.Context()); ok {
+	if p, ok := peer.FromContext(ctx); ok {
 		md.Set("Remote", p.Addr.String())
 		ctx = peer.NewContext(ctx, p)
 	}
 
 	// set the timeout if we have it
 	if len(td) > 0 {
-		if n, err := strconv.ParseUint(td, 10, 64); err == nil {
+		var n uint64
+		if n, err = strconv.ParseUint(td, 10, 64); err == nil {
 			var cancel context.CancelFunc
 			ctx, cancel = context.WithTimeout(ctx, time.Duration(n))
 			defer cancel()
@@ -296,54 +333,34 @@ func (g *Server) handler(srv interface{}, stream grpc.ServerStream) (err error)
 	svc := g.rpc.serviceMap[serviceName]
 	g.rpc.mu.RUnlock()
 
-	/*
-		if svc == nil && g.reflection && methodName == "ServerReflectionInfo" {
-			rfl := &ServerReflection{srv: g.srv, s: &serverReflectionServer{s: g.srv}}
-			svc = &service{}
-			svc.typ = reflect.TypeOf(rfl)
-			svc.rcvr = reflect.ValueOf(rfl)
-			svc.name = reflect.Indirect(svc.rcvr).Type().Name()
-			svc.method = make(map[string]*methodType)
-			typ := reflect.TypeOf(rfl)
-			if me, ok := typ.MethodByName("ServerReflectionInfo"); ok {
-				g.rpc.mu.Lock()
-				ep, err := prepareEndpoint(me)
-				if ep != nil && err != nil {
-					svc.method["ServerReflectionInfo"] = ep
-				} else if err != nil {
-					return status.New(codes.Unimplemented, err.Error()).Err()
-				}
-				g.rpc.mu.Unlock()
-			}
-		}
-	*/
-
 	if svc == nil {
-		if g.opts.Context != nil {
-			if h, ok := g.opts.Context.Value(unknownServiceHandlerKey{}).(grpc.StreamHandler); ok {
-				return h(srv, stream)
+		if g.unknownHandler != nil {
+			err = g.unknownHandler(srv, stream)
+			return err
 		}
-		}
-		return status.New(codes.Unimplemented, fmt.Sprintf("unknown service %s", serviceName)).Err()
+		err = status.New(codes.Unimplemented, fmt.Sprintf("unknown service %s", serviceName)).Err()
+		return err
 	}
 
 	mtype := svc.method[methodName]
 	if mtype == nil {
-		if g.opts.Context != nil {
-			if h, ok := g.opts.Context.Value(unknownServiceHandlerKey{}).(grpc.StreamHandler); ok {
-				return h(srv, stream)
+		if g.unknownHandler != nil {
+			err = g.unknownHandler(srv, stream)
+			return err
 		}
-		}
-		return status.New(codes.Unimplemented, fmt.Sprintf("unknown service method %s.%s", serviceName, methodName)).Err()
+		err = status.New(codes.Unimplemented, fmt.Sprintf("unknown service method %s.%s", serviceName, methodName)).Err()
+		return err
 	}
 
 	// process unary
 	if !mtype.stream {
-		return g.processRequest(ctx, stream, svc, mtype, ct)
+		err = g.processRequest(ctx, stream, svc, mtype, ct)
+	} else {
+		// process stream
+		err = g.processStream(ctx, stream, svc, mtype, ct)
 	}
 
-	// process stream
-	return g.processStream(ctx, stream, svc, mtype, ct)
+	return err
 }
 
 func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, service *service, mtype *methodType, ct string) error {
@@ -395,10 +412,11 @@ func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, s
 		return err
 	}
 
-	// wrap the handler func
-	for i := len(g.opts.HdlrWrappers); i > 0; i-- {
-		fn = g.opts.HdlrWrappers[i-1](fn)
+	g.opts.Hooks.EachNext(func(hook options.Hook) {
+		if h, ok := hook.(server.HookHandler); ok {
+			fn = h(fn)
 		}
+	})
 
 	statusCode := codes.OK
 	statusDesc := ""
@@ -431,7 +449,7 @@ func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, s
 			config := g.opts
 			g.RUnlock()
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Warn(config.Context, "handler error will not be transferred properly, must return *errors.Error or proto.Message")
+				config.Logger.Error(config.Context, "handler error will not be transferred properly, must return *errors.Error or proto.Message")
 			}
 			// default case user pass own error type that not proto based
 			statusCode = convertCode(verr)
@@ -447,53 +465,8 @@ func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, s
 	}
 
 	return status.New(statusCode, statusDesc).Err()
-	//	}
 }
 
-/*
-type reflectStream struct {
-	stream server.Stream
-}
-
-func (s *reflectStream) Send(rsp *grpcreflect.ServerReflectionResponse) error {
-	return s.stream.Send(rsp)
-}
-
-func (s *reflectStream) Recv() (*grpcreflect.ServerReflectionRequest, error) {
-	req := &grpcreflect.ServerReflectionRequest{}
-	err := s.stream.Recv(req)
-	return req, err
-}
-
-func (s *reflectStream) SetHeader(gmetadata.MD) error {
-	return nil
-}
-
-func (s *reflectStream) SendHeader(gmetadata.MD) error {
-	return nil
-}
-
-func (s *reflectStream) SetTrailer(gmetadata.MD) {
-
-}
-
-func (s *reflectStream) Context() context.Context {
-	return s.stream.Context()
-}
-
-func (s *reflectStream) SendMsg(m interface{}) error {
-	return s.stream.Send(m)
-}
-
-func (s *reflectStream) RecvMsg(m interface{}) error {
-	return s.stream.Recv(m)
-}
-
-func (g *ServerReflection) ServerReflectionInfo(ctx context.Context, stream server.Stream) error {
-	return g.s.ServerReflectionInfo(&reflectStream{stream})
-}
-*/
-
 func (g *Server) processStream(ctx context.Context, stream grpc.ServerStream, service *service, mtype *methodType, ct string) error {
 	opts := g.opts
 
@@ -523,9 +496,11 @@ func (g *Server) processStream(ctx context.Context, stream grpc.ServerStream, se
 		return nil
 	}
 
-	for i := len(opts.HdlrWrappers); i > 0; i-- {
-		fn = opts.HdlrWrappers[i-1](fn)
+	opts.Hooks.EachNext(func(hook options.Hook) {
+		if h, ok := hook.(server.HookHandler); ok {
+			fn = h(fn)
 		}
+	})
 
 	statusCode := codes.OK
 	statusDesc := ""
@@ -693,7 +668,7 @@ func (g *Server) Register() error {
 
 	if !registered {
 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Infof(config.Context, "Register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].ID)
+			config.Logger.Info(config.Context, fmt.Sprintf("Register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].ID))
 		}
 	}
 
@@ -729,7 +704,7 @@ func (g *Server) Deregister() error {
 	}
 
 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Infof(config.Context, "Deregistering node: %s", service.Nodes[0].ID)
+		config.Logger.Info(config.Context, "Deregistering node: "+service.Nodes[0].ID)
 	}
 
 	if err := server.DefaultDeregisterFunc(service, config); err != nil {
@@ -753,11 +728,11 @@ func (g *Server) Deregister() error {
 			go func(s broker.Subscriber) {
 				defer wg.Done()
 				if config.Logger.V(logger.InfoLevel) {
-					config.Logger.Infof(config.Context, "Unsubscribing from topic: %s", s.Topic())
+					config.Logger.Info(config.Context, "Unsubscribing from topic: "+s.Topic())
 				}
 				if err := s.Unsubscribe(g.opts.Context); err != nil {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(config.Context, "Unsubscribing from topic: %s err: %v", s.Topic(), err)
+						config.Logger.Error(config.Context, "Unsubscribing from topic: "+s.Topic(), err)
 					}
 				}
 			}(sub)
@@ -804,7 +779,7 @@ func (g *Server) Start() error {
 	}
 
 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Infof(config.Context, "Server [grpc] Listening on %s", ts.Addr().String())
+		config.Logger.Info(config.Context, "Server [grpc] Listening on "+ts.Addr().String())
 	}
 	g.Lock()
 	g.opts.Address = ts.Addr().String()
@@ -818,13 +793,13 @@ func (g *Server) Start() error {
 		// connect to the broker
 		if err = config.Broker.Connect(config.Context); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Errorf(config.Context, "Broker [%s] connect error: %v", config.Broker.String(), err)
+				config.Logger.Error(config.Context, fmt.Sprintf("broker [%s] connect error", config.Broker.String()), err)
 			}
 			return err
 		}
 
 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Infof(config.Context, "Broker [%s] Connected to %s", config.Broker.String(), config.Broker.Address())
+			config.Logger.Info(config.Context, fmt.Sprintf("broker [%s] Connected to %s", config.Broker.String(), config.Broker.Address()))
 		}
 	}
 
@@ -832,13 +807,13 @@ func (g *Server) Start() error {
 	// nolint: nestif
 	if err = g.opts.RegisterCheck(config.Context); err != nil {
 		if config.Logger.V(logger.ErrorLevel) {
-			config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, err)
+			config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s register check error", config.Name, config.ID), err)
 		}
 	} else {
 		// announce self to the world
 		if err = g.Register(); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Errorf(config.Context, "Server register error: %v", err)
+				config.Logger.Error(config.Context, "Server register error", err)
 			}
 		}
 	}
@@ -851,11 +826,11 @@ func (g *Server) Start() error {
 	go func() {
 		if err = g.srv.Serve(ts); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Errorf(config.Context, "gRPC Server start error: %v", err)
+				config.Logger.Error(config.Context, "gRPC Server start error", err)
 			}
 			if err = g.Stop(); err != nil {
 				if config.Logger.V(logger.ErrorLevel) {
-					config.Logger.Errorf(config.Context, "gRPC Server stop error: %v", err)
+					config.Logger.Error(config.Context, "gRPC Server stop error", err)
 				}
 			}
 		}
@@ -885,23 +860,23 @@ func (g *Server) Start() error {
 				// nolint: nestif
 				if rerr != nil && registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s, deregister it", config.Name, config.ID, rerr)
+						config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s register check error, deregister it", config.Name, config.ID), rerr)
 					}
 					// deregister self in case of error
 					if err = g.Deregister(); err != nil {
 						if config.Logger.V(logger.ErrorLevel) {
-							config.Logger.Errorf(config.Context, "Server %s-%s deregister error: %s", config.Name, config.ID, err)
+							config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s deregister error", config.Name, config.ID), err)
 						}
 					}
 				} else if rerr != nil && !registered {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, rerr)
+						config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s register check error", config.Name, config.ID), rerr)
 					}
 					continue
 				}
 				if err = g.Register(); err != nil {
 					if config.Logger.V(logger.ErrorLevel) {
-						config.Logger.Errorf(config.Context, "Server %s-%s register error: %s", config.Name, config.ID, err)
+						config.Logger.Error(config.Context, fmt.Sprintf("Server %s-%s register error", config.Name, config.ID), err)
 					}
 				}
 			// wait for exit
@@ -913,13 +888,13 @@ func (g *Server) Start() error {
 		// deregister self
 		if err = g.Deregister(); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Errorf(config.Context, "Server deregister error: %v", err)
+				config.Logger.Error(config.Context, "Server deregister error", err)
 			}
 		}
 
 		// wait for waitgroup
-		if g.wg != nil {
-			g.wg.Wait()
+		if g.opts.Wait != nil {
+			g.opts.Wait.Wait()
 		}
 
 		// stop the grpc server
@@ -932,7 +907,7 @@ func (g *Server) Start() error {
 
 		select {
 		case <-exit:
-		case <-time.After(time.Second):
+		case <-time.After(g.opts.GracefulTimeout):
 			g.srv.Stop()
 		}
 
@@ -940,12 +915,12 @@ func (g *Server) Start() error {
 		ch <- nil
 
 		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Infof(config.Context, "Broker [%s] Disconnected from %s", config.Broker.String(), config.Broker.Address())
+			config.Logger.Info(config.Context, fmt.Sprintf("broker [%s] Disconnected from %s", config.Broker.String(), config.Broker.Address()))
 		}
 		// disconnect broker
 		if err = config.Broker.Disconnect(config.Context); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Errorf(config.Context, "Broker [%s] disconnect error: %v", config.Broker.String(), err)
+				config.Logger.Error(config.Context, fmt.Sprintf("broker [%s] disconnect error", config.Broker.String()), err)
 			}
 		}
 	}()
@@ -958,37 +933,6 @@ func (g *Server) Start() error {
 	return nil
 }
 
-func (g *Server) subscribe() error {
-	config := g.opts
-
-	for sb := range g.subscribers {
-		handler := g.createSubHandler(sb, config)
-		var opts []broker.SubscribeOption
-		if queue := sb.Options().Queue; len(queue) > 0 {
-			opts = append(opts, broker.SubscribeGroup(queue))
-		}
-
-		subCtx := config.Context
-		if cx := sb.Options().Context; cx != nil {
-			subCtx = cx
-		}
-		opts = append(opts, broker.SubscribeContext(subCtx))
-		opts = append(opts, broker.SubscribeAutoAck(sb.Options().AutoAck))
-		opts = append(opts, broker.SubscribeBodyOnly(sb.Options().BodyOnly))
-
-		if config.Logger.V(logger.InfoLevel) {
-			config.Logger.Infof(config.Context, "Subscribing to topic: %s", sb.Topic())
-		}
-		sub, err := config.Broker.Subscribe(subCtx, sb.Topic(), handler, opts...)
-		if err != nil {
-			return err
-		}
-		g.subscribers[sb] = []broker.Subscriber{sub}
-	}
-
-	return nil
-}
-
 func (g *Server) Stop() error {
 	g.RLock()
 	if !g.started {

proto/test.pb.go

@@ -0,0 +1,208 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.26.0
+// 	protoc        v4.25.2
+// source: test.proto
+
+package testpb
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type CallReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data string `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+}
+
+func (x *CallReq) Reset() {
+	*x = CallReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_test_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CallReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CallReq) ProtoMessage() {}
+
+func (x *CallReq) ProtoReflect() protoreflect.Message {
+	mi := &file_test_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CallReq.ProtoReflect.Descriptor instead.
+func (*CallReq) Descriptor() ([]byte, []int) {
+	return file_test_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *CallReq) GetData() string {
+	if x != nil {
+		return x.Data
+	}
+	return ""
+}
+
+type CallRsp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data string `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+}
+
+func (x *CallRsp) Reset() {
+	*x = CallRsp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_test_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CallRsp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CallRsp) ProtoMessage() {}
+
+func (x *CallRsp) ProtoReflect() protoreflect.Message {
+	mi := &file_test_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CallRsp.ProtoReflect.Descriptor instead.
+func (*CallRsp) Descriptor() ([]byte, []int) {
+	return file_test_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *CallRsp) GetData() string {
+	if x != nil {
+		return x.Data
+	}
+	return ""
+}
+
+var File_test_proto protoreflect.FileDescriptor
+
+var file_test_proto_rawDesc = []byte{
+	0x0a, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x74, 0x65,
+	0x73, 0x74, 0x22, 0x1d, 0x0a, 0x07, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a,
+	0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x22, 0x1d, 0x0a, 0x07, 0x43, 0x61, 0x6c, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x32, 0x33, 0x0a, 0x0b, 0x54, 0x65, 0x73, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,
+	0x24, 0x0a, 0x04, 0x43, 0x61, 0x6c, 0x6c, 0x12, 0x0d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x43,
+	0x61, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x0d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x43, 0x61,
+	0x6c, 0x6c, 0x52, 0x73, 0x70, 0x42, 0x0b, 0x5a, 0x09, 0x2e, 0x2f, 0x3b, 0x74, 0x65, 0x73, 0x74,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_test_proto_rawDescOnce sync.Once
+	file_test_proto_rawDescData = file_test_proto_rawDesc
+)
+
+func file_test_proto_rawDescGZIP() []byte {
+	file_test_proto_rawDescOnce.Do(func() {
+		file_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_test_proto_rawDescData)
+	})
+	return file_test_proto_rawDescData
+}
+
+var file_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_test_proto_goTypes = []interface{}{
+	(*CallReq)(nil), // 0: test.CallReq
+	(*CallRsp)(nil), // 1: test.CallRsp
+}
+var file_test_proto_depIdxs = []int32{
+	0, // 0: test.TestService.Call:input_type -> test.CallReq
+	1, // 1: test.TestService.Call:output_type -> test.CallRsp
+	1, // [1:2] is the sub-list for method output_type
+	0, // [0:1] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_test_proto_init() }
+func file_test_proto_init() {
+	if File_test_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CallReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CallRsp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_test_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_test_proto_goTypes,
+		DependencyIndexes: file_test_proto_depIdxs,
+		MessageInfos:      file_test_proto_msgTypes,
+	}.Build()
+	File_test_proto = out.File
+	file_test_proto_rawDesc = nil
+	file_test_proto_goTypes = nil
+	file_test_proto_depIdxs = nil
+}

proto/test.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+package test;
+
+option go_package = "./;testpb";
+
+
+service TestService {
+  rpc Call(CallReq) returns (CallRsp);
+}
+
+message CallReq {
+  string data = 1;
+}
+
+message CallRsp {
+  string data = 1;
+}

proto/test_grpc.pb.go

@@ -0,0 +1,109 @@
+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-grpc v1.3.0
+// - protoc             v4.25.2
+// source: test.proto
+
+package testpb
+
+import (
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7
+
+const (
+	TestService_Call_FullMethodName = "/test.TestService/Call"
+)
+
+// TestServiceClient is the client API for TestService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type TestServiceClient interface {
+	Call(ctx context.Context, in *CallReq, opts ...grpc.CallOption) (*CallRsp, error)
+}
+
+type testServiceClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewTestServiceClient(cc grpc.ClientConnInterface) TestServiceClient {
+	return &testServiceClient{cc}
+}
+
+func (c *testServiceClient) Call(ctx context.Context, in *CallReq, opts ...grpc.CallOption) (*CallRsp, error) {
+	out := new(CallRsp)
+	err := c.cc.Invoke(ctx, TestService_Call_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// TestServiceServer is the server API for TestService service.
+// All implementations must embed UnimplementedTestServiceServer
+// for forward compatibility
+type TestServiceServer interface {
+	Call(context.Context, *CallReq) (*CallRsp, error)
+	mustEmbedUnimplementedTestServiceServer()
+}
+
+// UnimplementedTestServiceServer must be embedded to have forward compatible implementations.
+type UnimplementedTestServiceServer struct {
+}
+
+func (UnimplementedTestServiceServer) Call(context.Context, *CallReq) (*CallRsp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Call not implemented")
+}
+func (UnimplementedTestServiceServer) mustEmbedUnimplementedTestServiceServer() {}
+
+// UnsafeTestServiceServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to TestServiceServer will
+// result in compilation errors.
+type UnsafeTestServiceServer interface {
+	mustEmbedUnimplementedTestServiceServer()
+}
+
+func RegisterTestServiceServer(s grpc.ServiceRegistrar, srv TestServiceServer) {
+	s.RegisterService(&TestService_ServiceDesc, srv)
+}
+
+func _TestService_Call_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CallReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TestServiceServer).Call(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: TestService_Call_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TestServiceServer).Call(ctx, req.(*CallReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+// TestService_ServiceDesc is the grpc.ServiceDesc for TestService service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var TestService_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "test.TestService",
+	HandlerType: (*TestServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Call",
+			Handler:    _TestService_Call_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "test.proto",
+}

reflection.go

@@ -14,10 +14,8 @@ type Reflector interface {
 const (
 	// ReflectV1ServiceName is the fully-qualified name of the v1 version of the reflection service.
 	ReflectV1ServiceName = "grpc.reflection.v1.ServerReflection"
-	// ReflectV1AlphaServiceName is the fully-qualified name of the v1alpha version of the reflection service.
-	ReflectV1AlphaServiceName = "grpc.reflection.v1alpha.ServerReflection"
-
+	// ReflectServiceURLPathV1 is the full path for reflection service endpoint
 	ReflectServiceURLPathV1 = "/" + ReflectV1ServiceName + "/"
-	ReflectServiceURLPathV1Alpha = "/" + ReflectV1AlphaServiceName + "/"
+	// ReflectMethodName is the reflection service name
 	ReflectMethodName = "ServerReflectionInfo"
 )

reflection_test.go

@@ -0,0 +1,62 @@
+package grpc
+
+import (
+	"fmt"
+	"testing"
+
+	_ "go.unistack.org/micro-server-grpc/v3/proto"
+	"go.unistack.org/micro/v3/server"
+	"google.golang.org/grpc"
+	"google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoregistry"
+)
+
+type reflector struct{}
+
+func (r *reflector) FindFileByPath(path string) (protoreflect.FileDescriptor, error) {
+	fd, err := protoregistry.GlobalFiles.FindFileByPath(path)
+	if err != nil {
+		fmt.Printf("err: %v\n", err)
+		return nil, err
+	}
+	return fd, nil
+}
+
+func (r *reflector) FindDescriptorByName(name protoreflect.FullName) (protoreflect.Descriptor, error) {
+	fd, err := protoregistry.GlobalFiles.FindDescriptorByName(name)
+	if err != nil {
+		return nil, err
+	}
+	return fd, nil
+}
+
+func (r *reflector) GetServiceInfo() map[string]grpc.ServiceInfo {
+	fmt.Printf("GetServiceInfo\n")
+	return nil
+}
+
+func (r *reflector) FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error) {
+	fmt.Printf("FindExtensionByName field %#+v\n", field)
+	return nil, nil
+}
+
+func (r *reflector) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) {
+	fmt.Printf("FindExtensionByNumber message %#+v field %#+v\n", message, field)
+	return nil, nil
+}
+
+func (r *reflector) RangeExtensionsByMessage(message protoreflect.FullName, f func(protoreflect.ExtensionType) bool) {
+	fmt.Printf("RangeExtensionsByMessage\n")
+}
+
+func TestReflector(t *testing.T) {
+	srv := NewServer(Reflection(&reflector{}), server.Address(":12345"))
+	if err := srv.Init(); err != nil {
+		t.Fatal(err)
+	}
+	if err := srv.Start(); err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("addr %s", srv.Options().Address)
+	select {}
+}

request.go

@@ -8,10 +8,7 @@ import (
 	"go.unistack.org/micro/v3/server"
 )
 
-var (
-	_ server.Request = &rpcRequest{}
-	_ server.Message = &rpcMessage{}
-)
+var _ server.Request = &rpcRequest{}
 
 type rpcRequest struct {
 	rw          io.ReadWriter
@@ -25,14 +22,6 @@ type rpcRequest struct {
 	stream      bool
 }
 
-type rpcMessage struct {
-	payload     interface{}
-	codec       codec.Codec
-	header      metadata.Metadata
-	topic       string
-	contentType string
-}
-
 func (r *rpcRequest) ContentType() string {
 	return r.contentType
 }
@@ -58,11 +47,7 @@ func (r *rpcRequest) Header() metadata.Metadata {
 }
 
 func (r *rpcRequest) Read() ([]byte, error) {
-	f := &codec.Frame{}
-	if err := r.codec.ReadBody(r.rw, f); err != nil {
-		return nil, err
-	}
-	return f.Data, nil
+	return nil, nil
 }
 
 func (r *rpcRequest) Stream() bool {
@@ -72,23 +57,3 @@ func (r *rpcRequest) Stream() bool {
 func (r *rpcRequest) Body() interface{} {
 	return r.payload
 }
-
-func (r *rpcMessage) ContentType() string {
-	return r.contentType
-}
-
-func (r *rpcMessage) Topic() string {
-	return r.topic
-}
-
-func (r *rpcMessage) Body() interface{} {
-	return r.payload
-}
-
-func (r *rpcMessage) Header() metadata.Metadata {
-	return r.header
-}
-
-func (r *rpcMessage) Codec() codec.Codec {
-	return r.codec
-}

response.go

@@ -27,8 +27,5 @@ func (r *rpcResponse) WriteHeader(hdr metadata.Metadata) {
 }
 
 func (r *rpcResponse) Write(b []byte) error {
-	return r.codec.Write(r.rw, &codec.Message{
-		Header: r.header,
-		Body:   b,
-	}, nil)
+	return nil
 }

subscriber.go

@@ -4,17 +4,47 @@ import (
 	"context"
 	"fmt"
 	"reflect"
-	"runtime/debug"
 	"strings"
 
 	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/errors"
+	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/options"
 	"go.unistack.org/micro/v3/register"
 	"go.unistack.org/micro/v3/server"
 )
 
+var _ server.Message = &rpcMessage{}
+
+type rpcMessage struct {
+	payload     interface{}
+	codec       codec.Codec
+	header      metadata.Metadata
+	topic       string
+	contentType string
+}
+
+func (r *rpcMessage) ContentType() string {
+	return r.contentType
+}
+
+func (r *rpcMessage) Topic() string {
+	return r.topic
+}
+
+func (r *rpcMessage) Body() interface{} {
+	return r.payload
+}
+
+func (r *rpcMessage) Header() metadata.Metadata {
+	return r.header
+}
+
+func (r *rpcMessage) Codec() codec.Codec {
+	return r.codec
+}
+
 type handler struct {
 	reqType reflect.Type
 	ctxType reflect.Type
@@ -104,16 +134,6 @@ func newSubscriber(topic string, sub interface{}, opts ...server.SubscriberOptio
 
 func (g *Server) createSubHandler(sb *subscriber, opts server.Options) broker.Handler {
 	return func(p broker.Event) (err error) {
-		defer func() {
-			if r := recover(); r != nil {
-				if g.opts.Logger.V(logger.ErrorLevel) {
-					g.opts.Logger.Error(g.opts.Context, "panic recovered: ", r)
-					g.opts.Logger.Error(g.opts.Context, string(debug.Stack()))
-				}
-				err = errors.InternalServerError(g.opts.Name+".subscriber", "panic recovered: %v", r)
-			}
-		}()
-
 		msg := p.Message()
 		// if we don't have headers, create empty map
 		if msg.Header == nil {
@@ -177,9 +197,11 @@ func (g *Server) createSubHandler(sb *subscriber, opts server.Options) broker.Ha
 				return nil
 			}
 
-			for i := len(opts.SubWrappers); i > 0; i-- {
-				fn = opts.SubWrappers[i-1](fn)
+			opts.Hooks.EachNext(func(hook options.Hook) {
+				if h, ok := hook.(server.HookSubHandler); ok {
+					fn = h(fn)
 				}
+			})
 
 			if g.wg != nil {
 				g.wg.Add(1)
@@ -226,3 +248,38 @@ func (s *subscriber) Endpoints() []*register.Endpoint {
 func (s *subscriber) Options() server.SubscriberOptions {
 	return s.opts
 }
+
+func (g *Server) subscribe() error {
+	config := g.opts
+	subCtx := config.Context
+
+	for sb := range g.subscribers {
+
+		if cx := sb.Options().Context; cx != nil {
+			subCtx = cx
+		}
+
+		opts := []broker.SubscribeOption{
+			broker.SubscribeContext(subCtx),
+			broker.SubscribeAutoAck(sb.Options().AutoAck),
+			broker.SubscribeBodyOnly(sb.Options().BodyOnly),
+		}
+
+		if queue := sb.Options().Queue; len(queue) > 0 {
+			opts = append(opts, broker.SubscribeGroup(queue))
+		}
+
+		if config.Logger.V(logger.InfoLevel) {
+			config.Logger.Info(config.Context, "subscribing to topic: "+sb.Topic())
+		}
+
+		sub, err := config.Broker.Subscribe(subCtx, sb.Topic(), g.createSubHandler(sb, config), opts...)
+		if err != nil {
+			return err
+		}
+
+		g.subscribers[sb] = []broker.Subscriber{sub}
+	}
+
+	return nil
+}

util_test.go

@@ -26,6 +26,7 @@ func TestServiceMethod(t *testing.T) {
 		if err != nil && test.err == true {
 			continue
 		}
+		t.Logf("input %s service %s method %s", test.input, service, method)
 		// unexpected error
 		if err != nil && test.err == false {
 			t.Fatalf("unexpected err %v for %+v", err, test)