update for latest micro

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
update workflow
2021-09-27 09:13:54 +03:00 · 2021-09-21 21:47:54 +03:00 · 2021-09-17 08:29:38 +03:00 · 2021-09-17 07:49:21 +03:00 · 2021-09-16 11:10:58 +03:00 · 2021-09-06 07:44:43 +00:00
20 changed files with 501 additions and 326 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Maintain dependencies for Golang
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,20 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ],
-  "postUpdateOptions": ["gomodTidy"],
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true
-    },
-    {
-      "groupName": "all deps",
-      "separateMajorMinor": true,
-      "groupSlug": "all",
-      "packagePatterns": [
-        "*"
-      ]
-    }
-  ]
-}
--- a/.github/stale.sh
+++ b/.github/stale.sh
@@ -1,13 +0,0 @@
-#!/bin/bash -ex
-
-export PATH=$PATH:$(pwd)/bin
-export GO111MODULE=on
-export GOBIN=$(pwd)/bin
-
-#go get github.com/rvflash/goup@v0.4.1
-
-#goup -v ./...
-#go get github.com/psampaz/go-mod-outdated@v0.6.0
-go list -u -m -mod=mod -json all | go-mod-outdated -update -direct -ci || true
-
-#go list -u -m -json all | go-mod-outdated -update
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,75 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '34 1 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # 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
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # 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
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@@ -0,0 +1,66 @@
+name: "prautomerge"
+
+on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Dependabot-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 ))
+    steps:
+      - name: Approve Changes and Merge changes if label 'dependencies' is set
+        uses: actions/github-script@v4
+        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');
+            }
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -0,0 +1,44 @@
+run:
+  concurrency: 4
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true
+
+linters-settings:
+  govet:
+    check-shadowing: true
+    enable:
+      - fieldalignment
+
+linters:
+  enable:
+    - govet
+    - deadcode
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - bodyclose
+    - gci
+    - goconst
+    - gocritic
+    - gosimple
+    - gofmt
+    - gofumpt
+    - goimports
+    - golint
+    - gosec
+    - makezero
+    - misspell
+    - nakedret
+    - nestif
+    - nilerr
+    - noctx
+    - prealloc
+    - unconvert
+    - unparam
+  disable-all: false
--- a/codec.go
+++ b/codec.go
@@ -4,24 +4,13 @@ import (
 	"io"

 	"github.com/unistack-org/micro/v3/codec"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )

-type wrapStream struct{ grpc.ServerStream }
-
-func (w *wrapStream) Write(d []byte) (int, error) {
-	n := len(d)
-	err := w.ServerStream.SendMsg(&codec.Frame{Data: d})
-	return n, err
-}
-
-func (w *wrapStream) Read(d []byte) (int, error) {
-	m := &codec.Frame{}
-	err := w.ServerStream.RecvMsg(m)
-	d = m.Data
-	return len(d), err
-}
+var (
+	_ codec.Codec    = &wrapGrpcCodec{}
+	_ encoding.Codec = &wrapMicroCodec{}
+)

 type wrapMicroCodec struct{ codec.Codec }

@@ -29,50 +18,54 @@ func (w *wrapMicroCodec) Name() string {
 	return w.Codec.String()
 }

+func (w *wrapMicroCodec) Marshal(v interface{}) ([]byte, error) {
+	return w.Codec.Marshal(v)
+}
+
+func (w *wrapMicroCodec) Unmarshal(d []byte, v interface{}) error {
+	return w.Codec.Unmarshal(d, v)
+}
+
 type wrapGrpcCodec struct{ encoding.Codec }

 func (w *wrapGrpcCodec) String() string {
 	return w.Codec.Name()
 }

