update workflows

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
update workflows
2022-03-05 19:08:02 +03:00 · 2021-10-27 17:47:11 +03:00 · 2021-10-27 00:48:31 +03:00 · 2021-09-21 21:46:31 +03:00 · 2021-09-17 07:47:32 +03:00 · 2021-09-17 07:43:49 +03:00
16 changed files with 621 additions and 245 deletions
--- a/.github/renovate.json
+++ b/.github/renovate.json
@ -1,19 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ],
-  "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/autoapprove.yml
+++ b/.github/workflows/autoapprove.yml
@ -0,0 +1,20 @@
+name: "autoapprove"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  autoapprove:
+    runs-on: ubuntu-latest
+    steps:
+      - name: approve
+        uses: hmarr/auto-approve-action@v2
+        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
+        id: approve
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@ -0,0 +1,21 @@
+name: "automerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'vtolstov'
+    steps:
+      - name: merge
+        id: merge
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -3,6 +3,7 @@ on:
 push:
    branches:
    - master
+    - v3
 jobs:
  test:
    name: test
@ -13,7 +14,7 @@ jobs:
      with:
        go-version: 1.16
    - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
    - name: cache
      uses: actions/cache@v2
      with:
@ -31,9 +32,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.1.0
        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@v3
+    - 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,27 @@
+name: "dependabot-automerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.0
+        with:
+          github-token: "${{ secrets.TOKEN }}"
+      - name: merge
+        id: merge
+        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -3,6 +3,7 @@ on:
  pull_request:
    branches:
    - master
+    - v3
 jobs:
  test:
    name: test
@ -13,7 +14,7 @@ jobs:
      with:
        go-version: 1.16
    - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
    - name: cache
      uses: actions/cache@v2
      with:
@ -31,9 +32,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.1.0
        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/README.md
+++ b/README.md
@ -1,7 +1,9 @@
-# Micro Broker Segmentio [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Doc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/unistack-org/micro-broker-segmentio?tab=overview) [![Status](https://github.com/unistack-org/micro-broker-segmentio/workflows/build/badge.svg?branch=master)](https://github.com/unistack-org/micro-broker-segmentio/actions?query=workflow%3Abuild+branch%3Amaster+event%3Apush) [![Lint](https://goreportcard.com/badge/github.com/unistack-org/micro-broker-segmentio)](https://goreportcard.com/report/github.com/unistack-org/micro-broker-segmentio)
+# Micro Broker Segmentio [![License](https://img.shields.io/:license-apache-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Doc](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/go.unistack.org/micro-broker-segmentio?tab=overview) [![Status](https://go.unistack.org/micro-broker-segmentio/workflows/build/badge.svg?branch=master)](https://go.unistack.org/micro-broker-segmentio/actions?query=workflow%3Abuild+branch%3Amaster+event%3Apush) [![Lint](https://goreportcard.com/badge/go.unistack.org/micro-broker-segmentio)](https://goreportcard.com/report/go.unistack.org/micro-broker-segmentio)

 Micro Broker Segmentio implementation.

+DEPRECATION WARNING: not maintained, use go.unistack.org/micro-broker-kgo instead
+
 ## License

 Apache 2.0 licensed.
--- a/broker_test.go
+++ b/broker_test.go
@ -6,17 +6,15 @@ import (
 	"strings"
 	"testing"

-	segmentio "github.com/unistack-org/micro-broker-segmentio/v3"
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/logger"
+	segmentio "go.unistack.org/micro-broker-segmentio/v3"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
 )

