update import paths

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
update workflows
2021-10-27 18:27:04 +03:00 · 2021-10-27 18:23:20 +03:00 · 2021-09-27 01:11:43 +00:00 · 2021-09-27 01:10:42 +00:00 · 2021-09-21 21:46:33 +03:00 · 2021-09-17 08:42:08 +03:00
19 changed files with 481 additions and 334 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/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/build.yml
+++ b/.github/workflows/build.yml
@@ -9,9 +9,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: setup
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
      with:
-        go-version: 1.15
+        go-version: 1.16
    - name: checkout
      uses: actions/checkout@v2
    - name: cache
@@ -33,7 +33,7 @@ jobs:
      - name: checkout
        uses: actions/checkout@v2
      - name: lint
-        uses: golangci/golangci-lint-action@v1
+        uses: golangci/golangci-lint-action@v2
        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.
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,78 @@
+# 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, v3 ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master, v3 ]
+  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
+      uses: actions/checkout@v2
+    - name: setup
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16
+    # Initializes the CodeQL tools for scanning.
+    - name: init
+      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: analyze
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@@ -0,0 +1,31 @@
+name: "prautomerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.1.1
+        with:
+          github-token: "${{ secrets.TOKEN }}"
+      - name: approve
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}
+      - name: 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}}
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -9,9 +9,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: setup
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v2
      with:
-        go-version: 1.15
+        go-version: 1.16
    - name: checkout
      uses: actions/checkout@v2
    - name: cache
@@ -33,7 +33,7 @@ jobs:
      - name: checkout
        uses: actions/checkout@v2
      - name: lint
-        uses: golangci/golangci-lint-action@v1
+        uses: golangci/golangci-lint-action@v2
        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.
--- a/generate.go
+++ b/generate.go
@@ -1,3 +1,3 @@
 package service

-//go:generate protoc -I./proto -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --micro_out=components=micro|grpc,paths=source_relative:./proto proto/broker.proto
+//go:generate protoc -I./proto -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --go-micro_out=components=micro|rpc,standalone=true,paths=source_relative:./micro proto/broker.proto
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,10 @@
-module github.com/unistack-org/micro-broker-service/v3
+module go.unistack.org/micro-broker-service/v3

-go 1.15
+go 1.16

 require (
-	github.com/golang/protobuf v1.4.3
-	github.com/unistack-org/micro/v3 v3.2.4
-	google.golang.org/grpc v1.27.1
-	google.golang.org/protobuf v1.25.0
+	github.com/golang/protobuf v1.5.1 // indirect
+	go.unistack.org/micro/v3 v3.8.6
+	google.golang.org/grpc v1.40.0
+	google.golang.org/protobuf v1.27.1
 )
