Bump google.golang.org/grpc from 1.51.0 to 1.52.0 (#144)

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.51.0 to 1.52.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.51.0...v1.52.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/autoapprove.yml

@@ -0,0 +1,20 @@
+name: "autoapprove"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  autoapprove:
+    runs-on: ubuntu-latest
+    steps:
+      - name: approve
+        uses: hmarr/auto-approve-action@v3
+        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
+        id: approve
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -0,0 +1,21 @@
+name: "automerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'vtolstov'
+    steps:
+      - name: merge
+        id: merge
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/build.yml

@@ -3,19 +3,20 @@ on:
  push:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.3.1
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

.github/workflows/codeql-analysis.yml

@@ -9,7 +9,7 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: "codeql"
 
 on:
   workflow_run:
@@ -17,16 +17,16 @@ on:
     types:
       - completed
   push:
-    branches: [ master ]
+    branches: [ master, v3 ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master, v3 ]
   schedule:
     - cron: '34 1 * * 0'
 
 jobs:
   analyze:
-    name: Analyze
+    name: analyze
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -42,12 +42,15 @@ jobs:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
     # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+    - name: init
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,8 +60,8 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+    - name: autobuild
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -71,5 +74,5 @@ jobs:
     #   make bootstrap
     #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+    - name: analyze
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -1,66 +1,27 @@
-name: "prautomerge"
+name: "dependabot-automerge"
 
 on:
-  workflow_run:
-    workflows: ["prbuild"]
-    types:
-      - completed
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
 
 permissions:
-  contents: write
   pull-requests: write
+  contents: write
 
 jobs:
-  Dependabot-Automerge:
+  automerge:
     runs-on: ubuntu-latest
-    # Contains workaround to execute if dependabot updates the PR by checking for the base branch in the linked PR
-    # The the github.event.workflow_run.event value is 'push' and not 'pull_request'
-    # dont work with multiple workflows when last returns success
-    if: >-
-      github.event.workflow_run.conclusion == 'success'
-      && github.actor == 'dependabot[bot]'
-      && github.event.sender.login == 'dependabot[bot]'
-      && github.event.sender.type == 'Bot'
-      && (github.event.workflow_run.event == 'pull_request'
-          || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
+    if: github.actor == 'dependabot[bot]'
     steps:
-      - name: Approve Changes and Merge changes if label 'dependencies' is set
-        uses: actions/github-script@v4
+      - name: metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.5
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            console.log(context.payload.workflow_run);
-            
-            var labelNames = await github.paginate(
-              github.issues.listLabelsOnIssue,
-              {
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                issue_number: context.payload.workflow_run.pull_requests[0].number,
-              },
-              (response) => response.data.map(
-                (label) => label.name
-              )
-            );
-
-            console.log(labelNames);
-
-            if (labelNames.includes('dependencies')) {
-              console.log('Found label');
-
-              await github.pulls.createReview({
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                pull_number: context.payload.workflow_run.pull_requests[0].number,
-                event: 'APPROVE'
-              });
-              console.log('Approved PR');
-
-              await github.pulls.merge({
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                pull_number: context.payload.workflow_run.pull_requests[0].number,
-              });
-
-              console.log('Merged PR');
-            }
+          github-token: "${{ secrets.TOKEN }}"
+      - name: merge
+        id: merge
+        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/pr.yml

@@ -3,19 +3,20 @@ on:
   pull_request:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.3.1
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

go.mod

@@ -4,8 +4,8 @@ go 1.16
 
 require (
 	github.com/golang/protobuf v1.5.2
-	go.unistack.org/micro/v3 v3.8.5
-	golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b
-	google.golang.org/grpc v1.40.0
-	google.golang.org/protobuf v1.27.1
+	go.unistack.org/micro/v3 v3.10.1
+	golang.org/x/net v0.4.0
+	google.golang.org/grpc v1.52.0
+	google.golang.org/protobuf v1.28.1
 )

grpc.go

@@ -35,7 +35,7 @@ import (
 )
 
 const (
-	defaultContentType = "application/grpc+proto"
+	DefaultContentType = "application/grpc"
 )
 
 /*
@@ -55,7 +55,6 @@ type grpcServer struct {
 	rpc         *rServer
 	opts        server.Options
 	sync.RWMutex
-	init       bool
 	started    bool
 	registered bool
 	reflection bool
@@ -109,9 +108,6 @@ func (g *grpcServer) configure(opts ...server.Option) error {
 	if err := g.opts.Tracer.Init(); err != nil {
 		return err
 	}
-	if err := g.opts.Auth.Init(); err != nil {
-		return err
-	}
 	if err := g.opts.Logger.Init(); err != nil {
 		return err
 	}
@@ -145,7 +141,7 @@ func (g *grpcServer) configure(opts ...server.Option) error {
 	}
 
 	if opts := g.getGrpcOptions(); opts != nil {
-		gopts = append(gopts, opts...)
+		gopts = append(opts, gopts...)
 	}
 
 	g.rsvc = nil
@@ -166,8 +162,6 @@ func (g *grpcServer) configure(opts ...server.Option) error {
 		return g.Start()
 	}
 
-	g.init = true
-
 	return nil
 }
 
@@ -203,31 +197,6 @@ func (g *grpcServer) getGrpcOptions() []grpc.ServerOption {
 }
 
 func (g *grpcServer) handler(srv interface{}, stream grpc.ServerStream) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			g.RLock()
-			config := g.opts
-			g.RUnlock()
-			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Error(config.Context, "panic recovered: ", r)
-				config.Logger.Error(config.Context, string(debug.Stack()))
-			}
-			err = errors.InternalServerError(g.opts.Name, "panic recovered: %v", 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 got error: %s", err)
-			}
-		}
-	}()
-
-	if g.wg != nil {
-		g.wg.Add(1)
-		defer g.wg.Done()
-	}
-
 	fullMethod, ok := grpc.MethodFromServerStream(stream)
 	if !ok {
 		return status.Errorf(codes.Internal, "method does not exist in context")
@@ -238,6 +207,31 @@ func (g *grpcServer) handler(srv interface{}, stream grpc.ServerStream) (err err
 		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())
 	if !ok {
@@ -249,14 +243,33 @@ func (g *grpcServer) handler(srv interface{}, stream grpc.ServerStream) (err err
 		md.Set(k, strings.Join(v, ", "))
 	}
 
+	var td string
 	// timeout for server deadline
-	to, ok := md.Get("timeout")
-	if ok {
+	if v, ok := md.Get("timeout"); ok {
 		md.Del("timeout")
+		td = v
+	}
+	if v, ok := md.Get("Grpc-Timeout"); ok {
+		md.Del("Grpc-Timeout")
+		td = v[:len(v)-1]
+		switch v[len(v)-1:] {
+		case "S":
+			td += "s"
+		case "M":
+			td += "m"
+		case "H":
+			td += "h"
+		case "m":
+			td += "ms"
+		case "u":
+			td += "us"
+		case "n":
+			td += "ns"
+		}
 	}
 
 	// get content type
-	ct := defaultContentType
+	ct := DefaultContentType
 
 	if ctype, ok := md.Get("content-type"); ok {
 		ct = ctype
@@ -270,13 +283,13 @@ func (g *grpcServer) handler(srv interface{}, stream grpc.ServerStream) (err err
 
 	// get peer from context
 	if p, ok := peer.FromContext(stream.Context()); ok {
-		md["Remote"] = p.Addr.String()
+		md.Set("Remote", p.Addr.String())
 		ctx = peer.NewContext(ctx, p)
 	}
 
 	// set the timeout if we have it
-	if len(to) > 0 {
-		if n, err := strconv.ParseUint(to, 10, 64); err == nil {
+	if len(td) > 0 {
+		if n, err := strconv.ParseUint(td, 10, 64); err == nil {
 			var cancel context.CancelFunc
 			ctx, cancel = context.WithTimeout(ctx, time.Duration(n))
 			defer cancel()
@@ -310,12 +323,22 @@ func (g *grpcServer) handler(srv interface{}, stream grpc.ServerStream) (err err
 	*/
 
 	if svc == nil {
+		if g.opts.Context != nil {
+			if h, ok := g.opts.Context.Value(unknownServiceHandlerKey{}).(grpc.StreamHandler); ok {
+				return h(srv, stream)
+			}
+		}
 		return status.New(codes.Unimplemented, fmt.Sprintf("unknown service %s", serviceName)).Err()
 	}
 
 	mtype := svc.method[methodName]
 	if mtype == nil {
-		return status.New(codes.Unimplemented, fmt.Sprintf("unknown service %s.%s", serviceName, methodName)).Err()
+		if g.opts.Context != nil {
+			if h, ok := g.opts.Context.Value(unknownServiceHandlerKey{}).(grpc.StreamHandler); ok {
+				return h(srv, stream)
+			}
+		}
+		return status.New(codes.Unimplemented, fmt.Sprintf("unknown service method %s.%s", serviceName, methodName)).Err()
 	}
 
 	// process unary
@@ -329,6 +352,7 @@ func (g *grpcServer) handler(srv interface{}, stream grpc.ServerStream) (err err
 
 func (g *grpcServer) processRequest(ctx context.Context, stream grpc.ServerStream, service *service, mtype *methodType, ct string) error {
 	// for {
+	var err error
 	var argv, replyv reflect.Value
 
 	// Decode the argument value.
@@ -341,7 +365,7 @@ func (g *grpcServer) processRequest(ctx context.Context, stream grpc.ServerStrea
 	}
 
 	// Unmarshal request
-	if err := stream.RecvMsg(argv.Interface()); err != nil {
+	if err = stream.RecvMsg(argv.Interface()); err != nil {
 		return err
 	}
 
@@ -355,26 +379,17 @@ func (g *grpcServer) processRequest(ctx context.Context, stream grpc.ServerStrea
 	function := mtype.method.Func
 	var returnValues []reflect.Value
 
-	cf, err := g.newCodec(ct)
-	if err != nil {
-		return errors.InternalServerError(g.opts.Name, err.Error())
-	}
-	b, err := cf.Marshal(argv.Interface())
-	if err != nil {
-		return err
-	}
-
 	// create a client.Request
 	r := &rpcRequest{
 		service:     g.opts.Name,
 		contentType: ct,
 		method:      fmt.Sprintf("%s.%s", service.name, mtype.method.Name),
-		body:        b,
+		endpoint:    fmt.Sprintf("%s.%s", service.name, mtype.method.Name),
 		payload:     argv.Interface(),
 	}
 	// define the handler func
 	fn := func(ctx context.Context, req server.Request, rsp interface{}) (err error) {
-		returnValues = function.Call([]reflect.Value{service.rcvr, mtype.prepareContext(ctx), reflect.ValueOf(argv.Interface()), reflect.ValueOf(rsp)})
+		returnValues = function.Call([]reflect.Value{service.rcvr, mtype.prepareContext(ctx), argv, reflect.ValueOf(rsp)})
 
 		// The return value for the method is an error.
 		if rerr := returnValues[0].Interface(); rerr != nil {
@@ -392,7 +407,13 @@ func (g *grpcServer) processRequest(ctx context.Context, stream grpc.ServerStrea
 	statusCode := codes.OK
 	statusDesc := ""
 	// execute the handler
-	if appErr := fn(ctx, r, replyv.Interface()); appErr != nil {
+	appErr := fn(ctx, r, replyv.Interface())
+	if outmd, ok := metadata.FromOutgoingContext(ctx); ok {
+		if err = stream.SendHeader(gmetadata.New(outmd)); err != nil {
+			return err
+		}
+	}
+	if appErr != nil {
 		var errStatus *status.Status
 		switch verr := appErr.(type) {
 		case *errors.Error:
@@ -407,6 +428,8 @@ func (g *grpcServer) processRequest(ctx context.Context, stream grpc.ServerStrea
 			if err != nil {
 				return err
 			}
+		case (interface{ GRPCStatus() *status.Status }):
+			errStatus = verr.GRPCStatus()
 		default:
 			g.RLock()
 			config := g.opts
@@ -482,6 +505,7 @@ func (g *grpcServer) processStream(ctx context.Context, stream grpc.ServerStream
 		service:     opts.Name,
 		contentType: ct,
 		method:      fmt.Sprintf("%s.%s", service.name, mtype.method.Name),
+		endpoint:    fmt.Sprintf("%s.%s", service.name, mtype.method.Name),
 		stream:      true,
 	}
 
@@ -510,7 +534,13 @@ func (g *grpcServer) processStream(ctx context.Context, stream grpc.ServerStream
 	statusCode := codes.OK
 	statusDesc := ""
 
-	if appErr := fn(ctx, r, ss); appErr != nil {
+	appErr := fn(ctx, r, ss)
+	if outmd, ok := metadata.FromOutgoingContext(ctx); ok {
+		if err := stream.SendHeader(gmetadata.New(outmd)); err != nil {
+			return err
+		}
+	}
+	if appErr != nil {
 		var err error
 		var errStatus *status.Status
 		switch verr := appErr.(type) {
@@ -566,9 +596,6 @@ func (g *grpcServer) Options() server.Options {
 }
 
 func (g *grpcServer) Init(opts ...server.Option) error {
-	if len(opts) == 0 && g.init {
-		return nil
-	}
 	return g.configure(opts...)
 }
 
@@ -700,6 +727,7 @@ func (g *grpcServer) Register() error {
 		}
 		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())

options.go

@@ -9,10 +9,11 @@ import (
 )
 
 type (
-	codecsKey     struct{}
-	grpcOptions   struct{}
-	maxMsgSizeKey struct{}
-	reflectionKey struct{}
+	codecsKey                struct{}
+	grpcOptions              struct{}
+	maxMsgSizeKey            struct{}
+	reflectionKey            struct{}
+	unknownServiceHandlerKey struct{}
 )
 
 // gRPC Codec to be used to encode/decode requests for a given content type
@@ -37,8 +38,7 @@ func Options(opts ...grpc.ServerOption) server.Option {
 
 //
 // MaxMsgSize set the maximum message in bytes the server can receive and
-// send.  Default maximum message size is 4 MB.
-//
+// send. Default maximum message size is 4 MB.
 func MaxMsgSize(s int) server.Option {
 	return server.SetOption(maxMsgSizeKey{}, s)
 }
@@ -47,3 +47,8 @@ func MaxMsgSize(s int) server.Option {
 func Reflection(b bool) server.Option {
 	return server.SetOption(reflectionKey{}, b)
 }
+
+// UnknownServiceHandler enables support for all services
+func UnknownServiceHandler(h grpc.StreamHandler) server.Option {
+	return server.SetOption(unknownServiceHandlerKey{}, h)
+}

request.go

@@ -22,7 +22,6 @@ type rpcRequest struct {
 	endpoint    string
 	contentType string
 	service     string
-	body        []byte
 	stream      bool
 }
 
@@ -32,7 +31,6 @@ type rpcMessage struct {
 	header      metadata.Metadata
 	topic       string
 	contentType string
-	body        []byte
 }
 
 func (r *rpcRequest) ContentType() string {
@@ -83,7 +81,7 @@ func (r *rpcMessage) Topic() string {
 	return r.topic
 }
 
-func (r *rpcMessage) Payload() interface{} {
+func (r *rpcMessage) Body() interface{} {
 	return r.payload
 }
 
@@ -91,10 +89,6 @@ func (r *rpcMessage) Header() metadata.Metadata {
 	return r.header
 }
 
-func (r *rpcMessage) Body() []byte {
-	return r.body
-}
-
 func (r *rpcMessage) Codec() codec.Codec {
 	return r.codec
 }

subscriber.go

@@ -122,8 +122,8 @@ func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broke
 
 		ct := msg.Header["Content-Type"]
 		if len(ct) == 0 {
-			msg.Header["Content-Type"] = defaultContentType
-			ct = defaultContentType
+			msg.Header["Content-Type"] = DefaultContentType
+			ct = DefaultContentType
 		}
 		cf, err := g.newCodec(ct)
 		if err != nil {
@@ -171,7 +171,7 @@ func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broke
 					vals = append(vals, reflect.ValueOf(ctx))
 				}
 
-				vals = append(vals, reflect.ValueOf(msg.Payload()))
+				vals = append(vals, reflect.ValueOf(msg.Body()))
 
 				returnValues := handler.method.Call(vals)
 				if rerr := returnValues[0].Interface(); rerr != nil {
@@ -196,7 +196,6 @@ func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broke
 					contentType: ct,
 					payload:     req.Interface(),
 					header:      msg.Header,
-					body:        msg.Body,
 				})
 				results <- cerr
 			}()