-var (
-	bm = &broker.Message{
-		Header: map[string]string{"hkey": "hval"},
-		Body:   []byte(`"body"`),
-	}
-)
+var bm = &broker.Message{
+	Header: map[string]string{"hkey": "hval"},
+	Body:   []byte(`"body"`),
+}

 func TestPubSub(t *testing.T) {
 	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
--- a/go.mod
+++ b/go.mod
@ -1,12 +1,8 @@
-module github.com/unistack-org/micro-broker-segmentio/v3
+module go.unistack.org/micro-broker-segmentio/v3

 go 1.16

 require (
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/uuid v1.3.0
-	github.com/klauspost/compress v1.13.1 // indirect
-	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
-	github.com/segmentio/kafka-go v0.4.17
-	github.com/unistack-org/micro/v3 v3.4.9
+	github.com/segmentio/kafka-go v0.4.22
+	go.unistack.org/micro/v3 v3.8.5
 )
--- a/go.sum
+++ b/go.sum
@ -1,27 +1,20 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 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/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
 github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
+github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-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/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+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/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/klauspost/compress v1.9.8 h1:VMAMUUOh+gaxKTMk+zqbjsSjsIcUcL/LF4o63i82QyA=
 github.com/klauspost/compress v1.9.8/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.13.1 h1:wXr2uRxZTJXHLly6qhJabee5JqIhTRoLBhDOA74hDEQ=
-github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@ -30,32 +23,28 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pierrec/lz4 v2.6.0+incompatible h1:Ix9yFKn1nSPBLFl/yZknTp8TU5G4Ps0JDmguYK6iH1A=
 github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
-github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/segmentio/kafka-go v0.4.16 h1:9dt78ehM9qzAkekA60D6A96RlqDzC3hnYYa8y5Szd+U=
-github.com/segmentio/kafka-go v0.4.16/go.mod h1:19+Eg7KwrNKy/PFhiIthEPkO8k+ac7/ZYXwYM9Df10w=
-github.com/segmentio/kafka-go v0.4.17 h1:IyqRstL9KUTDb3kyGPOOa5VffokKWSEzN6geJ92dSDY=
-github.com/segmentio/kafka-go v0.4.17/go.mod h1:19+Eg7KwrNKy/PFhiIthEPkO8k+ac7/ZYXwYM9Df10w=
-github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+github.com/segmentio/kafka-go v0.4.22 h1:F4k2OTm9Y4+zliuoXgNKJZTktE0miQioZZzofsjhRdk=
+github.com/segmentio/kafka-go v0.4.22/go.mod h1:XzMcoMjSzDGHcIwpWUI7GB43iKZ2fTVmryPSGLf/MPg=
+github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/unistack-org/micro/v3 v3.4.7 h1:zmGFx2J6tIbmr4IGLcc+LNtbftQFZI42bfuNV5xNYM0=
-github.com/unistack-org/micro/v3 v3.4.7/go.mod h1:LXmPfbJnJNvL0kQs8HfnkV3Wya2Wb+C7keVq++RCZnk=
-github.com/unistack-org/micro/v3 v3.4.9 h1:IBCW/yxQijO/X+2zNzTdSsvzlgE0+y49bvjWemtY2zA=
-github.com/unistack-org/micro/v3 v3.4.9/go.mod h1:1ZkwpEqpiHiVhM2hiF9DamtpsF04oFybFhEQ4zEMcro=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
+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.5 h1:DIYWRsQF+NPhKZP45sCtNsUhaRw6u2+Ps7U+pKU7i3s=
+go.unistack.org/micro/v3 v3.8.5/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-20190506204251-e1dfcc566284 h1:rlLehGeYg6jfoyz/eDqDU1iRXLKfR42nnNh57ytKEWo=
 golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-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/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/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-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@ -65,8 +54,12 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 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/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/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+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.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
--- a/options.go
+++ b/options.go
@ -5,8 +5,8 @@ import (
 	"time"

 	kafka "github.com/segmentio/kafka-go"
-	"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"
 )

 var (
@ -17,8 +17,10 @@ var (
 	DefaultCommitQueueSize = 2000
 )

-type readerConfigKey struct{}
-type writerConfigKey struct{}
+type (
+	readerConfigKey struct{}
+	writerConfigKey struct{}
+)

 func ReaderConfig(c kafka.ReaderConfig) broker.Option {
 	return broker.SetOption(readerConfigKey{}, c)
--- a/segmentio.go
+++ b/segmentio.go
@ -1,17 +1,19 @@
 // Package kafka provides a kafka broker using segmentio
-package segmentio
+package segmentio // import "go.unistack.org/micro-broker-segmentio/v3"

 import (
 	"context"
 	"fmt"
+	"strings"
 	"sync"
 	"sync/atomic"
 	"time"

-	"github.com/google/uuid"
 	kafka "github.com/segmentio/kafka-go"
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/logger"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/util/id"
 )

 type kBroker struct {
@ -58,13 +60,13 @@ func (p *publication) Message() *broker.Message {
 }

 func (p *publication) Ack() error {
+	if cerr := p.ackErr.Load(); cerr != nil {
+		return cerr.(error)
+	}
 	if atomic.LoadInt32(p.readerDone) == 1 {
 		return kafka.ErrGroupClosed
 	}
 	p.ackCh <- map[string]map[int]int64{p.topic: {p.partition: p.offset}}
-	if cerr := p.ackErr.Load(); cerr != nil {
-		return cerr.(error)
-	}
 	return nil
 }

@ -72,6 +74,10 @@ func (p *publication) Error() error {
 	return p.err
 }

+func (p *publication) SetError(err error) {
+	p.err = err
+}
+
 func (s *subscriber) Options() broker.SubscribeOptions {
 	return s.opts
 }
@ -83,21 +89,21 @@ func (s *subscriber) Topic() string {
 func (s *subscriber) Unsubscribe(ctx context.Context) error {
 	var err error
 	s.Lock()
-	s.closed = true
 	group := s.group
 	s.Unlock()
-
 	if group != nil {
 		err = group.Close()
 	}
+	if err == nil {
+		s.Lock()
+		s.closed = true
+		s.Unlock()
+	}
 	return err
 }

 func (k *kBroker) Address() string {
-	if len(k.addrs) > 0 {
-		return k.addrs[0]
-	}
-	return "127.0.0.1:9092"
+	return strings.Join(k.addrs, ",")
 }

 func (k *kBroker) Name() string {
@ -216,6 +222,46 @@ func (k *kBroker) Options() broker.Options {
 	return k.opts
 }

+func (k *kBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+	var val []byte
+	var err error
+
+	options := broker.NewPublishOptions(opts...)
+
+	kmsgs := make([]kafka.Message, 0, len(msgs))
+	for _, msg := range msgs {
+		if options.BodyOnly {
+			val = msg.Body
+		} else {
+			val, err = k.opts.Codec.Marshal(msg)
+			if err != nil {
+				return err
+			}
+		}
+		topic, _ := msg.Header.Get(metadata.HeaderTopic)
+		kmsg := kafka.Message{Topic: topic, Value: val}
+		if options.Context != nil {
+			if key, ok := options.Context.Value(publishKey{}).([]byte); ok && len(key) > 0 {
+				kmsg.Key = key
+			}
+		}
+		kmsgs = append(kmsgs, kmsg)
+	}
+
+	if k.writer.Async {
+		k.Lock()
+		k.messages = append(k.messages, kmsgs...)
+		k.Unlock()
+		return nil
+	}
+
+	wCtx := k.opts.Context
+	if ctx != nil {
+		wCtx = ctx
+	}
+	return k.writer.WriteMessages(wCtx, kmsgs...)
+}
+
 func (k *kBroker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
 	var val []byte
 	var err error
@ -248,18 +294,33 @@ func (k *kBroker) Publish(ctx context.Context, topic string, msg *broker.Message
 	if ctx != nil {
 		wCtx = ctx
 	}
+
+	if err = k.writer.WriteMessages(wCtx, kmsg); err == nil {
+		return nil
+	}
+
+	logger.Debugf(wCtx, "recreate writer because of err: %v", err)
+	k.Lock()
+	if err = k.writer.Close(); err != nil {
+		logger.Errorf(wCtx, "failed to close writer: %v", err)
+		k.Unlock()
+		return err
+	}
+	k.writer = newWriter(k.writerConfig)
+	k.Unlock()
+
 	return k.writer.WriteMessages(wCtx, kmsg)
 }

-func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (k *kBroker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
 	opt := broker.NewSubscribeOptions(opts...)

 	if opt.Group == "" {
-		id, err := uuid.NewRandom()
+		gid, err := id.New()
 		if err != nil {
 			return nil, err
 		}
-		opt.Group = id.String()
+		opt.Group = gid
 	}

 	cgcfg := kafka.ConsumerGroupConfig{
@ -332,7 +393,7 @@ func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Ha
 				case nil:
 					// normal execution
 				case kafka.ErrGroupClosed:
-					k.opts.Logger.Tracef(k.opts.Context, "group closed %v", err)
+					k.opts.Logger.Debugf(k.opts.Context, "group closed %v", err)
 					sub.RLock()
 					closed := sub.closed
 					sub.RUnlock()
@ -345,15 +406,15 @@ func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Ha
 					sub.createGroup(gCtx)
 					continue
 				default:
-					k.opts.Logger.Tracef(k.opts.Context, "some error: %v", err)
+					k.opts.Logger.Debugf(k.opts.Context, "some error: %v", err)
 					sub.RLock()
 					closed := sub.closed
 					sub.RUnlock()
 					if closed {
 						return
 					}
-					if k.opts.Logger.V(logger.TraceLevel) {
-						k.opts.Logger.Tracef(k.opts.Context, "[segmentio] recreate consumer group, as unexpected consumer error %T %v", err, err)
+					if k.opts.Logger.V(logger.DebugLevel) {
+						k.opts.Logger.Debugf(k.opts.Context, "[segmentio] recreate consumer group, as unexpected consumer error %T %v", err, err)
 					}
 					sub.createGroup(gCtx)
 					continue
@ -371,8 +432,8 @@ func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Ha
 				cntWait := int32(0)

 				for topic, assignments := range generation.Assignments {
-					if k.opts.Logger.V(logger.TraceLevel) {
-						k.opts.Logger.Tracef(k.opts.Context, "topic: %s assignments: %v", topic, assignments)
+					if k.opts.Logger.V(logger.DebugLevel) {
+						k.opts.Logger.Debugf(k.opts.Context, "topic: %s assignments: %v", topic, assignments)
 					}
 					for _, assignment := range assignments {
 						cfg := k.readerConfig
@ -398,7 +459,7 @@ func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Ha
 							brokerOpts:   k.opts,
 							subOpts:      opt,
 							reader:       reader,
-							handler:      handler,
+							batchhandler: handler,
 							ackCh:        ackCh,
 							errCh:        errCh,
 							cntWait:      &cntWait,
@ -409,8 +470,171 @@ func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Ha
 						generation.Start(cgh.run)
 					}
 				}
-				if k.opts.Logger.V(logger.TraceLevel) {
-					k.opts.Logger.Trace(k.opts.Context, "start async commit loop")
+				if k.opts.Logger.V(logger.DebugLevel) {
+					k.opts.Logger.Debug(k.opts.Context, "start commit loop")
+				}
+				// run async commit loop
+				go k.commitLoop(generation, k.readerConfig.CommitInterval, ackCh, errChs, &readerDone, commitDoneCh, &cntWait)
+			}
+		}
+	}()
+
+	return sub, nil
+}
+
+func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+	opt := broker.NewSubscribeOptions(opts...)
+
+	if opt.Group == "" {
+		gid, err := id.New()
+		if err != nil {
+			return nil, err
+		}
+		opt.Group = gid
+	}
+
+	cgcfg := kafka.ConsumerGroupConfig{
+		ID:                    opt.Group,
+		WatchPartitionChanges: true,
+		Brokers:               k.readerConfig.Brokers,
+		Topics:                []string{topic},
+		GroupBalancers:        k.readerConfig.GroupBalancers,
+		StartOffset:           k.readerConfig.StartOffset,
+		Logger:                k.readerConfig.Logger,
+		ErrorLogger:           k.readerConfig.ErrorLogger,
+		Dialer:                k.readerConfig.Dialer,
+	}
+	if err := cgcfg.Validate(); err != nil {
+		return nil, err
+	}
+	gCtx := k.opts.Context
+	if ctx != nil {
+		gCtx = ctx
+	}
+
+	sub := &subscriber{brokerOpts: k.opts, opts: opt, topic: topic, cgcfg: cgcfg}
+	sub.createGroup(gCtx)
+
+	go func() {
+		defer func() {
+			sub.RLock()
+			closed := sub.closed
+			sub.RUnlock()
+			if !closed {
+				if err := sub.group.Close(); err != nil {
+					k.opts.Logger.Errorf(k.opts.Context, "[segmentio] consumer group close error %v", err)
+				}
+			}
+		}()
+
+		for {
+			select {
+			case <-ctx.Done():
+				sub.RLock()
+				closed := sub.closed
+				sub.RUnlock()
+				if closed {
+					return
+				}
+				if k.opts.Context.Err() != nil && k.opts.Logger.V(logger.ErrorLevel) {
+					k.opts.Logger.Errorf(k.opts.Context, "[segmentio] subscribe context closed %v", k.opts.Context.Err())
+				}
+				return
+			case <-k.opts.Context.Done():
+				sub.RLock()
+				closed := sub.closed
+				sub.RUnlock()
+				if closed {
+					return
+				}
+				if k.opts.Context.Err() != nil && k.opts.Logger.V(logger.ErrorLevel) {
+					k.opts.Logger.Errorf(k.opts.Context, "[segmentio] broker context closed error %v", k.opts.Context.Err())
+				}
+				return
+			default:
+				sub.RLock()
+				closed := sub.closed
+				sub.RUnlock()
+				if closed {
+					return
+				}
+				generation, err := sub.group.Next(gCtx)
+				switch err {
+				case nil:
+					// normal execution
+				case kafka.ErrGroupClosed:
+					k.opts.Logger.Debugf(k.opts.Context, "group closed %v", err)
+					sub.RLock()
+					closed := sub.closed
+					sub.RUnlock()
+					if closed {
+						return
+					}
+					if k.opts.Logger.V(logger.ErrorLevel) {
+						k.opts.Logger.Errorf(k.opts.Context, "[segmentio] recreate consumer group, as it closed by kafka %v", k.opts.Context.Err())
+					}
+					sub.createGroup(gCtx)
+					continue
+				default:
+					k.opts.Logger.Debugf(k.opts.Context, "some error: %v", err)
+					sub.RLock()
+					closed := sub.closed
+					sub.RUnlock()
+					if closed {
+						return
+					}
+					if k.opts.Logger.V(logger.DebugLevel) {
+						k.opts.Logger.Debugf(k.opts.Context, "[segmentio] recreate consumer group, as unexpected consumer error %T %v", err, err)
+					}
+					sub.createGroup(gCtx)
+					continue
+				}
+
+				// k.opts.Meter.Counter("broker_reader_partitions", "topic", topic).Set(uint64(0))
+				ackCh := make(chan map[string]map[int]int64, DefaultCommitQueueSize)
+				errChLen := 0
+				for _, assignments := range generation.Assignments {
+					errChLen += len(assignments)
+				}
+
+				errChs := make([]chan error, 0, errChLen)
+
+				commitDoneCh := make(chan bool)
+				readerDone := int32(0)
+				cntWait := int32(0)
+
+				for topic, assignments := range generation.Assignments {
+					// k.opts.Meter.Counter("broker_reader_partitions", "topic", topic).Set(uint64(len(assignments)))
+
+					if k.opts.Logger.V(logger.DebugLevel) {
+						k.opts.Logger.Debugf(k.opts.Context, "topic: %s assignments: %v", topic, assignments)
+					}
+					for _, assignment := range assignments {
+						cfg := k.readerConfig
+						cfg.Topic = topic
+						cfg.Partition = assignment.ID
+						cfg.GroupID = ""
+						reader := kafka.NewReader(cfg)
+
+						// as we dont use consumer group in reader, reader not started before actuall fetch, so we can ignore all errors
+						_ = reader.SetOffset(assignment.Offset)
+
+						errCh := make(chan error)
+						errChs = append(errChs, errCh)
+						cgh := &cgHandler{
+							brokerOpts:   k.opts,
+							subOpts:      opt,
+							reader:       reader,
+							handler:      handler,
+							ackCh:        ackCh,
+							errCh:        errCh,
+							cntWait:      &cntWait,
+							readerDone:   &readerDone,
+							commitDoneCh: commitDoneCh,
+						}
+						atomic.AddInt32(cgh.cntWait, 1)
+						generation.Start(cgh.run)
+					}
 				}
 				// run async commit loop
 				go k.commitLoop(generation, k.readerConfig.CommitInterval, ackCh, errChs, &readerDone, commitDoneCh, &cntWait)
@ -426,6 +650,7 @@ type cgHandler struct {
 	subOpts      broker.SubscribeOptions
 	reader       *kafka.Reader
 	handler      broker.Handler
+	batchhandler broker.BatchHandler
 	ackCh        chan map[string]map[int]int64
 	errCh        chan error
 	readerDone   *int32
@ -434,9 +659,8 @@ type cgHandler struct {
 }

 func (k *kBroker) commitLoop(generation *kafka.Generation, commitInterval time.Duration, ackCh chan map[string]map[int]int64, errChs []chan error, readerDone *int32, commitDoneCh chan bool, cntWait *int32) {
-
-	if k.opts.Logger.V(logger.TraceLevel) {
-		k.opts.Logger.Trace(k.opts.Context, "start commit loop")
+	if k.opts.Logger.V(logger.DebugLevel) {
+		k.opts.Logger.Debug(k.opts.Context, "start async commit loop")
 	}

 	td := DefaultCommitInterval
@ -454,6 +678,7 @@ func (k *kBroker) commitLoop(generation *kafka.Generation, commitInterval time.D

 	go func() {
 		defer func() {
+			k.opts.Logger.Debug(k.opts.Context, "return from commitLoop and close commitDoneCh")
 			close(commitDoneCh)
 		}()

@ -463,26 +688,23 @@ func (k *kBroker) commitLoop(generation *kafka.Generation, commitInterval time.D
 		for {
 			select {
 			case <-checkTicker.C:
-				if atomic.LoadInt32(cntWait) == 0 {
-					mapMu.Lock()
-					if len(offsets) > 0 {
-						if err := generation.CommitOffsets(offsets); err != nil {
-							for _, errCh := range errChs {
-								errCh <- err
-							}
-							return
-						}
+				if atomic.LoadInt32(cntWait) != 0 {
+					continue
+				}
+				mapMu.Lock()
+				if err := generation.CommitOffsets(offsets); err != nil {
+					for _, errCh := range errChs {
+						errCh <- err
 					}
 					mapMu.Unlock()
-					if k.opts.Logger.V(logger.TraceLevel) {
-						k.opts.Logger.Trace(k.opts.Context, "stop commit loop")
-					}
 					return
 				}
-			case ack := <-ackCh:
-				if k.opts.Logger.V(logger.TraceLevel) {
-					k.opts.Logger.Tracef(k.opts.Context, "new commit offsets: %v", ack)
+				mapMu.Unlock()
+				if k.opts.Logger.V(logger.DebugLevel) {
+					k.opts.Logger.Debug(k.opts.Context, "stop commit filling loop")
 				}
+				return
+			case ack := <-ackCh:
 				switch td {
 				case 0: // sync commits as CommitInterval == 0
 					if len(ack) > 0 {
@ -506,27 +728,20 @@ func (k *kBroker) commitLoop(generation *kafka.Generation, commitInterval time.D
 					}
 					mapMu.Unlock()
 				}
-				// check for readers done and commit offsets
-				if atomic.LoadInt32(cntWait) == 0 {
-					mapMu.Lock()
-					if len(offsets) > 0 {
-						if err := generation.CommitOffsets(offsets); err != nil {
-							for _, errCh := range errChs {
-								errCh <- err
-							}
-							return
-						}
-					}
-					mapMu.Unlock()
-					if k.opts.Logger.V(logger.TraceLevel) {
-						k.opts.Logger.Trace(k.opts.Context, "stop commit loop")
-					}
-					return
-				}
 			}
 		}
 	}()

+	if td == 0 {
+		// sync commit loop
+		for {
+			if atomic.LoadInt32(readerDone) == 1 && atomic.LoadInt32(cntWait) == 0 {
+				break
+			}
+			time.Sleep(1 * time.Second)
+		}
+	}
+
 	// async commit loop
 	if td > 0 {
 		ticker := time.NewTicker(td)
@ -536,22 +751,14 @@ func (k *kBroker) commitLoop(generation *kafka.Generation, commitInterval time.D
 		for {
 			select {
 			case <-doneTicker.C:
-				if atomic.LoadInt32(readerDone) == 1 {
-					mapMu.Lock()
-					if len(offsets) == 0 {
-						defer ticker.Stop()
-						return
-					}
+				if atomic.LoadInt32(readerDone) == 1 && atomic.LoadInt32(cntWait) == 0 {
+					// fire immediate commit offsets
 					ticker.Stop()
 				}
 			case <-ticker.C:
 				mapMu.Lock()
-				if len(offsets) == 0 {
-					mapMu.Unlock()
-					continue
-				}
-				if k.opts.Logger.V(logger.TraceLevel) {
-					k.opts.Logger.Tracef(k.opts.Context, "async commit offsets: %v", offsets)
+				if k.opts.Logger.V(logger.DebugLevel) && len(offsets) > 0 {
+					k.opts.Logger.Debugf(k.opts.Context, "async commit offsets: %v", offsets)
 				}
 				err := generation.CommitOffsets(offsets)
 				if err != nil {
@ -572,8 +779,8 @@ func (k *kBroker) commitLoop(generation *kafka.Generation, commitInterval time.D
 }

 func (h *cgHandler) run(ctx context.Context) {
-	if h.brokerOpts.Logger.V(logger.TraceLevel) {
-		h.brokerOpts.Logger.Trace(ctx, "start partition reader")
+	if h.brokerOpts.Logger.V(logger.DebugLevel) {
+		h.brokerOpts.Logger.Debugf(ctx, "start partition reader topic: %s partition: %d", h.reader.Config().Topic, h.reader.Config().Partition)
 	}

 	td := DefaultStatsInterval
@ -591,20 +798,30 @@ func (h *cgHandler) run(ctx context.Context) {

 		atomic.CompareAndSwapInt32(h.readerDone, 0, 1)
 		if err := h.reader.Close(); err != nil && h.brokerOpts.Logger.V(logger.ErrorLevel) {
-			h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio] reader close error: %v", err)
+			h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio] reader for topic %s partition %d close error: %v", h.reader.Config().Topic, h.reader.Config().Partition, err)
 		}
+		h.brokerOpts.Logger.Debug(h.brokerOpts.Context, "wait start for commitDoneCh channel closing")
 		<-h.commitDoneCh
-		if h.brokerOpts.Logger.V(logger.TraceLevel) {
-			h.brokerOpts.Logger.Trace(ctx, "stop partition reader")
+		h.brokerOpts.Logger.Debug(h.brokerOpts.Context, "wait stop for commitDoneCh channel closing")
+		if h.brokerOpts.Logger.V(logger.DebugLevel) {
+			h.brokerOpts.Logger.Debugf(ctx, "stop partition reader topic: %s partition: %d", h.reader.Config().Topic, h.reader.Config().Partition)
 		}
 	}()

+	/*
+		tc := time.NewTicker(3 * time.Second)
+		defer tc.Stop()
+	*/
 	go func() {
 		for {
 			select {
+			//		case <-tc.C:
+			//		commitErr.Store(errors.New("my err"))
+			//	return
 			case err := <-h.errCh:
 				if err != nil {
 					commitErr.Store(err)
+					return
 				}
 			case <-ctx.Done():
 				return
@ -613,69 +830,85 @@ func (h *cgHandler) run(ctx context.Context) {
 	}()

 	for {
-		msg, err := h.reader.ReadMessage(ctx)
-		switch err {
+		select {
+		case <-ctx.Done():
+			return
 		default:
-			if h.brokerOpts.Logger.V(logger.ErrorLevel) {
-				h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio] unexpected error type: %T err: %v", err, err)
-			}
-			return
-		case kafka.ErrGenerationEnded:
-			// generation has ended
-			if h.brokerOpts.Logger.V(logger.TraceLevel) {
-				h.brokerOpts.Logger.Trace(h.brokerOpts.Context, "[segmentio] generation ended, rebalance or close")
-			}
-			return
-		case nil:
-			if cerr := commitErr.Load(); cerr != nil {
-				if h.brokerOpts.Logger.V(logger.ErrorLevel) {
-					h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio] commit error: %v", cerr)
+			msg, err := h.reader.ReadMessage(ctx)
+			switch err {
+			default:
+				switch kerr := err.(type) {
+				case kafka.Error:
+					if h.brokerOpts.Logger.V(logger.DebugLevel) {
+						h.brokerOpts.Logger.Debugf(h.brokerOpts.Context, "[segmentio] kafka error %T err: %v", kerr, kerr)
+					}
+					return
+				default:
+					if h.brokerOpts.Logger.V(logger.ErrorLevel) {
+						h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio] unexpected error type: %T err: %v", err, err)
+					}
+					return
+				}
+			case kafka.ErrGenerationEnded:
+				// generation has ended
+				if h.brokerOpts.Logger.V(logger.DebugLevel) {
+					h.brokerOpts.Logger.Debug(h.brokerOpts.Context, "[segmentio] generation ended, rebalance or close")
 				}
 				return
-			}
+			case nil:
+				if cerr := commitErr.Load(); cerr != nil {
+					if h.brokerOpts.Logger.V(logger.ErrorLevel) {
+						h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio] commit error: %v", cerr)
+					}
+					return
+				}

-			eh := h.brokerOpts.ErrorHandler
+				eh := h.brokerOpts.ErrorHandler

-			if h.subOpts.ErrorHandler != nil {
-				eh = h.subOpts.ErrorHandler
-			}
-			p := &publication{ackCh: h.ackCh, partition: msg.Partition, offset: msg.Offset + 1, topic: msg.Topic, msg: &broker.Message{}, readerDone: h.readerDone}
+				if h.subOpts.ErrorHandler != nil {
+					eh = h.subOpts.ErrorHandler
+				}
+				p := &publication{ackCh: h.ackCh, partition: msg.Partition, offset: msg.Offset + 1, topic: msg.Topic, msg: &broker.Message{}, readerDone: h.readerDone}

-			if h.subOpts.BodyOnly {
-				p.msg.Body = msg.Value
-			} else {
-				if err := h.brokerOpts.Codec.Unmarshal(msg.Value, p.msg); err != nil {
-					p.err = err
+				if h.subOpts.BodyOnly {
 					p.msg.Body = msg.Value
+				} else {
+					if err := h.brokerOpts.Codec.Unmarshal(msg.Value, p.msg); err != nil {
+						p.err = err
+						p.msg.Body = msg.Value
+						if eh != nil {
+							_ = eh(p)
+						} else {
+							if h.brokerOpts.Logger.V(logger.ErrorLevel) {
+								h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio]: failed to unmarshal: %v", err)
+							}
+						}
+						continue
+					}
+				}
+				if cerr := commitErr.Load(); cerr != nil {
+					if h.brokerOpts.Logger.V(logger.ErrorLevel) {
+						h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio] commit error: %v", cerr)
+					}
+					return
+				}
+				err = h.handler(p)
+				if err == nil && h.subOpts.AutoAck {
+					if err = p.Ack(); err != nil {
+						if h.brokerOpts.Logger.V(logger.ErrorLevel) {
+							h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio]: message ack error: %v", err)
+						}
+						return
+					}
+				} else if err != nil {
+					p.err = err
 					if eh != nil {
 						_ = eh(p)
 					} else {
 						if h.brokerOpts.Logger.V(logger.ErrorLevel) {
-							h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio]: failed to unmarshal: %v", err)
+							h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio]: subscriber error: %v", err)
 						}
 					}
-					continue
-				}
-			}
-			if cerr := commitErr.Load(); cerr != nil {
-				p.ackErr.Store(cerr.(bool))
-			}
-			err = h.handler(p)
-			if err == nil && h.subOpts.AutoAck {
-				if err = p.Ack(); err != nil {
-					if h.brokerOpts.Logger.V(logger.ErrorLevel) {
-						h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio]: message ack error: %v", err)
-						return
-					}
-				}
-			} else if err != nil {
-				p.err = err
-				if eh != nil {
-					_ = eh(p)
-				} else {
-					if h.brokerOpts.Logger.V(logger.ErrorLevel) {
-						h.brokerOpts.Logger.Errorf(h.brokerOpts.Context, "[segmentio]: subscriber error: %v", err)
-					}
 				}
 			}
 		}
@ -683,17 +916,28 @@ func (h *cgHandler) run(ctx context.Context) {
 }

 func (sub *subscriber) createGroup(ctx context.Context) {
-	sub.RLock()
-	cgcfg := sub.cgcfg
-	sub.RUnlock()
-
+	var err error
 	for {
 		select {
 		case <-ctx.Done():
-			// closed
 			return
 		default:
-			cgroup, err := kafka.NewConsumerGroup(cgcfg)
+			sub.RLock()
+			cgcfg := sub.cgcfg
+			closed := sub.closed
+			cgroup := sub.group
+			sub.RUnlock()
+			if closed {
+				return
+			}
+			if cgroup != nil {
+				if err = cgroup.Close(); err != nil {
+					if sub.brokerOpts.Logger.V(logger.ErrorLevel) {
+						sub.brokerOpts.Logger.Errorf(sub.brokerOpts.Context, "[segmentio]: consumer group close error %v", err)
+					}
+				}
+			}
+			cgroup, err = kafka.NewConsumerGroup(cgcfg)
 			if err != nil {
 				if sub.brokerOpts.Logger.V(logger.ErrorLevel) {
 					sub.brokerOpts.Logger.Errorf(sub.brokerOpts.Context, "[segmentio]: consumer group error %v", err)
@ -703,14 +947,13 @@ func (sub *subscriber) createGroup(ctx context.Context) {
 			sub.Lock()
 			sub.group = cgroup
 			sub.Unlock()
-			// return
 			return
 		}
 	}
 }

 func (k *kBroker) String() string {
-	return "kafka"
+	return "segmentio"
 }

 func (k *kBroker) configure(opts ...broker.Option) error {
@ -760,8 +1003,32 @@ func (k *kBroker) configure(opts ...broker.Option) error {
 	}
 	k.addrs = cAddrs
 	k.readerConfig = readerConfig
-	k.writer = &kafka.Writer{
-		Addr:         kafka.TCP(k.addrs...),
+	k.writerConfig = writerConfig
+	k.writerConfig.Brokers = k.addrs
+
+	if k.readerConfig.Dialer == nil {
+		k.readerConfig.Dialer = kafka.DefaultDialer
+	}
+	if k.writerConfig.Dialer == nil {
+		k.writerConfig.Dialer = kafka.DefaultDialer
+	}
+	if id, ok := k.opts.Context.Value(clientIDKey{}).(string); ok {
+		k.writerConfig.Dialer.ClientID = id
+		k.readerConfig.Dialer.ClientID = id
+	}
+
+	k.writer = newWriter(k.writerConfig)
+	if fn, ok := k.opts.Context.Value(writerCompletionFunc{}).(func([]kafka.Message, error)); ok {
+		k.writer.Completion = fn
+	}
+
+	k.init = true
+	return nil
+}
+
+func newWriter(writerConfig kafka.WriterConfig) *kafka.Writer {
+	return &kafka.Writer{
+		Addr:         kafka.TCP(writerConfig.Brokers...),
 		Balancer:     writerConfig.Balancer,
 		MaxAttempts:  writerConfig.MaxAttempts,
 		BatchSize:    writerConfig.BatchSize,
@ -771,25 +1038,16 @@ func (k *kBroker) configure(opts ...broker.Option) error {
 		WriteTimeout: writerConfig.WriteTimeout,
 		RequiredAcks: kafka.RequiredAcks(writerConfig.RequiredAcks),
 		Async:        writerConfig.Async,
-		//Completion:   writerConfig.Completion,
-		//Compression:  writerConfig.Compression,
-		Logger:      writerConfig.Logger,
-		ErrorLogger: writerConfig.ErrorLogger,
-		//Transport:    writerConfig.Transport,
+		Logger:       writerConfig.Logger,
+		ErrorLogger:  writerConfig.ErrorLogger,
+		Transport: &kafka.Transport{
+			Dial:        writerConfig.Dialer.DialFunc,
+			ClientID:    writerConfig.Dialer.ClientID,
+			IdleTimeout: time.Second * 5,
+			MetadataTTL: time.Second * 9,
+			SASL:        writerConfig.Dialer.SASLMechanism,
+		},
 	}
-	if id, ok := k.opts.Context.Value(clientIDKey{}).(string); ok {
-		if k.readerConfig.Dialer == nil {
-			k.readerConfig.Dialer = kafka.DefaultDialer
-		}
-		k.readerConfig.Dialer.ClientID = id
-	}
-
-	if fn, ok := k.opts.Context.Value(writerCompletionFunc{}).(func([]kafka.Message, error)); ok {
-		k.writer.Completion = fn
-	}
-
-	k.init = true
-	return nil
 }

 func NewBroker(opts ...broker.Option) broker.Broker {
--- a/segmentio_test.go
+++ b/segmentio_test.go
@ -7,9 +7,9 @@ import (
 	"sync/atomic"
 	"testing"

-	segmentio "github.com/unistack-org/micro-broker-segmentio/v3"
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/logger"
+	segmentio "go.unistack.org/micro-broker-segmentio/v3"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
 )

 func TestSegmentioSubscribe(t *testing.T) {
--- a/stats.go
+++ b/stats.go
@ -2,15 +2,23 @@ package segmentio

 import (
 	"context"
+	"sync"
 	"time"

 	kafka "github.com/segmentio/kafka-go"
-	"github.com/unistack-org/micro/v3/meter"
+	"go.unistack.org/micro/v3/meter"
 )

 func readerStats(ctx context.Context, r *kafka.Reader, td time.Duration, m meter.Meter) {
 	ticker := time.NewTicker(td)
-	defer ticker.Stop()
+	var once sync.Once
+
+	onceLabels := make([]string, 0, 4)
+
+	defer func() {
+		ticker.Stop()
+		m.Counter("broker_reader_count", onceLabels...).Add(int(-1))
+	}()

 	for {
 		select {
@ -22,7 +30,10 @@ func readerStats(ctx context.Context, r *kafka.Reader, td time.Duration, m meter
 			}
 			rstats := r.Stats()
 			labels := []string{"topic", rstats.Topic, "partition", rstats.Partition, "client_id", rstats.ClientID}
-
+			once.Do(func() {
+				onceLabels = []string{"topic", rstats.Topic, "client_id", rstats.ClientID}
+				m.Counter("broker_reader_count", onceLabels...).Add(int(1))
+			})
 			m.Counter("broker_reader_dial_count", labels...).Add(int(rstats.Dials))
 			m.Counter("broker_reader_fetch_count", labels...).Add(int(rstats.Fetches))
 			m.Counter("broker_reader_message_count", labels...).Add(int(rstats.Messages))
Author	SHA1	Message	Date
Vasiliy Tolstov	e6e8bcfa5d	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2022-03-05 19:08:02 +03:00
Vasiliy Tolstov	11700d0482	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-10-27 17:47:11 +03:00
Vasiliy Tolstov	8e582cc1c0	update import paths Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-10-27 00:48:31 +03:00
Vasiliy Tolstov	994882e1b2	update workflow Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-21 21:46:31 +03:00
Vasiliy Tolstov	5b28857fcd	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-17 07:47:32 +03:00
Vasiliy Tolstov	f94f94b416	Revert "update workflows" This reverts commit `8e4b7d1b54`.	2021-09-17 07:43:49 +03:00
Vasiliy Tolstov	8e4b7d1b54	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-17 07:41:27 +03:00
Vasiliy Tolstov	13bb13f432	enable automerge Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-16 10:46:35 +03:00
Vasiliy Tolstov	f13d3917d9	Update README.md	2021-09-06 10:27:02 +03:00
Vasiliy Tolstov	7916dafb4d	intermediate fixes for subscriber Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-08-04 16:40:48 +03:00
Vasiliy Tolstov	83b037df20	try to fix ack err cases Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-07-29 23:50:26 +03:00
Vasiliy Tolstov	5934963d81	update for latest micro Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-07-26 09:41:11 +03:00