--- a/go.sum
+++ b/go.sum
@@ -1,112 +1,119 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+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/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+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/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/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.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/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/golang-jwt/jwt/v4 v4.1.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=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 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.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+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.1 h1:jAbXjIeW2ZSW2AwFxlGTDoc2CjI2XujLkV3ArsZFCvc=
+github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/uuid v1.1.5 h1:kxhtnfFVi+rYdOALN0B3k9UT86zVJKfBimRaciULW4I=
-github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
-github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
-github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+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/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-20210626123444-3804bac2d6d4/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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/unistack-org/micro/v3 v3.2.4 h1:V/QrzeSI/Bjd0j7uL8Lvvbbz8ky/0yj69srd1lE1RLI=
-github.com/unistack-org/micro/v3 v3.2.4/go.mod h1:J8XxJj4Pqa3Ee0a4biRRtut7UwTlfBq8QRe+s4PKGS0=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA=
+go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8=
+go.unistack.org/micro/v3 v3.8.6 h1:nU6dpNRF7iF8dtcTTfzdPan8RkhiDuTsfMrXBmpzG/g=
+go.unistack.org/micro/v3 v3.8.6/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+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/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b h1:eB48h3HiRycXNy8E0Gf5e0hv7YT6Kt14L/D73G1fuwo=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/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/sync v0.0.0-20190911185100-cd5d95a43a6e/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-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
+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/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+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.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 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.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
+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.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+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=
@@ -115,13 +122,14 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 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/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/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/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=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 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/micro/broker_micro.pb.go
+++ b/micro/broker_micro.pb.go
@@ -0,0 +1,48 @@
+// Code generated by protoc-gen-go-micro. DO NOT EDIT.
+// protoc-gen-go-micro version: v3.5.3
+// source: broker.proto
+
+package servicepb
+
+import (
+	context "context"
+	proto "go.unistack.org/micro-broker-service/v3/proto"
+	api "go.unistack.org/micro/v3/api"
+	client "go.unistack.org/micro/v3/client"
+)
+
+var (
+	BrokerName = "Broker"
+
+	BrokerEndpoints = []api.Endpoint{}
+)
+
+func NewBrokerEndpoints() []api.Endpoint {
+	return BrokerEndpoints
+}
+
+type BrokerClient interface {
+	Publish(ctx context.Context, req *proto.PublishRequest, opts ...client.CallOption) (*proto.Empty, error)
+	Subscribe(ctx context.Context, req *proto.SubscribeRequest, opts ...client.CallOption) (Broker_SubscribeClient, error)
+}
+
+type Broker_SubscribeClient interface {
+	Context() context.Context
+	SendMsg(msg interface{}) error
+	RecvMsg(msg interface{}) error
+	Close() error
+	Recv() (*proto.Message, error)
+}
+
+type BrokerServer interface {
+	Publish(ctx context.Context, req *proto.PublishRequest, rsp *proto.Empty) error
+	Subscribe(ctx context.Context, req *proto.SubscribeRequest, stream Broker_SubscribeStream) error
+}
+
+type Broker_SubscribeStream interface {
+	Context() context.Context
+	SendMsg(msg interface{}) error
+	RecvMsg(msg interface{}) error
+	Close() error
+	Send(msg *proto.Message) error
+}
--- a/micro/broker_micro_rpc.pb.go
+++ b/micro/broker_micro_rpc.pb.go
@@ -0,0 +1,126 @@
+// Code generated by protoc-gen-go-micro. DO NOT EDIT.
+// protoc-gen-go-micro version: v3.5.3
+// source: broker.proto
+
+package servicepb
+
+import (
+	context "context"
+	proto "go.unistack.org/micro-broker-service/v3/proto"
+	api "go.unistack.org/micro/v3/api"
+	client "go.unistack.org/micro/v3/client"
+	server "go.unistack.org/micro/v3/server"
+)
+
+type brokerClient struct {
+	c    client.Client
+	name string
+}
+
+func NewBrokerClient(name string, c client.Client) BrokerClient {
+	return &brokerClient{c: c, name: name}
+}
+
+func (c *brokerClient) Publish(ctx context.Context, req *proto.PublishRequest, opts ...client.CallOption) (*proto.Empty, error) {
+	rsp := &proto.Empty{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Broker.Publish", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (c *brokerClient) Subscribe(ctx context.Context, req *proto.SubscribeRequest, opts ...client.CallOption) (Broker_SubscribeClient, error) {
+	stream, err := c.c.Stream(ctx, c.c.NewRequest(c.name, "Broker.Subscribe", &proto.SubscribeRequest{}), opts...)
+	if err != nil {
+		return nil, err
+	}
+	if err := stream.Send(req); err != nil {
+		return nil, err
+	}
+	return &brokerClientSubscribe{stream}, nil
+}
+
+type brokerClientSubscribe struct {
+	stream client.Stream
+}
+
+func (s *brokerClientSubscribe) Close() error {
+	return s.stream.Close()
+}
+
+func (s *brokerClientSubscribe) Context() context.Context {
+	return s.stream.Context()
+}
+
+func (s *brokerClientSubscribe) SendMsg(msg interface{}) error {
+	return s.stream.Send(msg)
+}
+
+func (s *brokerClientSubscribe) RecvMsg(msg interface{}) error {
+	return s.stream.Recv(msg)
+}
+
+func (s *brokerClientSubscribe) Recv() (*proto.Message, error) {
+	msg := &proto.Message{}
+	if err := s.stream.Recv(msg); err != nil {
+		return nil, err
+	}
+	return msg, nil
+}
+
+type brokerServer struct {
+	BrokerServer
+}
+
+func (h *brokerServer) Publish(ctx context.Context, req *proto.PublishRequest, rsp *proto.Empty) error {
+	return h.BrokerServer.Publish(ctx, req, rsp)
+}
+
+func (h *brokerServer) Subscribe(ctx context.Context, stream server.Stream) error {
+	msg := &proto.SubscribeRequest{}
+	if err := stream.Recv(msg); err != nil {
+		return err
+	}
+	return h.BrokerServer.Subscribe(ctx, msg, &brokerSubscribeStream{stream})
+}
+
+type brokerSubscribeStream struct {
+	stream server.Stream
+}
+
+func (s *brokerSubscribeStream) Close() error {
+	return s.stream.Close()
+}
+
+func (s *brokerSubscribeStream) Context() context.Context {
+	return s.stream.Context()
+}
+
+func (s *brokerSubscribeStream) SendMsg(msg interface{}) error {
+	return s.stream.Send(msg)
+}
+
+func (s *brokerSubscribeStream) RecvMsg(msg interface{}) error {
+	return s.stream.Recv(msg)
+}
+
+func (s *brokerSubscribeStream) Send(msg *proto.Message) error {
+	return s.stream.Send(msg)
+}
+
+func RegisterBrokerServer(s server.Server, sh BrokerServer, opts ...server.HandlerOption) error {
+	type broker interface {
+		Publish(ctx context.Context, req *proto.PublishRequest, rsp *proto.Empty) error
+		Subscribe(ctx context.Context, stream server.Stream) error
+	}
+	type Broker struct {
+		broker
+	}
+	h := &brokerServer{sh}
+	var nopts []server.HandlerOption
+	for _, endpoint := range BrokerEndpoints {
+		nopts = append(nopts, api.WithEndpoint(&endpoint))
+	}
+	return s.Handle(s.NewHandler(&Broker{h}, append(nopts, opts...)...))
+}
--- a/options.go
+++ b/options.go
@@ -1,8 +1,8 @@
 package service

 import (
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/client"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/client"
 )

 type clientKey struct{}
--- a/proto/broker.pb.go
+++ b/proto/broker.pb.go
@@ -1,13 +1,12 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0-devel
-// 	protoc        v3.6.1
+// 	protoc-gen-go v1.26.0
+// 	protoc        v3.17.3
 // source: broker.proto

-package service
+package servicepb

 import (
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -21,10 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )

-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type Empty struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -231,39 +226,40 @@ func (x *Message) GetBody() []byte {
 var File_broker_proto protoreflect.FileDescriptor

 var file_broker_proto_rawDesc = []byte{
-	0x0a, 0x0c, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79,
-	0x22, 0x52, 0x0a, 0x0e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x2a, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x07, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x0a, 0x10, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x70, 0x69,
-	0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x14,
-	0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x22, 0x8e, 0x01, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x12, 0x34, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06,
-	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x1a, 0x39, 0x0a, 0x0b, 0x48, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x32, 0x7c, 0x0a, 0x06, 0x42, 0x72, 0x6f, 0x6b, 0x65, 0x72, 0x12,
-	0x34, 0x0a, 0x07, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x12, 0x17, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x3c, 0x0a, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
-	0x62, 0x65, 0x12, 0x19, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x75, 0x62,
-	0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x10, 0x2e,
-	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22,
-	0x00, 0x30, 0x01, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x6d,
-	0x69, 0x63, 0x72, 0x6f, 0x2d, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x72, 0x2d, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x0a, 0x0c, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70,
+	0x74, 0x79, 0x22, 0x54, 0x0a, 0x0e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x2c, 0x0a, 0x07, 0x6d, 0x65,
+	0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52,
+	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x0a, 0x10, 0x53, 0x75, 0x62, 0x73,
+	0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05,
+	0x74, 0x6f, 0x70, 0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x70,
+	0x69, 0x63, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x90, 0x01, 0x0a, 0x07, 0x4d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x12, 0x36, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62,
+	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04,
+	0x62, 0x6f, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79,
+	0x1a, 0x39, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x32, 0x84, 0x01, 0x0a, 0x06,
+	0x42, 0x72, 0x6f, 0x6b, 0x65, 0x72, 0x12, 0x38, 0x0a, 0x07, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73,
+	0x68, 0x12, 0x19, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x2e, 0x50, 0x75,
+	0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x10, 0x2e, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00,
+	0x12, 0x40, 0x0a, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x1b, 0x2e,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72,
+	0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x73, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x00,
+	0x30, 0x01, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x6f, 0x2e, 0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63,
+	0x6b, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d, 0x62, 0x72, 0x6f, 0x6b,
+	0x65, 0x72, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }

 var (
@@ -280,19 +276,19 @@ func file_broker_proto_rawDescGZIP() []byte {

 var file_broker_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_broker_proto_goTypes = []interface{}{
-	(*Empty)(nil),            // 0: service.Empty
-	(*PublishRequest)(nil),   // 1: service.PublishRequest
-	(*SubscribeRequest)(nil), // 2: service.SubscribeRequest
-	(*Message)(nil),          // 3: service.Message
-	nil,                      // 4: service.Message.HeaderEntry
+	(*Empty)(nil),            // 0: servicepb.Empty
+	(*PublishRequest)(nil),   // 1: servicepb.PublishRequest
+	(*SubscribeRequest)(nil), // 2: servicepb.SubscribeRequest
+	(*Message)(nil),          // 3: servicepb.Message
+	nil,                      // 4: servicepb.Message.HeaderEntry
 }
 var file_broker_proto_depIdxs = []int32{
-	3, // 0: service.PublishRequest.message:type_name -> service.Message
-	4, // 1: service.Message.header:type_name -> service.Message.HeaderEntry
-	1, // 2: service.Broker.Publish:input_type -> service.PublishRequest
-	2, // 3: service.Broker.Subscribe:input_type -> service.SubscribeRequest
-	0, // 4: service.Broker.Publish:output_type -> service.Empty
-	3, // 5: service.Broker.Subscribe:output_type -> service.Message
+	3, // 0: servicepb.PublishRequest.message:type_name -> servicepb.Message
+	4, // 1: servicepb.Message.header:type_name -> servicepb.Message.HeaderEntry
+	1, // 2: servicepb.Broker.Publish:input_type -> servicepb.PublishRequest
+	2, // 3: servicepb.Broker.Subscribe:input_type -> servicepb.SubscribeRequest
+	0, // 4: servicepb.Broker.Publish:output_type -> servicepb.Empty
+	3, // 5: servicepb.Broker.Subscribe:output_type -> servicepb.Message
 	4, // [4:6] is the sub-list for method output_type
 	2, // [2:4] is the sub-list for method input_type
 	2, // [2:2] is the sub-list for extension type_name
--- a/proto/broker.proto
+++ b/proto/broker.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";

-package service;
-option go_package="github.com/unistack-org/micro-broker-service;service";
+package servicepb;
+option go_package="go.unistack.org/micro-broker-service/v3/proto;servicepb";

 service Broker {
 	rpc Publish(PublishRequest) returns (Empty) {};
--- a/proto/broker_grpc.pb.go
+++ b/proto/broker_grpc.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.

-package service
+package servicepb

 import (
 	context "context"
@@ -11,7 +11,8 @@ import (

 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
-const _ = grpc.SupportPackageIsVersion6
+// Requires gRPC-Go v1.32.0 or later.
+const _ = grpc.SupportPackageIsVersion7

 // BrokerClient is the client API for Broker service.
 //
@@ -31,7 +32,7 @@ func NewBrokerClient(cc grpc.ClientConnInterface) BrokerClient {

 func (c *brokerClient) Publish(ctx context.Context, in *PublishRequest, opts ...grpc.CallOption) (*Empty, error) {
 	out := new(Empty)
-	err := c.cc.Invoke(ctx, "/service.Broker/Publish", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/servicepb.Broker/Publish", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -39,7 +40,7 @@ func (c *brokerClient) Publish(ctx context.Context, in *PublishRequest, opts ...
 }

 func (c *brokerClient) Subscribe(ctx context.Context, in *SubscribeRequest, opts ...grpc.CallOption) (Broker_SubscribeClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_Broker_serviceDesc.Streams[0], "/service.Broker/Subscribe", opts...)
+	stream, err := c.cc.NewStream(ctx, &Broker_ServiceDesc.Streams[0], "/servicepb.Broker/Subscribe", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -83,16 +84,23 @@ type BrokerServer interface {
 type UnimplementedBrokerServer struct {
 }

-func (*UnimplementedBrokerServer) Publish(context.Context, *PublishRequest) (*Empty, error) {
+func (UnimplementedBrokerServer) Publish(context.Context, *PublishRequest) (*Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Publish not implemented")
 }
-func (*UnimplementedBrokerServer) Subscribe(*SubscribeRequest, Broker_SubscribeServer) error {
+func (UnimplementedBrokerServer) Subscribe(*SubscribeRequest, Broker_SubscribeServer) error {
 	return status.Errorf(codes.Unimplemented, "method Subscribe not implemented")
 }
-func (*UnimplementedBrokerServer) mustEmbedUnimplementedBrokerServer() {}
+func (UnimplementedBrokerServer) mustEmbedUnimplementedBrokerServer() {}

-func RegisterBrokerServer(s *grpc.Server, srv BrokerServer) {
-	s.RegisterService(&_Broker_serviceDesc, srv)
+// UnsafeBrokerServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to BrokerServer will
+// result in compilation errors.
+type UnsafeBrokerServer interface {
+	mustEmbedUnimplementedBrokerServer()
+}
+
+func RegisterBrokerServer(s grpc.ServiceRegistrar, srv BrokerServer) {
+	s.RegisterService(&Broker_ServiceDesc, srv)
 }

 func _Broker_Publish_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
@@ -105,7 +113,7 @@ func _Broker_Publish_Handler(srv interface{}, ctx context.Context, dec func(inte
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/service.Broker/Publish",
+		FullMethod: "/servicepb.Broker/Publish",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BrokerServer).Publish(ctx, req.(*PublishRequest))
@@ -134,8 +142,11 @@ func (x *brokerSubscribeServer) Send(m *Message) error {
 	return x.ServerStream.SendMsg(m)
 }

-var _Broker_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "service.Broker",
+// Broker_ServiceDesc is the grpc.ServiceDesc for Broker service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var Broker_ServiceDesc = grpc.ServiceDesc{
+	ServiceName: "servicepb.Broker",
 	HandlerType: (*BrokerServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
--- a/proto/broker_micro.pb.go
+++ b/proto/broker_micro.pb.go
@@ -1,63 +0,0 @@
-// Code generated by protoc-gen-micro
-// source: broker.proto
-package service
-
-import (
-	"context"
-
-	micro_api "github.com/unistack-org/micro/v3/api"
-	micro_client "github.com/unistack-org/micro/v3/client"
-	micro_server "github.com/unistack-org/micro/v3/server"
-)
-
-// NewBrokerEndpoints provides api endpoints metdata for Broker service
-func NewBrokerEndpoints() []*micro_api.Endpoint {
-	var endpoints []*micro_api.Endpoint
-	return endpoints
-}
-
-// BrokerService interface
-type BrokerService interface {
-	Publish(context.Context, *PublishRequest, ...micro_client.CallOption) (*Empty, error)
-	Subscribe(context.Context, *SubscribeRequest, ...micro_client.CallOption) (Broker_SubscribeService, error)
-}
-
-type Broker_SubscribeService interface {
-	Context() context.Context
-	SendMsg(interface{}) error
-	RecvMsg(interface{}) error
-	Close() error
-	Recv() (*Message, error)
-}
-
-// Micro server stuff
-
-// BrokerHandler server handler
-type BrokerHandler interface {
-	Publish(context.Context, *PublishRequest, *Empty) error
-	Subscribe(context.Context, *SubscribeRequest, Broker_SubscribeStream) error
-}
-
-// RegisterBrokerHandler registers server handler
-func RegisterBrokerHandler(s micro_server.Server, sh BrokerHandler, opts ...micro_server.HandlerOption) error {
-	type broker interface {
-		Publish(context.Context, *PublishRequest, *Empty) error
-		Subscribe(context.Context, micro_server.Stream) error
-	}
-	type Broker struct {
-		broker
-	}
-	h := &brokerHandler{sh}
-	for _, endpoint := range NewBrokerEndpoints() {
-		opts = append(opts, micro_api.WithEndpoint(endpoint))
-	}
-	return s.Handle(s.NewHandler(&Broker{h}, opts...))
-}
-
-type Broker_SubscribeStream interface {
-	Context() context.Context
-	SendMsg(interface{}) error
-	RecvMsg(interface{}) error
-	Close() error
-	Send(*Message) error
-}
--- a/proto/broker_micro_grpc.pb.go
+++ b/proto/broker_micro_grpc.pb.go
@@ -1,114 +0,0 @@
-// Code generated by protoc-gen-micro
-// source: broker.proto
-package service
-
-import (
-	"context"
-
-	micro_client "github.com/unistack-org/micro/v3/client"
-	micro_server "github.com/unistack-org/micro/v3/server"
-)
-
-var (
-	_ micro_server.Option
-	_ micro_client.Option
-)
-
-type brokerService struct {
-	c    micro_client.Client
-	name string
-}
-
-// Micro client stuff
-
-// NewBrokerService create new service client
-func NewBrokerService(name string, c micro_client.Client) BrokerService {
-	return &brokerService{c: c, name: name}
-}
-
-func (c *brokerService) Publish(ctx context.Context, req *PublishRequest, opts ...micro_client.CallOption) (*Empty, error) {
-	rsp := &Empty{}
-	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Broker.Publish", req), rsp, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return rsp, nil
-}
-
-func (c *brokerService) Subscribe(ctx context.Context, req *SubscribeRequest, opts ...micro_client.CallOption) (Broker_SubscribeService, error) {
-	stream, err := c.c.Stream(ctx, c.c.NewRequest(c.name, "Broker.Subscribe", &SubscribeRequest{}), opts...)
-	if err != nil {
-		return nil, err
-	}
-	if err := stream.Send(req); err != nil {
-		return nil, err
-	}
-	return &brokerServiceSubscribe{stream}, nil
-}
-
-type brokerServiceSubscribe struct {
-	stream micro_client.Stream
-}
-
-func (x *brokerServiceSubscribe) Close() error {
-	return x.stream.Close()
-}
-
-func (x *brokerServiceSubscribe) Context() context.Context {
-	return x.stream.Context()
-}
-
-func (x *brokerServiceSubscribe) SendMsg(m interface{}) error {
-	return x.stream.Send(m)
-}
-
-func (x *brokerServiceSubscribe) RecvMsg(m interface{}) error {
-	return x.stream.Recv(m)
-}
-
-func (x *brokerServiceSubscribe) Recv() (*Message, error) {
-	m := &Message{}
-	if err := x.stream.Recv(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-} // Micro server stuff
-
-type brokerHandler struct {
-	BrokerHandler
-}
-
-func (h *brokerHandler) Publish(ctx context.Context, req *PublishRequest, rsp *Empty) error {
-	return h.BrokerHandler.Publish(ctx, req, rsp)
-}
-
-func (h *brokerHandler) Subscribe(ctx context.Context, stream micro_server.Stream) error {
-	m := &SubscribeRequest{}
-	if err := stream.Recv(m); err != nil {
-		return err
-	}
-	return h.BrokerHandler.Subscribe(ctx, m, &brokerSubscribeStream{stream})
-}
-
-type brokerSubscribeStream struct {
-	stream micro_server.Stream
-}
-
-func (x *brokerSubscribeStream) Close() error {
-	return x.stream.Close()
-}
-
-func (x *brokerSubscribeStream) Context() context.Context {
-	return x.stream.Context()
-}
-
-func (x *brokerSubscribeStream) SendMsg(m interface{}) error {
-	return x.stream.Send(m)
-}
-
-func (x *brokerSubscribeStream) RecvMsg(m interface{}) error {
-	return x.stream.Recv(m)
-}
-func (x *brokerSubscribeStream) Send(m *Message) error {
-	return x.stream.Send(m)
-}
--- a/service.go
+++ b/service.go
@@ -1,21 +1,23 @@
 // Package service provides the broker service client
-package service
+package service // import "go.unistack.org/micro-broker-service/v3"

 import (
 	"context"
 	"fmt"
 	"time"

-	pb "github.com/unistack-org/micro-broker-service/v3/proto"
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/client"
-	"github.com/unistack-org/micro/v3/logger"
+	pbmicro "go.unistack.org/micro-broker-service/v3/micro"
+	pb "go.unistack.org/micro-broker-service/v3/proto"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v3/logger"
 )

 type serviceBroker struct {
 	addrs   []string
 	service string
-	client  pb.BrokerService
+	client  pbmicro.BrokerClient
+	init    bool
 	opts    broker.Options
 }

@@ -32,6 +34,10 @@ func (b *serviceBroker) Disconnect(ctx context.Context) error {
 }

 func (b *serviceBroker) Init(opts ...broker.Option) error {
+	if len(opts) == 0 && b.init {
+		return nil
+	}
+
 	for _, o := range opts {
 		o(&b.opts)
 	}
@@ -46,6 +52,19 @@ func (b *serviceBroker) Init(opts ...broker.Option) error {
 		}
 	}

+	if err := b.opts.Register.Init(); err != nil {
+		return err
+	}
+	if err := b.opts.Tracer.Init(); err != nil {
+		return err
+	}
+	if err := b.opts.Logger.Init(); err != nil {
+		return err
+	}
+	if err := b.opts.Meter.Init(); err != nil {
+		return err
+	}
+
 	if b.service == "" {
 		return fmt.Errorf("missing Service option")
 	}
@@ -54,8 +73,9 @@ func (b *serviceBroker) Init(opts ...broker.Option) error {
 		return fmt.Errorf("missing Client option")
 	}

-	b.client = pb.NewBrokerService(b.service, cli)
+	b.client = pbmicro.NewBrokerClient(b.service, cli)

+	b.init = true
 	return nil
 }

--- a/subscriber.go
+++ b/subscriber.go
@@ -3,16 +3,16 @@ package service
 import (
 	"context"

-	pb "github.com/unistack-org/micro-broker-service/v3/proto"
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/logger"
+	pbmicro "go.unistack.org/micro-broker-service/v3/micro"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
 )

 type serviceSub struct {
 	topic   string
 	group   string
 	handler broker.Handler
-	stream  pb.Broker_SubscribeService
+	stream  pbmicro.Broker_SubscribeClient
 	closed  chan bool
 	options broker.SubscribeOptions
 }
Author	SHA1	Message	Date
Vasiliy Tolstov	e5ea846039	update import paths Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-10-27 18:27:04 +03:00
Vasiliy Tolstov	7ca3e5d7c8	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-10-27 18:23:20 +03:00
github-actions[bot]	27366fcd1d	Merge pull request #41 from unistack-org/dependabot/github_actions/actions/github-script-5 Bump actions/github-script from 4 to 5	2021-09-27 01:11:43 +00:00
dependabot[bot]	c16984b761	Bump actions/github-script from 4 to 5 Bumps [actions/github-script](https://github.com/actions/github-script) from 4 to 5. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-27 01:10:42 +00:00
Vasiliy Tolstov	45dc57c27c	update workflow Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-21 21:46:33 +03:00
dependabot[bot]	9ca9c827e5	Bump google.golang.org/grpc from 1.37.1 to 1.40.0 (#36 ) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.37.1 to 1.40.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](https://github.com/grpc/grpc-go/compare/v1.37.1...v1.40.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> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-09-17 08:42:08 +03:00
Vasiliy Tolstov	30801249ae	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-17 07:47:35 +03:00
Vasiliy Tolstov	8b8bb7d3d4	enable automerge Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-16 11:02:41 +03:00
dependabot[bot]	822ea84067	Bump google.golang.org/protobuf from 1.26.0 to 1.27.1 (#37 )	2021-09-06 15:33:52 +00:00
Vasiliy Tolstov	22c48f4b90	add github stuff Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-06 17:22:15 +03:00
Renovate Bot	4567bc705a	Update module google.golang.org/grpc to v1.37.1	2021-05-11 23:33:24 +00:00
Renovate Bot	9985962a9d	Update module github.com/unistack-org/micro/v3 to v3.3.17	2021-04-27 08:24:23 +00:00
Renovate Bot	09a4e24e7b	Update module github.com/unistack-org/micro/v3 to v3.3.16	2021-04-20 12:43:09 +00:00
Renovate Bot	e271d94ebf	Update module github.com/unistack-org/micro/v3 to v3.3.15	2021-04-19 14:33:53 +00:00
Renovate Bot	0921a48e97	Update module github.com/unistack-org/micro/v3 to v3.3.14	2021-04-19 04:41:33 +00:00
Renovate Bot	3f42b45aac	Update module github.com/unistack-org/micro/v3 to v3.3.13	2021-04-10 01:27:21 +00:00
Renovate Bot	31a919b8d4	Update module google.golang.org/grpc to v1.37.0	2021-04-07 20:53:48 +00:00
Renovate Bot	4cdef63a96	Update module github.com/unistack-org/micro/v3 to v3.3.11	2021-04-03 12:16:33 +00:00
Renovate Bot	ac0ef079c0	Update module github.com/unistack-org/micro/v3 to v3.3.10	2021-03-31 22:54:03 +00:00
Renovate Bot	d19cbb468f	Update module github.com/unistack-org/micro/v3 to v3.3.9	2021-03-30 00:05:37 +00:00
Renovate Bot	4896bd9cc3	Update module github.com/unistack-org/micro/v3 to v3.3.8	2021-03-29 02:38:48 +00:00
Renovate Bot	51b20b9f2e	Update module github.com/unistack-org/micro/v3 to v3.3.4	2021-03-26 18:19:18 +00:00
Renovate Bot	795efe0352	Update module google.golang.org/grpc to v1.36.1	2021-03-26 01:06:30 +00:00
Renovate Bot	70da131fad	Update module github.com/unistack-org/micro/v3 to v3.3.2	2021-03-25 13:43:10 +00:00
Renovate Bot	1a3a4d0ae4	Update module github.com/unistack-org/micro/v3 to v3.3.1	2021-03-25 01:05:44 +00:00
Vasiliy Tolstov	55d1d81f04	fixup Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-03-24 23:26:02 +03:00
Vasiliy Tolstov	89d804f9e6	cleanup Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-03-24 23:23:53 +03:00
Renovate Bot	6998184d9e	Update module github.com/unistack-org/micro/v3 to v3.3.0	2021-03-24 14:52:16 +00:00
Renovate Bot	dd3665cef5	Update module github.com/unistack-org/micro/v3 to v3.2.26	2021-03-23 18:46:28 +00:00
Vasiliy Tolstov	dd51dad2e0	regen with never protoc-gen-go Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-03-22 09:00:44 +03:00
Vasiliy Tolstov	d8871e07ee	regen with never protoc-gen-go Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-03-22 08:42:38 +03:00
Renovate Bot	585eff3652	Update module github.com/unistack-org/micro/v3 to v3.2.24	2021-03-21 14:56:56 +00:00
Renovate Bot	e9b89a287e	Update all deps	2021-03-18 04:43:05 +00:00
Renovate Bot	abd88c183b	Update module github.com/unistack-org/micro/v3 to v3.2.23	2021-03-16 19:12:39 +00:00
Renovate Bot	1b00ec8807	Update module github.com/unistack-org/micro/v3 to v3.2.22	2021-03-15 01:27:24 +00:00
Renovate Bot	da02e5860d	Update module github.com/unistack-org/micro/v3 to v3.2.20	2021-03-07 01:00:58 +00:00
Renovate Bot	64994e5bda	Update module github.com/unistack-org/micro/v3 to v3.2.17	2021-03-05 17:31:05 +00:00
Renovate Bot	f7d473e2c5	Update module github.com/unistack-org/micro/v3 to v3.2.16	2021-03-04 13:26:44 +00:00
Renovate Bot	2dd5557735	Update module github.com/unistack-org/micro/v3 to v3.2.15	2021-03-01 12:17:30 +00:00
Renovate Bot	aa4553ee10	Update module google.golang.org/grpc to v1.36.0	2021-02-25 01:20:39 +00:00
Renovate Bot	413059aac2	Update module unistack-org/micro/v3 to v3.2.14	2021-02-18 18:43:16 +00:00
Vasiliy Tolstov	78eac5bec5	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-02-18 18:43:03 +03:00
Renovate Bot	cd7af99f59	Update module unistack-org/micro/v3 to v3.2.11	2021-02-12 16:03:56 +00:00
Renovate Bot	e180d0df40	Update module unistack-org/micro/v3 to v3.2.9	2021-02-12 12:33:29 +00:00
Vasiliy Tolstov	6b43ea718d	update renovate.json Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-02-12 12:37:26 +03:00
Vasiliy Tolstov	75fdff84be	move renovate.json Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-02-10 20:20:54 +03:00
Vasiliy Tolstov	4c38d086af	Merge pull request #2 from unistack-org/renovate/google.golang.org-grpc-1.x Update module google.golang.org/grpc to v1.35.0	2021-02-10 19:42:16 +03:00
Vasiliy Tolstov	13e50e7a01	Merge pull request #4 from unistack-org/renovate/actions-setup-go-2.x Update actions/setup-go action to v2	2021-02-10 19:42:05 +03:00
Vasiliy Tolstov	b5ced1501c	Merge pull request #5 from unistack-org/renovate/golangci-golangci-lint-action-2.x Update golangci/golangci-lint-action action to v2	2021-02-10 19:38:46 +03:00
Renovate Bot	f3abef0589	Update module google.golang.org/grpc to v1.35.0	2021-02-10 16:36:54 +00:00
Vasiliy Tolstov	0a518438aa	Merge pull request #3 from unistack-org/renovate/unistack-org-micro-v3-3.x Update module unistack-org/micro/v3 to v3.2.8	2021-02-10 19:36:10 +03:00
Renovate Bot	d7eb48a30d	Update golangci/golangci-lint-action action to v2	2021-02-10 15:17:49 +00:00
Renovate Bot	657f166718	Update actions/setup-go action to v2	2021-02-10 15:17:44 +00:00
Renovate Bot	3f803431b9	Update module unistack-org/micro/v3 to v3.2.8	2021-02-10 15:17:38 +00:00
Vasiliy Tolstov	4491ec1af7	Merge pull request #1 from unistack-org/renovate/configure Configure Renovate	2021-02-10 18:16:27 +03:00
Renovate Bot	8c206313b6	Add renovate.json	2021-02-08 23:04:37 +00:00