-func (w *wrapGrpcCodec) Marshal(v interface{}) ([]byte, error) {
-	switch m := v.(type) {
-	case *codec.Frame:
+func (w *wrapGrpcCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
+	if m, ok := v.(*codec.Frame); ok {
 		return m.Data, nil
 	}
 	return w.Codec.Marshal(v)
 }

-func (w wrapGrpcCodec) Unmarshal(d []byte, v interface{}) error {
+func (w *wrapGrpcCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error {
 	if d == nil || v == nil {
 		return nil
 	}
-	switch m := v.(type) {
-	case *codec.Frame:
+	if m, ok := v.(*codec.Frame); ok {
 		m.Data = d
 		return nil
 	}
 	return w.Codec.Unmarshal(d, v)
 }

-func (g *wrapGrpcCodec) ReadHeader(conn io.Reader, m *codec.Message, mt codec.MessageType) error {
+func (w *wrapGrpcCodec) ReadHeader(conn io.Reader, m *codec.Message, mt codec.MessageType) error {
 	return nil
 }

-func (g *wrapGrpcCodec) ReadBody(conn io.Reader, v interface{}) error {
-	// caller has requested a frame
-	switch m := v.(type) {
-	case *codec.Frame:
+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 (g *wrapGrpcCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error {
+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 := g.Marshal(v)
+		b, err := w.Marshal(v)
 		if err != nil {
 			return err
 		}
--- a/context.go
+++ b/context.go
@@ -1,16 +0,0 @@
-package grpc
-
-import (
-	"context"
-
-	"github.com/unistack-org/micro/v3/server"
-)
-
-func setServerOption(k, v interface{}) server.Option {
-	return func(o *server.Options) {
-		if o.Context == nil {
-			o.Context = context.Background()
-		}
-		o.Context = context.WithValue(o.Context, k, v)
-	}
-}
--- a/error.go
+++ b/error.go
@@ -10,21 +10,19 @@ import (
 	"google.golang.org/grpc/codes"
 )

-var (
-	errMapping = map[int32]codes.Code{
-		http.StatusOK:                  codes.OK,
-		http.StatusBadRequest:          codes.InvalidArgument,
-		http.StatusRequestTimeout:      codes.DeadlineExceeded,
-		http.StatusNotFound:            codes.NotFound,
-		http.StatusConflict:            codes.AlreadyExists,
-		http.StatusForbidden:           codes.PermissionDenied,
-		http.StatusUnauthorized:        codes.Unauthenticated,
-		http.StatusPreconditionFailed:  codes.FailedPrecondition,
-		http.StatusNotImplemented:      codes.Unimplemented,
-		http.StatusInternalServerError: codes.Internal,
-		http.StatusServiceUnavailable:  codes.Unavailable,
-	}
-)
+var errMapping = map[int32]codes.Code{
+	http.StatusOK:                  codes.OK,
+	http.StatusBadRequest:          codes.InvalidArgument,
+	http.StatusRequestTimeout:      codes.DeadlineExceeded,
+	http.StatusNotFound:            codes.NotFound,
+	http.StatusConflict:            codes.AlreadyExists,
+	http.StatusForbidden:           codes.PermissionDenied,
+	http.StatusUnauthorized:        codes.Unauthenticated,
+	http.StatusPreconditionFailed:  codes.FailedPrecondition,
+	http.StatusNotImplemented:      codes.Unimplemented,
+	http.StatusInternalServerError: codes.Internal,
+	http.StatusServiceUnavailable:  codes.Unavailable,
+}

 // convertCode converts a standard Go error into its canonical code. Note that
 // this is only used to translate the error returned by the server applications.
@@ -60,8 +58,7 @@ func microError(err error) codes.Code {
 	}

 	var ec int32
-	switch verr := err.(type) {
-	case *errors.Error:
+	if verr, ok := err.(*errors.Error); ok {
 		ec = verr.Code
 	}

--- a/go.mod
+++ b/go.mod
@@ -4,9 +4,8 @@ go 1.16

 require (
 	github.com/golang/protobuf v1.5.2
-	github.com/unistack-org/micro/v3 v3.3.16
-	golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/grpc v1.37.0
-	google.golang.org/protobuf v1.26.0
+	github.com/unistack-org/micro/v3 v3.7.4
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed
+	google.golang.org/grpc v1.40.0
+	google.golang.org/protobuf v1.27.1
 )
--- a/go.sum
+++ b/go.sum
@@ -1,19 +1,29 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -21,6 +31,7 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -32,38 +43,50 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs=
-github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/unistack-org/micro/v3 v3.3.16 h1:v0h/oC0TO2n1djQJeOjD2jNEqKkiykwI6cpflEVTlQE=
-github.com/unistack-org/micro/v3 v3.3.16/go.mod h1:ETGcQQUcjxGaD44LUMX+0fgo8Loh7ExldfIPLvfUmDo=
+github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc=
+github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg=
+github.com/unistack-org/micro/v3 v3.7.4 h1:nRk7f58v0VsiW7aKL0UQaFCQxFoursHQLoWdeZ1RYbg=
+github.com/unistack-org/micro/v3 v3.7.4/go.mod h1:78vy7ggElJD+ayx8ruhJsY+SkGUupfR32LXrg1UObvg=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d h1:BgJvlyh+UqCUaPlscHJ+PN8GcpfrFdr7NHjd1JL0+Gs=
-golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 h1:Bli41pIlzTzf3KEY06n+xnzK/BESIg2ze4Pgfh/aI8c=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
@@ -80,14 +103,17 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.37.0 h1:uSZWeQJX5j11bIQ4AJoj+McDBo29cY1MCoC1wO3ts+c=
-google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
 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=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -98,10 +124,12 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/grpc.go
+++ b/grpc.go
@@ -14,6 +14,7 @@ import (
 	"sync"
 	"time"

+	// nolint: staticcheck
 	oldproto "github.com/golang/protobuf/proto"
 	"github.com/unistack-org/micro/v3/broker"
 	"github.com/unistack-org/micro/v3/codec"
@@ -29,41 +30,35 @@ import (
 	"google.golang.org/grpc/encoding"
 	gmetadata "google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/peer"
-	grpcreflect "google.golang.org/grpc/reflection/grpc_reflection_v1alpha"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
 )

 const (
-	defaultContentType = "application/grpc"
+	defaultContentType = "application/grpc+proto"
 )

+/*
 type grpcServerReflection struct {
 	srv *grpc.Server
 	s   *serverReflectionServer
 }
+*/

 type grpcServer struct {
-	rpc  *rServer
-	srv  *grpc.Server
-	exit chan chan error
-	wg   *sync.WaitGroup
-
-	sync.RWMutex
-	opts        server.Options
 	handlers    map[string]server.Handler
+	srv         *grpc.Server
+	exit        chan chan error
+	wg          *sync.WaitGroup
+	rsvc        *register.Service
 	subscribers map[*subscriber][]broker.Subscriber
-	init        bool
-	// marks the serve as started
-	started bool
-	// used for first registration
+	rpc         *rServer
+	opts        server.Options
+	sync.RWMutex
+	init       bool
+	started    bool
 	registered bool
-
 	reflection bool
-	// register service instance
-	rsvc *register.Service
-
-	codecs map[string]codec.Codec
 }

 func newGRPCServer(opts ...server.Option) server.Server {
@@ -292,25 +287,27 @@ func (g *grpcServer) handler(srv interface{}, stream grpc.ServerStream) (err err
 	svc := g.rpc.serviceMap[serviceName]
 	g.rpc.mu.RUnlock()

-	if svc == nil && g.reflection && methodName == "ServerReflectionInfo" {
-		rfl := &grpcServerReflection{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()
+	/*
+		if svc == nil && g.reflection && methodName == "ServerReflectionInfo" {
+			rfl := &grpcServerReflection{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()
 			}
-			g.rpc.mu.Unlock()
 		}
-	}
+	*/

 	if svc == nil {
 		return status.New(codes.Unimplemented, fmt.Sprintf("unknown service %s", serviceName)).Err()
@@ -323,117 +320,118 @@ func (g *grpcServer) handler(srv interface{}, stream grpc.ServerStream) (err err

 	// process unary
 	if !mtype.stream {
-		return g.processRequest(stream, svc, mtype, ct, ctx)
+		return g.processRequest(ctx, stream, svc, mtype, ct)
 	}

 	// process stream
-	return g.processStream(stream, svc, mtype, ct, ctx)
+	return g.processStream(ctx, stream, svc, mtype, ct)
 }

-func (g *grpcServer) processRequest(stream grpc.ServerStream, service *service, mtype *methodType, ct string, ctx context.Context) error {
-	for {
-		var argv, replyv reflect.Value
+func (g *grpcServer) processRequest(ctx context.Context, stream grpc.ServerStream, service *service, mtype *methodType, ct string) error {
+	// for {
+	var argv, replyv reflect.Value

-		// Decode the argument value.
-		argIsValue := false // if true, need to indirect before calling.
-		if mtype.ArgType.Kind() == reflect.Ptr {
-			argv = reflect.New(mtype.ArgType.Elem())
-		} else {
-			argv = reflect.New(mtype.ArgType)
-			argIsValue = true
-		}
-
-		// Unmarshal request
-		if err := stream.RecvMsg(argv.Interface()); err != nil {
-			return err
-		}
-
-		if argIsValue {
-			argv = argv.Elem()
-		}
-
-		// reply value
-		replyv = reflect.New(mtype.ReplyType.Elem())
-
-		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,
-			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)})
-
-			// The return value for the method is an error.
-			if rerr := returnValues[0].Interface(); rerr != nil {
-				err = rerr.(error)
-			}
-
-			return err
-		}
-
-		// wrap the handler func
-		for i := len(g.opts.HdlrWrappers); i > 0; i-- {
-			fn = g.opts.HdlrWrappers[i-1](fn)
-		}
-
-		statusCode := codes.OK
-		statusDesc := ""
-		// execute the handler
-		if appErr := fn(ctx, r, replyv.Interface()); appErr != nil {
-			var errStatus *status.Status
-			switch verr := appErr.(type) {
-			case *errors.Error:
-				statusCode = microError(verr)
-				statusDesc = verr.Error()
-				errStatus = status.New(statusCode, statusDesc)
-			case proto.Message:
-				// user defined error that proto based we can attach it to grpc status
-				statusCode = convertCode(appErr)
-				statusDesc = appErr.Error()
-				errStatus, err = status.New(statusCode, statusDesc).WithDetails(oldproto.MessageV1(verr))
-				if err != nil {
-					return err
-				}
-			default:
-				g.RLock()
-				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")
-				}
-				// default case user pass own error type that not proto based
-				statusCode = convertCode(verr)
-				statusDesc = verr.Error()
-				errStatus = status.New(statusCode, statusDesc)
-			}
-
-			return errStatus.Err()
-		}
-
-		if err := stream.SendMsg(replyv.Interface()); err != nil {
-			return err
-		}
-
-		return status.New(statusCode, statusDesc).Err()
+	// Decode the argument value.
+	argIsValue := false // if true, need to indirect before calling.
+	if mtype.ArgType.Kind() == reflect.Ptr {
+		argv = reflect.New(mtype.ArgType.Elem())
+	} else {
+		argv = reflect.New(mtype.ArgType)
+		argIsValue = true
 	}
+
+	// Unmarshal request
+	if err := stream.RecvMsg(argv.Interface()); err != nil {
+		return err
+	}
+
+	if argIsValue {
+		argv = argv.Elem()
+	}
+
+	// reply value
+	replyv = reflect.New(mtype.ReplyType.Elem())
+
+	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,
+		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)})
+
+		// The return value for the method is an error.
+		if rerr := returnValues[0].Interface(); rerr != nil {
+			err = rerr.(error)
+		}
+
+		return err
+	}
+
+	// wrap the handler func
+	for i := len(g.opts.HdlrWrappers); i > 0; i-- {
+		fn = g.opts.HdlrWrappers[i-1](fn)
+	}
+
+	statusCode := codes.OK
+	statusDesc := ""
+	// execute the handler
+	if appErr := fn(ctx, r, replyv.Interface()); appErr != nil {
+		var errStatus *status.Status
+		switch verr := appErr.(type) {
+		case *errors.Error:
+			statusCode = microError(verr)
+			statusDesc = verr.Error()
+			errStatus = status.New(statusCode, statusDesc)
+		case proto.Message:
+			// user defined error that proto based we can attach it to grpc status
+			statusCode = convertCode(appErr)
+			statusDesc = appErr.Error()
+			errStatus, err = status.New(statusCode, statusDesc).WithDetails(oldproto.MessageV1(verr))
+			if err != nil {
+				return err
+			}
+		default:
+			g.RLock()
+			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")
+			}
+			// default case user pass own error type that not proto based
+			statusCode = convertCode(verr)
+			statusDesc = verr.Error()
+			errStatus = status.New(statusCode, statusDesc)
+		}
+
+		return errStatus.Err()
+	}
+
+	if err := stream.SendMsg(replyv.Interface()); err != nil {
+		return err
+	}
+
+	return status.New(statusCode, statusDesc).Err()
+	//	}
 }

+/*
 type reflectStream struct {
 	stream server.Stream
 }
@@ -475,8 +473,9 @@ func (s *reflectStream) RecvMsg(m interface{}) error {
 func (g *grpcServerReflection) ServerReflectionInfo(ctx context.Context, stream server.Stream) error {
 	return g.s.ServerReflectionInfo(&reflectStream{stream})
 }
+*/

-func (g *grpcServer) processStream(stream grpc.ServerStream, service *service, mtype *methodType, ct string, ctx context.Context) error {
+func (g *grpcServer) processStream(ctx context.Context, stream grpc.ServerStream, service *service, mtype *methodType, ct string) error {
 	opts := g.opts

 	r := &rpcRequest{
@@ -574,7 +573,7 @@ func (g *grpcServer) Init(opts ...server.Option) error {
 }

 func (g *grpcServer) NewHandler(h interface{}, opts ...server.HandlerOption) server.Handler {
-	return newRpcHandler(h, opts...)
+	return newRPCHandler(h, opts...)
 }

 func (g *grpcServer) Handle(h server.Handler) error {
@@ -635,15 +634,15 @@ func (g *grpcServer) Register() error {

 	g.RLock()
 	// Maps are ordered randomly, sort the keys for consistency
-	var handlerList []string
-	for n, _ := range g.handlers {
+	handlerList := make([]string, 0, len(g.handlers))
+	for n := range g.handlers {
 		// Only advertise non internal handlers
 		handlerList = append(handlerList, n)
 	}

 	sort.Strings(handlerList)

-	var subscriberList []*subscriber
+	subscriberList := make([]*subscriber, 0, len(g.subscribers))
 	for e := range g.subscribers {
 		// Only advertise non internal subscribers
 		subscriberList = append(subscriberList, e)
@@ -662,7 +661,7 @@ func (g *grpcServer) Register() error {
 	g.RUnlock()

 	service.Nodes[0].Metadata["protocol"] = "grpc"
-	service.Nodes[0].Metadata["transport"] = "grpc"
+	service.Nodes[0].Metadata["transport"] = service.Nodes[0].Metadata["protocol"]
 	service.Endpoints = endpoints

 	g.RLock()
@@ -671,7 +670,7 @@ func (g *grpcServer) 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.Infof(config.Context, "Register [%s] Registering node: %s", config.Register.String(), service.Nodes[0].ID)
 		}
 	}

@@ -731,7 +730,7 @@ func (g *grpcServer) Deregister() error {
 	}

 	if config.Logger.V(logger.InfoLevel) {
-		config.Logger.Infof(config.Context, "Deregistering node: %s", service.Nodes[0].Id)
+		config.Logger.Infof(config.Context, "Deregistering node: %s", service.Nodes[0].ID)
 	}

 	if err := server.DefaultDeregisterFunc(service, config); err != nil {
@@ -788,12 +787,11 @@ func (g *grpcServer) Start() error {

 	// micro: config.Transport.Listen(config.Address)
 	var ts net.Listener
+	var err error

 	if l := config.Listener; l != nil {
 		ts = l
 	} else {
-		var err error
-
 		// check the tls config for secure connect
 		if tc := config.TLSConfig; tc != nil {
 			ts, err = tls.Listen("tcp", config.Address, tc)
@@ -823,7 +821,7 @@ func (g *grpcServer) Start() error {
 	// only connect if we're subscribed
 	if len(g.subscribers) > 0 {
 		// connect to the broker
-		if err := config.Broker.Connect(config.Context); err != nil {
+		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)
 			}
@@ -836,13 +834,14 @@ func (g *grpcServer) Start() error {
 	}

 	// use RegisterCheck func before register
-	if err := g.opts.RegisterCheck(config.Context); err != nil {
+	// 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.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, err)
 		}
 	} else {
 		// announce self to the world
-		if err := g.Register(); err != nil {
+		if err = g.Register(); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
 				config.Logger.Errorf(config.Context, "Server register error: %v", err)
 			}
@@ -851,11 +850,11 @@ func (g *grpcServer) Start() error {

 	// micro: go ts.Accept(s.accept)
 	go func() {
-		if err := g.srv.Serve(ts); err != nil {
+		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)
 			}
-			if err := g.Stop(); err != nil {
+			if err = g.Stop(); err != nil {
 				if config.Logger.V(logger.ErrorLevel) {
 					config.Logger.Errorf(config.Context, "gRPC Server stop error: %v", err)
 				}
@@ -884,25 +883,26 @@ func (g *grpcServer) Start() error {
 				registered := g.registered
 				g.RUnlock()
 				rerr := g.opts.RegisterCheck(g.opts.Context)
+				// 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.Errorf(config.Context, "Server %s-%s register check error: %s, deregister it", config.Name, config.ID, rerr)
 					}
 					// deregister self in case of error
-					if err := g.Deregister(); err != nil {
+					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.Errorf(config.Context, "Server %s-%s deregister error: %s", 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.Errorf(config.Context, "Server %s-%s register check error: %s", config.Name, config.ID, rerr)
 					}
 					continue
 				}
-				if err := g.Register(); err != nil {
+				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.Errorf(config.Context, "Server %s-%s register error: %s", config.Name, config.ID, err)
 					}
 				}
 			// wait for exit
@@ -912,9 +912,9 @@ func (g *grpcServer) Start() error {
 		}

 		// deregister self
-		if err := g.Deregister(); err != nil {
+		if err = g.Deregister(); err != nil {
 			if config.Logger.V(logger.ErrorLevel) {
-				config.Logger.Errorf(config.Context, "Server deregister error: ", err)
+				config.Logger.Errorf(config.Context, "Server deregister error: %v", err)
 			}
 		}

@@ -944,7 +944,7 @@ func (g *grpcServer) Start() error {
 			config.Logger.Infof(config.Context, "Broker [%s] Disconnected from %s", config.Broker.String(), config.Broker.Address())
 		}
 		// disconnect broker
-		if err := config.Broker.Disconnect(config.Context); err != nil {
+		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)
 			}
--- a/handler.go
+++ b/handler.go
@@ -8,13 +8,13 @@ import (
 )

 type rpcHandler struct {
-	name      string
-	handler   interface{}
-	endpoints []*register.Endpoint
 	opts      server.HandlerOptions
+	handler   interface{}
+	name      string
+	endpoints []*register.Endpoint
 }

-func newRpcHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
+func newRPCHandler(handler interface{}, opts ...server.HandlerOption) server.Handler {
 	options := server.NewHandlerOptions(opts...)

 	typ := reflect.TypeOf(handler)
--- a/options.go
+++ b/options.go
@@ -8,10 +8,12 @@ import (
 	"google.golang.org/grpc/encoding"
 )

-type codecsKey struct{}
-type grpcOptions struct{}
-type maxMsgSizeKey struct{}
-type reflectionKey struct{}
+type (
+	codecsKey     struct{}
+	grpcOptions   struct{}
+	maxMsgSizeKey struct{}
+	reflectionKey struct{}
+)

 // gRPC Codec to be used to encode/decode requests for a given content type
 func Codec(contentType string, c encoding.Codec) server.Option {
@@ -30,7 +32,7 @@ func Codec(contentType string, c encoding.Codec) server.Option {

 // Options to be used to configure gRPC options
 func Options(opts ...grpc.ServerOption) server.Option {
-	return setServerOption(grpcOptions{}, opts)
+	return server.SetOption(grpcOptions{}, opts)
 }

 //
@@ -38,10 +40,10 @@ func Options(opts ...grpc.ServerOption) server.Option {
 // send.  Default maximum message size is 4 MB.
 //
 func MaxMsgSize(s int) server.Option {
-	return setServerOption(maxMsgSizeKey{}, s)
+	return server.SetOption(maxMsgSizeKey{}, s)
 }

 // Reflection enables reflection support in grpc server
 func Reflection(b bool) server.Option {
-	return setServerOption(reflectionKey{}, b)
+	return server.SetOption(reflectionKey{}, b)
 }
--- a/reflection.go
+++ b/reflection.go
@@ -1,3 +1,5 @@
+// +build ignore
+
 /*
 *
 * Copyright 2016 gRPC authors.
--- a/request.go
+++ b/request.go
@@ -5,29 +5,34 @@ import (

 	"github.com/unistack-org/micro/v3/codec"
 	"github.com/unistack-org/micro/v3/metadata"
+	"github.com/unistack-org/micro/v3/server"
+)
+
+var (
+	_ server.Request = &rpcRequest{}
+	_ server.Message = &rpcMessage{}
 )

 type rpcRequest struct {
 	rw          io.ReadWriter
-	service     string
-	method      string
-	endpoint    string
-	target      string
-	contentType string
+	payload     interface{}
 	codec       codec.Codec
 	header      metadata.Metadata
+	method      string
+	endpoint    string
+	contentType string
+	service     string
 	body        []byte
 	stream      bool
-	payload     interface{}
 }

 type rpcMessage struct {
+	payload     interface{}
+	codec       codec.Codec
+	header      metadata.Metadata
 	topic       string
 	contentType string
-	payload     interface{}
-	header      metadata.Metadata
 	body        []byte
-	codec       codec.Codec
 }

 func (r *rpcRequest) ContentType() string {
@@ -43,7 +48,7 @@ func (r *rpcRequest) Method() string {
 }

 func (r *rpcRequest) Endpoint() string {
-	return r.method
+	return r.endpoint
 }

 func (r *rpcRequest) Codec() codec.Codec {
--- a/response.go
+++ b/response.go
@@ -5,16 +5,15 @@ import (

 	"github.com/unistack-org/micro/v3/codec"
 	"github.com/unistack-org/micro/v3/metadata"
+	"github.com/unistack-org/micro/v3/server"
 )

+var _ server.Response = &rpcResponse{}
+
 type rpcResponse struct {
-	rw       io.ReadWriter
-	header   metadata.Metadata
-	codec    codec.Codec
-	endpoint string
-	service  string
-	method   string
-	target   string
+	rw     io.ReadWriter
+	header metadata.Metadata
+	codec  codec.Codec
 }

 func (r *rpcResponse) Codec() codec.Codec {
--- a/server.go
+++ b/server.go
@@ -17,34 +17,32 @@ import (
 	"github.com/unistack-org/micro/v3/server"
 )

-var (
-	// Precompute the reflect type for error. Can't use error directly
-	// because Typeof takes an empty interface value. This is annoying.
-	typeOfError = reflect.TypeOf((*error)(nil)).Elem()
-)
+// Precompute the reflect type for error. Can't use error directly
+// because Typeof takes an empty interface value. This is annoying.
+var typeOfError = reflect.TypeOf((*error)(nil)).Elem()

 type methodType struct {
-	method      reflect.Method
 	ArgType     reflect.Type
 	ReplyType   reflect.Type
 	ContextType reflect.Type
+	method      reflect.Method
 	stream      bool
 }

-type reflectionType func(context.Context, server.Stream) error
+// type reflectionType func(context.Context, server.Stream) error

 type service struct {
-	name   string                 // name of service
-	rcvr   reflect.Value          // receiver of methods for the service
-	typ    reflect.Type           // type of the receiver
-	method map[string]*methodType // registered methods
+	typ    reflect.Type
+	method map[string]*methodType
+	rcvr   reflect.Value
+	name   string
 }

 // server represents an RPC Server.
 type rServer struct {
-	mu         sync.RWMutex // protects the serviceMap
 	serviceMap map[string]*service
-	reflection bool
+	mu         sync.RWMutex
+	// reflection bool
 }

 // Is this an exported - upper case - name?
@@ -91,15 +89,14 @@ func prepareEndpoint(method reflect.Method) (*methodType, error) {
 		return nil, fmt.Errorf("method %v of %v has wrong number of ins: %v", mname, mtype, mtype.NumIn())
 	}

-	if stream {
+	switch stream {
+	case true:
 		// check stream type
 		streamType := reflect.TypeOf((*server.Stream)(nil)).Elem()
 		if !argType.Implements(streamType) {
 			return nil, fmt.Errorf("%v argument does not implement Streamer interface: %v", mname, argType)
 		}
-	} else {
-		// if not stream check the replyType
-
+	default:
 		// First arg need not be a pointer.
 		if !isExportedOrBuiltinType(argType) {
 			return nil, fmt.Errorf("%v argument type not exported: %v", mname, argType)
--- a/subscriber.go
+++ b/subscriber.go
@@ -15,14 +15,10 @@ import (
 	"github.com/unistack-org/micro/v3/server"
 )

-const (
-	subSig = "func(context.Context, interface{}) error"
-)
-
 type handler struct {
-	method  reflect.Value
 	reqType reflect.Type
 	ctxType reflect.Type
+	method  reflect.Value
 }

 type subscriber struct {
@@ -195,14 +191,14 @@ func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broke
 				if g.wg != nil {
 					defer g.wg.Done()
 				}
-				err := fn(ctx, &rpcMessage{
+				cerr := fn(ctx, &rpcMessage{
 					topic:       sb.topic,
 					contentType: ct,
 					payload:     req.Interface(),
 					header:      msg.Header,
 					body:        msg.Body,
 				})
-				results <- err
+				results <- cerr
 			}()
 		}
 		var errors []string
--- a/util.go
+++ b/util.go
@@ -39,6 +39,7 @@ func serviceMethod(m string) (string, string, error) {
 	return parts[0], parts[1], nil
 }

+/*
 // ServiceFromMethod returns the service
 // /service.Foo/Bar => service
 func serviceFromMethod(m string) string {
@@ -55,3 +56,4 @@ func serviceFromMethod(m string) string {
 	parts = strings.Split(parts[1], ".")
 	return strings.Join(parts[:len(parts)-1], ".")
 }
+*/
Author	SHA1	Message	Date
Vasiliy Tolstov	82d14b4ea7	update for latest micro Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-27 09:13:54 +03:00
Vasiliy Tolstov	5beb4bc7d9	update workflow Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-21 21:47:54 +03:00
dependabot[bot]	c42770b800	Bump github.com/unistack-org/micro/v3 from 3.7.0 to 3.7.1 (#69 ) Bumps [github.com/unistack-org/micro/v3](https://github.com/unistack-org/micro) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.7.0...v3.7.1) --- updated-dependencies: - dependency-name: github.com/unistack-org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-09-17 08:29:38 +03:00
Vasiliy Tolstov	30c852913b	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-17 07:49:21 +03:00
Vasiliy Tolstov	97ee4eaa33	enable automerge Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-16 11:10:58 +03:00
dependabot[bot]	d77c36d479	Bump github.com/unistack-org/micro/v3 from 3.3.17 to 3.7.0 (#68 )	2021-09-06 07:44:43 +00:00
dependabot[bot]	4696079471	Bump google.golang.org/protobuf from 1.26.0 to 1.27.1 (#67 )	2021-09-06 07:41:26 +00:00
dependabot[bot]	bf3c302813	Bump google.golang.org/grpc from 1.37.1 to 1.40.0 (#66 )	2021-09-06 07:38:12 +00:00
Vasiliy Tolstov	a36801b7ee	replace renovate with dependabot Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-06 10:25:13 +03:00
Vasiliy Tolstov	3b81209099	use single err variable Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-06-17 14:12:26 +03:00
Vasiliy Tolstov	25abc921d5	remove stale funcs Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-06-15 23:23:42 +03:00
Vasiliy Tolstov	d3ef82346d	fix default content type Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-05-24 23:13:21 +03:00
Renovate Bot	df72327b91	Update module google.golang.org/grpc to v1.37.1	2021-05-12 00:56:33 +00:00
Renovate Bot	68e3240e8e	Update golang.org/x/net commit hash to 4163338	2021-05-10 13:59:54 +00:00
Renovate Bot	f1671c0150	Update golang.org/x/net commit hash to 16afe75	2021-05-08 08:08:02 +00:00
Renovate Bot	15cd1aaaa5	Update golang.org/x/net commit hash to 0714010	2021-05-06 00:55:58 +00:00
Renovate Bot	d9bae52513	Update golang.org/x/net commit hash to 0287a6f	2021-05-05 07:57:56 +00:00
Renovate Bot	a39577fb6a	Update golang.org/x/net commit hash to bbd867f	2021-05-04 16:53:24 +00:00
Renovate Bot	f5a44c602c	Update golang.org/x/net commit hash to 7fd8e65	2021-05-03 09:30:20 +00:00
Renovate Bot	676efbae2f	Update golang.org/x/net commit hash to e590880	2021-05-02 05:06:13 +00:00
Renovate Bot	39b8b610d6	Update golang.org/x/net commit hash to f8dd838	2021-05-01 23:44:03 +00:00
Renovate Bot	4667c94f11	Update golang.org/x/net commit hash to aec3718	2021-05-01 15:52:50 +00:00
Renovate Bot	3d34b06e4f	Update golang.org/x/net commit hash to 89ef3d9	2021-04-28 17:48:11 +00:00
Renovate Bot	0e859116bc	Update golang.org/x/net commit hash to 85d9c07	2021-04-28 02:25:17 +00:00
Vasiliy Tolstov	1206fecf93	update for latest micro Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-04-27 18:43:57 +03:00
Vasiliy Tolstov	e091caef5d	stale Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-04-26 19:14:30 +03:00
Vasiliy Tolstov	d8508301cf	lint (#53 ) Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-04-26 19:04:27 +03:00
Renovate Bot	03dd750f7c	Update golang.org/x/net commit hash to 5f58ad6	2021-04-23 23:59:46 +00:00
Renovate Bot	5914e610a1	Update golang.org/x/net commit hash to 4e50805	2021-04-22 02:48:09 +00:00
Renovate Bot	48841609ba	Update golang.org/x/net commit hash to 798c215	2021-04-21 00:52:41 +00:00
Renovate Bot	dfc0ac0ea8	Update golang.org/x/net commit hash to d25e304	2021-04-20 11:54:59 +00:00