Merge pull request 'meter: write metrics inside broker implementation' (#123) from improve into master

Reviewed-on: #123

.github/workflows/autoapprove.yml

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

.github/workflows/automerge.yml

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

.github/workflows/build.yml

@@ -3,19 +3,20 @@ on:
  push:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.4.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.

.github/workflows/codeql-analysis.yml

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

.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.6
+        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}}

.github/workflows/pr.yml

@@ -3,19 +3,20 @@ on:
   pull_request:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.4.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.

README.md

@@ -1,2 +1,9 @@
 # micro-broker-kgo
 yet another micro kafka broker alternative
+
+TODO:
+* dont always append options from context on Init and New
+* add SubscriberOptions(...kgo.Opt)
+* add ServerSubscribeOptions(...kgo.Opt)
+* check PublisherOptions(...kgo.Opt)
+* check ClientPublisherOptions(...kgo.Opt)

event.go

@@ -0,0 +1,42 @@
+package kgo
+
+import (
+	"sync"
+
+	"go.unistack.org/micro/v4/broker"
+)
+
+type event struct {
+	topic string
+	err   error
+	sync.RWMutex
+	msg *broker.Message
+	ack bool
+}
+
+func (p *event) Topic() string {
+	return p.topic
+}
+
+func (p *event) Message() *broker.Message {
+	return p.msg
+}
+
+func (p *event) Ack() error {
+	p.ack = true
+	return nil
+}
+
+func (p *event) Error() error {
+	return p.err
+}
+
+func (p *event) SetError(err error) {
+	p.err = err
+}
+
+var eventPool = sync.Pool{
+	New: func() interface{} {
+		return &event{msg: &broker.Message{}}
+	},
+}

go.mod

@@ -1,13 +1,14 @@
-module github.com/unistack-org/micro-broker-kgo/v3
+module go.unistack.org/micro-broker-kgo/v4
 
-go 1.16
+go 1.19
 
 require (
-	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/twmb/franz-go v1.11.5
-	github.com/twmb/franz-go v1.0.0
+	go.unistack.org/micro/v4 v4.0.1
-	github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210914174821-2f676c0a574b // indirect
+)
-	github.com/unistack-org/micro-codec-json/v3 v3.2.5
+
-	github.com/unistack-org/micro/v3 v3.7.1
+require (
-	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	github.com/klauspost/compress v1.15.9 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	github.com/pierrec/lz4/v4 v4.1.15 // indirect
+	github.com/twmb/franz-go/pkg/kmsg v1.3.0 // indirect
 )

go.sum

@@ -1,141 +1,18 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/twmb/franz-go v1.11.5 h1:TTv5lVJd+87XkmP9dWN9Jgpf7IUUr7a7jee+byR8LBE=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/twmb/franz-go v1.11.5/go.mod h1:FvaHNlpT6woVYIl6LAuIeL7yHol1Fp6Gv2Dn21AvH78=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/twmb/franz-go/pkg/kmsg v1.3.0 h1:ouBETB7nTqRxiO5E8/pySoFZtVEW2VWw55z3/bsUzTw=
-github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
+github.com/twmb/franz-go/pkg/kmsg v1.3.0/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
-github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-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.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/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-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/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-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.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
-github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
-github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
-github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
-github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc=
-github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
-github.com/klauspost/compress v1.13.5 h1:9O69jUPDcsT9fEm74W92rZL9FQY7rCdaXVneq+yyzl4=
-github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pierrec/lz4/v4 v4.1.8 h1:ieHkV+i2BRzngO4Wd/3HGowuZStgq6QkPsD1eolNAO4=
-github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/twmb/franz-go v1.0.0 h1:JcsqEImDhr7H/eQx/V58fwzjmVi2FRwz6dyylmdJ0NU=
-github.com/twmb/franz-go v1.0.0/go.mod h1:cdFLk8d/5/ox88y38xgiDKP3Yo338OO0t5QbTEM2K6I=
-github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210901051457-3c197a133ddd h1:o+cb+mqRFpVKrusJy/Ebt4zTWn94nPbI1ooMeNhovqM=
-github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210901051457-3c197a133ddd/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
-github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210914174821-2f676c0a574b h1:7d6eRt9HEqXVxMzD2fry9qtJ0kRkgeJ5olqW9K+aXv8=
-github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210914174821-2f676c0a574b/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
-github.com/twmb/go-rbtree v1.0.0 h1:KxN7dXJ8XaZ4cvmHV1qqXTshxX3EBvX/toG5+UR49Mg=
-github.com/twmb/go-rbtree v1.0.0/go.mod h1:UlIAI8gu3KRPkXSobZnmJfVwCJgEhD/liWzT5ppzIyc=
-github.com/unistack-org/micro-codec-json/v3 v3.2.5 h1:WOilhbL0YSu58iIQIIxpawRYZyx6CR16tCpbX4ai3Vc=
-github.com/unistack-org/micro-codec-json/v3 v3.2.5/go.mod h1:LSzfrD9GYWCl6KOyihywx1wlbOgStrpyy3NVHNZAvHA=
-github.com/unistack-org/micro-proto v0.0.8 h1:g4UZGQGeYGI3CFJtjuEm47aouYPviG8SDhSifl0831w=
-github.com/unistack-org/micro-proto v0.0.8/go.mod h1:GYO53DWmeldRIo90cAdQx8bLr/WJMxW62W4ja74p1Ac=
-github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc=
-github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg=
-github.com/unistack-org/micro/v3 v3.3.19/go.mod h1:LXmPfbJnJNvL0kQs8HfnkV3Wya2Wb+C7keVq++RCZnk=
-github.com/unistack-org/micro/v3 v3.7.0 h1:jEEegoVh1VIgT/+4gHw3TmwI3p7ufAdV37RVNxx9kNc=
-github.com/unistack-org/micro/v3 v3.7.0/go.mod h1:xXGbjNQShqlth0hv+q7ijGvciXGVqxUnVdkFm0t95rk=
-github.com/unistack-org/micro/v3 v3.7.1 h1:gjCon1U8i9upNgw9+iEgbZh2LCeBizDYotQ+THHV0lo=
-github.com/unistack-org/micro/v3 v3.7.1/go.mod h1:gBoY6gvzeFiJTZ4FgDttGNSs4Y1+1PRg2cV1yTRMSlg=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-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-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 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/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/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-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/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-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=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-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/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/yaml.v2 v2.2.2/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=

kgo.go

@@ -1,104 +1,93 @@
 // Package kgo provides a kafka broker using kgo
-package kgo
+package kgo // import "go.unistack.org/micro-broker-kgo/v4"
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"math/rand"
 	"strings"
 	"sync"
 	"time"
 
-	kgo "github.com/twmb/franz-go/pkg/kgo"
+	"github.com/twmb/franz-go/pkg/kgo"
-	"github.com/unistack-org/micro/v3/broker"
+	"go.unistack.org/micro/v4/broker"
-	"github.com/unistack-org/micro/v3/logger"
+	"go.unistack.org/micro/v4/metadata"
-	"github.com/unistack-org/micro/v3/metadata"
+	id "go.unistack.org/micro/v4/util/id"
-	"github.com/unistack-org/micro/v3/util/id"
+	mrand "go.unistack.org/micro/v4/util/rand"
-	mrand "github.com/unistack-org/micro/v3/util/rand"
 )
 
-type kBroker struct {
+var _ broker.Broker = &Broker{}
-	writer    *kgo.Client // used only to push messages
+
+var ErrLostMessage = errors.New("message not marked for offsets commit and will be lost in next iteration")
+
+var DefaultRetryBackoffFn = func() func(int) time.Duration {
+	var rngMu sync.Mutex
+	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
+	return func(fails int) time.Duration {
+		const (
+			min = 100 * time.Millisecond
+			max = time.Second
+		)
+		if fails <= 0 {
+			return min
+		}
+		if fails > 10 {
+			return max
+		}
+
+		backoff := min * time.Duration(1<<(fails-1))
+
+		rngMu.Lock()
+		jitter := 0.8 + 0.4*rng.Float64()
+		rngMu.Unlock()
+
+		backoff = time.Duration(float64(backoff) * jitter)
+
+		if backoff > max {
+			return max
+		}
+		return backoff
+	}
+}()
+
+type Broker struct {
+	c         *kgo.Client
 	kopts     []kgo.Opt
 	connected bool
-	init      bool
 	sync.RWMutex
 	opts broker.Options
 	subs []*subscriber
 }
 
-type subscriber struct {
+func (k *Broker) Address() string {
-	reader       *kgo.Client // used only to pull messages
-	topic        string
-	opts         broker.SubscribeOptions
-	kopts        broker.Options
-	handler      broker.Handler
-	batchhandler broker.BatchHandler
-	closed       bool
-	done         chan struct{}
-	consumers    map[string]map[int32]worker
-	sync.RWMutex
-}
-
-type publication struct {
-	topic string
-	err   error
-	sync.RWMutex
-	msg *broker.Message
-	ack bool
-}
-
-func (p *publication) Topic() string {
-	return p.topic
-}
-
-func (p *publication) Message() *broker.Message {
-	return p.msg
-}
-
-func (p *publication) Ack() error {
-	p.ack = true
-	return nil
-}
-
-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
-}
-
-func (s *subscriber) Topic() string {
-	return s.topic
-}
-
-func (s *subscriber) Unsubscribe(ctx context.Context) error {
-	if s.closed {
-		return nil
-	}
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-		close(s.done)
-		s.closed = true
-	}
-	return nil
-}
-
-func (k *kBroker) Address() string {
 	return strings.Join(k.opts.Addrs, ",")
 }
 
-func (k *kBroker) Name() string {
+func (k *Broker) Name() string {
 	return k.opts.Name
 }
 
-func (k *kBroker) Connect(ctx context.Context) error {
+func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, error) {
+	var c *kgo.Client
+	var err error
+
+	select {
+	case <-ctx.Done():
+		return nil, ctx.Err()
+	default:
+		c, err = kgo.NewClient(opts...)
+		if err == nil {
+			err = c.Ping(ctx) // check connectivity to cluster
+		}
+		if err != nil {
+			return nil, err
+		}
+	}
+	return c, nil
+}
+
+func (k *Broker) Connect(ctx context.Context) error {
 	k.RLock()
 	if k.connected {
 		k.RUnlock()
@@ -111,34 +100,20 @@ func (k *kBroker) Connect(ctx context.Context) error {
 		nctx = ctx
 	}
 
-	kaddrs := k.opts.Addrs
+	c, err := k.connect(nctx, k.kopts...)
-
+	if err != nil {
-	// shuffle addrs
+		return err
-	var rng mrand.Rand
-	rng.Shuffle(len(kaddrs), func(i, j int) {
-		kaddrs[i], kaddrs[j] = kaddrs[j], kaddrs[i]
-	})
-
-	kopts := append(k.kopts, kgo.SeedBrokers(kaddrs...))
-
-	select {
-	case <-nctx.Done():
-		return nctx.Err()
-	default:
-		c, err := kgo.NewClient(kopts...)
-		if err != nil {
-			return err
-		}
-		k.Lock()
-		k.connected = true
-		k.writer = c
-		k.Unlock()
 	}
 
+	k.Lock()
+	k.c = c
+	k.connected = true
+	k.Unlock()
+
 	return nil
 }
 
-func (k *kBroker) Disconnect(ctx context.Context) error {
+func (k *Broker) Disconnect(ctx context.Context) error {
 	k.RLock()
 	if !k.connected {
 		k.RUnlock()
@@ -146,14 +121,13 @@ func (k *kBroker) Disconnect(ctx context.Context) error {
 	}
 	k.RUnlock()
 
-	k.Lock()
-	defer k.Unlock()
-
 	nctx := k.opts.Context
 	if ctx != nil {
 		nctx = ctx
 	}
 
+	k.Lock()
+	defer k.Unlock()
 	select {
 	case <-nctx.Done():
 		return nctx.Err()
@@ -163,20 +137,20 @@ func (k *kBroker) Disconnect(ctx context.Context) error {
 				return err
 			}
 		}
-		k.writer.Close()
+		if k.c != nil {
+			k.c.CloseAllowingRebalance()
+			// k.c.Close()
+		}
 	}
 
 	k.connected = false
 	return nil
 }
 
-func (k *kBroker) Init(opts ...broker.Option) error {
+func (k *Broker) Init(opts ...broker.Option) error {
 	k.Lock()
 	defer k.Unlock()
 
-	if len(opts) == 0 && k.init {
-		return nil
-	}
 	for _, o := range opts {
 		o(&k.opts)
 	}
@@ -200,53 +174,107 @@ func (k *kBroker) Init(opts ...broker.Option) error {
 		}
 	}
 
-	//	kgo.RecordPartitioner(),
-
-	k.init = true
-
 	return nil
 }
 
-func (k *kBroker) Options() broker.Options {
+func (k *Broker) Options() broker.Options {
 	return k.opts
 }
 
-func (k *kBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (k *Broker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
 	return k.publish(ctx, msgs, opts...)
 }
 
-func (k *kBroker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
+func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
 	msg.Header.Set(metadata.HeaderTopic, topic)
 	return k.publish(ctx, []*broker.Message{msg}, opts...)
 }
 
-func (k *kBroker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+	k.RLock()
+	if !k.connected {
+		k.RUnlock()
+		k.Lock()
+		c, err := k.connect(ctx, k.kopts...)
+		if err != nil {
+			k.Unlock()
+			return err
+		}
+		k.c = c
+		k.connected = true
+		k.Unlock()
+	}
+	k.RUnlock()
+
 	options := broker.NewPublishOptions(opts...)
 	records := make([]*kgo.Record, 0, len(msgs))
 	var errs []string
 	var err error
-	var buf []byte
+	var key []byte
+	var promise func(*kgo.Record, error)
+
+	if options.Context != nil {
+		if k, ok := options.Context.Value(publishKey{}).([]byte); ok && k != nil {
+			key = k
+		}
+		if p, ok := options.Context.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
+			promise = p
+		}
+	}
 
 	for _, msg := range msgs {
+		rec := &kgo.Record{Context: ctx, Key: key}
+		rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
+		k.opts.Meter.Counter(broker.PublishMessageInflight, "endpoint", rec.Topic).Inc()
 		if options.BodyOnly {
-			buf = msg.Body
+			rec.Value = msg.Body
+		} else if k.opts.Codec.String() == "noop" {
+			rec.Value = msg.Body
+			for k, v := range msg.Header {
+				rec.Headers = append(rec.Headers, kgo.RecordHeader{Key: k, Value: []byte(v)})
+			}
 		} else {
-			buf, err = k.opts.Codec.Marshal(msg)
+			rec.Value, err = k.opts.Codec.Marshal(msg)
 			if err != nil {
 				return err
 			}
 		}
-		topic, _ := msg.Header.Get(metadata.HeaderTopic)
-		rec := &kgo.Record{Value: buf, Topic: topic}
 		records = append(records, rec)
 	}
 
-	results := k.writer.ProduceSync(ctx, records...)
+	if promise != nil {
+		ts := time.Now()
+		for _, rec := range records {
+			k.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
+				te := time.Since(ts)
+				k.opts.Meter.Counter(broker.PublishMessageInflight, "endpoint", rec.Topic).Dec()
+				k.opts.Meter.Summary(broker.PublishMessageLatencyMicroseconds, "endpoint", r.Topic).Update(te.Seconds())
+				k.opts.Meter.Histogram(broker.PublishMessageDurationSeconds, "endpoint", r.Topic).Update(te.Seconds())
+				if err != nil {
+					k.opts.Meter.Counter(broker.PublishMessageTotal, "endpoint", r.Topic, "status", "failure").Inc()
+				} else {
+					k.opts.Meter.Counter(broker.PublishMessageTotal, "endpoint", r.Topic, "status", "success").Inc()
+				}
+				promise(r, err)
+			})
+		}
+		return nil
+	}
+	ts := time.Now()
+	results := k.c.ProduceSync(ctx, records...)
+	te := time.Since(ts)
 	for _, result := range results {
+		k.opts.Meter.Summary(broker.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic).Update(te.Seconds())
+		k.opts.Meter.Histogram(broker.PublishMessageDurationSeconds, "endpoint", result.Record.Topic).Update(te.Seconds())
+		k.opts.Meter.Counter(broker.PublishMessageInflight, "endpoint", result.Record.Topic).Dec()
 		if result.Err != nil {
+			k.opts.Meter.Counter(broker.PublishMessageTotal, "endpoint", result.Record.Topic, "status", "failure").Inc()
 			errs = append(errs, result.Err.Error())
+		} else {
+			k.opts.Meter.Counter(broker.PublishMessageTotal, "endpoint", result.Record.Topic, "status", "success").Inc()
 		}
 	}
+
 	if len(errs) > 0 {
 		return fmt.Errorf("publish error: %s", strings.Join(errs, "\n"))
 	}
@@ -254,53 +282,11 @@ func (k *kBroker) publish(ctx context.Context, msgs []*broker.Message, opts ...b
 	return nil
 }
 
-type mlogger struct {
+func (k *Broker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	l   logger.Logger
-	ctx context.Context
-}
-
-func (l *mlogger) Log(lvl kgo.LogLevel, msg string, args ...interface{}) {
-	var mlvl logger.Level
-	switch lvl {
-	case kgo.LogLevelNone:
-		return
-	case kgo.LogLevelError:
-		mlvl = logger.ErrorLevel
-	case kgo.LogLevelWarn:
-		mlvl = logger.WarnLevel
-	case kgo.LogLevelInfo:
-		mlvl = logger.InfoLevel
-	case kgo.LogLevelDebug:
-		mlvl = logger.DebugLevel
-	default:
-		return
-	}
-	fields := make(map[string]interface{}, int(len(args)/2))
-	for i := 0; i < len(args)/2; i += 2 {
-		fields[fmt.Sprintf("%v", args[i])] = args[i+1]
-	}
-	l.l.Fields(fields).Log(l.ctx, mlvl, msg)
-}
-
-func (l *mlogger) Level() kgo.LogLevel {
-	switch l.l.Options().Level {
-	case logger.ErrorLevel:
-		return kgo.LogLevelError
-	case logger.WarnLevel:
-		return kgo.LogLevelWarn
-	case logger.InfoLevel:
-		return kgo.LogLevelInfo
-	case logger.DebugLevel, logger.TraceLevel:
-		return kgo.LogLevelDebug
-	}
-	return kgo.LogLevelNone
-}
-
-func (k *kBroker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
 	return nil, nil
 }
 
-func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
 	options := broker.NewSubscribeOptions(opts...)
 
 	if options.Group == "" {
@@ -311,54 +297,47 @@ func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Ha
 		options.Group = uid
 	}
 
-	kaddrs := k.opts.Addrs
+	commitInterval := DefaultCommitInterval
-
-	// shuffle addrs
-	var rng mrand.Rand
-	rng.Shuffle(len(kaddrs), func(i, j int) {
-		kaddrs[i], kaddrs[j] = kaddrs[j], kaddrs[i]
-	})
-
-	td := DefaultCommitInterval
 	if k.opts.Context != nil {
 		if v, ok := k.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
-			td = v
+			commitInterval = v
 		}
 	}
 
 	sub := &subscriber{
 		topic:     topic,
-		done:      make(chan struct{}),
 		opts:      options,
 		handler:   handler,
 		kopts:     k.opts,
-		consumers: make(map[string]map[int32]worker),
+		consumers: make(map[tp]*consumer),
+		done:      make(chan struct{}),
 	}
 
 	kopts := append(k.kopts,
-		kgo.SeedBrokers(kaddrs...),
 		kgo.ConsumerGroup(options.Group),
 		kgo.ConsumeTopics(topic),
 		kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
 		kgo.FetchMaxWait(1*time.Second),
-		// kgo.KeepControlRecords(),
+		kgo.AutoCommitInterval(commitInterval),
-		kgo.Balancers(kgo.CooperativeStickyBalancer(), kgo.StickyBalancer()),
-		kgo.FetchIsolationLevel(kgo.ReadUncommitted()),
-		kgo.WithHooks(&metrics{meter: k.opts.Meter}),
-		kgo.AutoCommitMarks(),
-		kgo.AutoCommitInterval(td),
 		kgo.OnPartitionsAssigned(sub.assigned),
 		kgo.OnPartitionsRevoked(sub.revoked),
-		kgo.OnPartitionsLost(sub.revoked),
+		kgo.OnPartitionsLost(sub.lost),
+		kgo.AutoCommitMarks(),
 	)
 
-	reader, err := kgo.NewClient(kopts...)
+	if options.Context != nil {
+		if v, ok := options.Context.Value(optionsKey{}).([]kgo.Opt); ok && len(v) > 0 {
+			kopts = append(kopts, v...)
+		}
+	}
+
+	c, err := k.connect(ctx, kopts...)
 	if err != nil {
 		return nil, err
 	}
 
-	sub.reader = reader
+	sub.c = c
-	go sub.run(ctx)
+	go sub.poll(ctx)
 
 	k.Lock()
 	k.subs = append(k.subs, sub)
@@ -366,42 +345,31 @@ func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Ha
 	return sub, nil
 }
 
-func (k *kBroker) String() string {
+func (k *Broker) String() string {
 	return "kgo"
 }
 
-func NewBroker(opts ...broker.Option) broker.Broker {
+func NewBroker(opts ...broker.Option) *Broker {
 	options := broker.NewOptions(opts...)
+
+	kaddrs := options.Addrs
+	// shuffle addrs
+	var rng mrand.Rand
+	rng.Shuffle(len(kaddrs), func(i, j int) {
+		kaddrs[i], kaddrs[j] = kaddrs[j], kaddrs[i]
+	})
 	kopts := []kgo.Opt{
+		kgo.DialTimeout(3 * time.Second),
 		kgo.DisableIdempotentWrite(),
 		kgo.ProducerBatchCompression(kgo.NoCompression()),
 		kgo.WithLogger(&mlogger{l: options.Logger, ctx: options.Context}),
-		kgo.RetryBackoffFn(
+		// kgo.WithLogger(kgo.BasicLogger(os.Stderr, kgo.LogLevelDebug, func() string { return time.Now().Format(time.StampMilli) })),
-			func() func(int) time.Duration {
+		kgo.WithHooks(&metrics{meter: options.Meter}),
-				var rng mrand.Rand
+		kgo.SeedBrokers(kaddrs...),
-				return func(fails int) time.Duration {
+		kgo.RetryBackoffFn(DefaultRetryBackoffFn),
-					const (
+		kgo.BlockRebalanceOnPoll(),
-						min = 250 * time.Millisecond
+		kgo.Balancers(kgo.CooperativeStickyBalancer()),
-						max = 2 * time.Second
+		kgo.FetchIsolationLevel(kgo.ReadUncommitted()),
-					)
-					if fails <= 0 {
-						return min
-					}
-					if fails > 10 {
-						return max
-					}
-
-					backoff := min * time.Duration(1<<(fails-1))
-					jitter := 0.8 + 0.4*rng.Float64()
-					backoff = time.Duration(float64(backoff) * jitter)
-
-					if backoff > max {
-						return max
-					}
-					return backoff
-				}
-			}(),
-		),
 	}
 
 	if options.Context != nil {
@@ -410,7 +378,7 @@ func NewBroker(opts ...broker.Option) broker.Broker {
 		}
 	}
 
-	return &kBroker{
+	return &Broker{
 		opts:  options,
 		kopts: kopts,
 	}

kgo_test.go

@@ -10,12 +10,10 @@ import (
 	"time"
 
 	kg "github.com/twmb/franz-go/pkg/kgo"
-	jsoncodec "github.com/unistack-org/micro-codec-json/v3"
+	kgo "go.unistack.org/micro-broker-kgo/v4"
-	"github.com/unistack-org/micro/v3/broker"
+	"go.unistack.org/micro/v4/broker"
-	"github.com/unistack-org/micro/v3/logger"
+	"go.unistack.org/micro/v4/logger"
-	"github.com/unistack-org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
-
-	kgo "github.com/unistack-org/micro-broker-kgo/v3"
 )
 
 var (
@@ -30,6 +28,23 @@ var bm = &broker.Message{
 	Body:   []byte(`"body"`),
 }
 
+func TestConnect(t *testing.T) {
+	var addrs []string
+	ctx := context.TODO()
+	b := kgo.NewBroker(
+		broker.Addrs(addrs...),
+		kgo.CommitInterval(5*time.Second),
+		kgo.Options(kg.ClientID("test"), kg.FetchMaxBytes(10*1024*1024)),
+	)
+	if err := b.Init(); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := b.Connect(ctx); err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestPubSub(t *testing.T) {
 	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
 		t.Skip()
@@ -48,7 +63,6 @@ func TestPubSub(t *testing.T) {
 	}
 
 	b := kgo.NewBroker(
-		broker.Codec(jsoncodec.NewCodec()),
 		broker.Addrs(addrs...),
 		kgo.CommitInterval(5*time.Second),
 		kgo.Options(kg.ClientID("test"), kg.FetchMaxBytes(10*1024*1024)),

logger.go

@@ -0,0 +1,55 @@
+package kgo
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/twmb/franz-go/pkg/kgo"
+	"go.unistack.org/micro/v4/logger"
+)
+
+type mlogger struct {
+	l   logger.Logger
+	ctx context.Context
+}
+
+func (l *mlogger) Log(lvl kgo.LogLevel, msg string, args ...interface{}) {
+	var mlvl logger.Level
+	switch lvl {
+	case kgo.LogLevelNone:
+		return
+	case kgo.LogLevelError:
+		mlvl = logger.ErrorLevel
+	case kgo.LogLevelWarn:
+		mlvl = logger.WarnLevel
+	case kgo.LogLevelInfo:
+		mlvl = logger.InfoLevel
+	case kgo.LogLevelDebug:
+		mlvl = logger.DebugLevel
+	default:
+		return
+	}
+	if len(args) > 0 {
+		fields := make(map[string]interface{}, int(len(args)/2))
+		for i := 0; i <= len(args)/2; i += 2 {
+			fields[fmt.Sprintf("%v", args[i])] = args[i+1]
+		}
+		l.l.Fields(fields).Log(l.ctx, mlvl, msg)
+	} else {
+		l.l.Log(l.ctx, mlvl, msg)
+	}
+}
+
+func (l *mlogger) Level() kgo.LogLevel {
+	switch l.l.Options().Level {
+	case logger.ErrorLevel:
+		return kgo.LogLevelError
+	case logger.WarnLevel:
+		return kgo.LogLevelWarn
+	case logger.InfoLevel:
+		return kgo.LogLevelInfo
+	case logger.DebugLevel, logger.TraceLevel:
+		return kgo.LogLevelDebug
+	}
+	return kgo.LogLevelNone
+}

metrics.go

@@ -6,9 +6,44 @@ import (
 	"time"
 
 	"github.com/twmb/franz-go/pkg/kgo"
-	"github.com/unistack-org/micro/v3/meter"
+	"go.unistack.org/micro/v4/meter"
 )
 
+/*
+	func NewServerSubscriberWrapper(opts ...Option) server.SubscriberWrapper {
+		handler := &wrapper{
+			opts: NewOptions(opts...),
+		}
+		return handler.SubscriberFunc
+	}
+
+	func (w *wrapper) SubscriberFunc(fn server.SubscriberFunc) server.SubscriberFunc {
+		return func(ctx context.Context, msg server.Message) error {
+			endpoint := msg.Topic()
+
+			labels := make([]string, 0, 4)
+			labels = append(labels, labelEndpoint, endpoint)
+
+			w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Inc()
+			ts := time.Now()
+			err := fn(ctx, msg)
+			te := time.Since(ts)
+			w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Dec()
+
+			w.opts.Meter.Summary(SubscribeMessageLatencyMicroseconds, labels...).Update(te.Seconds())
+			w.opts.Meter.Histogram(SubscribeMessageDurationSeconds, labels...).Update(te.Seconds())
+
+			if err == nil {
+				labels = append(labels, labelStatus, labelSuccess)
+			} else {
+				labels = append(labels, labelStatus, labelFailure)
+			}
+			w.opts.Meter.Counter(SubscribeMessageTotal, labels...).Inc()
+
+			return err
+		}
+	}
+*/
 type metrics struct {
 	meter meter.Meter
 }

options.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	kgo "github.com/twmb/franz-go/pkg/kgo"
+	"github.com/twmb/franz-go/pkg/kgo"
-	"github.com/unistack-org/micro/v3/broker"
+	"go.unistack.org/micro/v4/broker"
-	"github.com/unistack-org/micro/v3/client"
+	"go.unistack.org/micro/v4/client"
 )
 
 // DefaultCommitInterval specifies how fast send commit offsets to kafka
@@ -48,6 +48,21 @@ func Options(opts ...kgo.Opt) broker.Option {
 	}
 }
 
+// SubscribeOptions pass additional options to broker in Subscribe
+func SubscribeOptions(opts ...kgo.Opt) broker.SubscribeOption {
+	return func(o *broker.SubscribeOptions) {
+		if o.Context == nil {
+			o.Context = context.Background()
+		}
+		options, ok := o.Context.Value(optionsKey{}).([]kgo.Opt)
+		if !ok {
+			options = make([]kgo.Opt, 0, len(opts))
+		}
+		options = append(options, opts...)
+		o.Context = context.WithValue(o.Context, optionsKey{}, options)
+	}
+}
+
 type commitIntervalKey struct{}
 
 // CommitInterval specifies interval to send commits
@@ -55,11 +70,23 @@ func CommitInterval(td time.Duration) broker.Option {
 	return broker.SetOption(commitIntervalKey{}, td)
 }
 
-var DefaultSubscribeMaxInflight = 1000
+var DefaultSubscribeMaxInflight = 10
 
 type subscribeMaxInflightKey struct{}
 
-// SubscribeMaxInFlight specifies interval to send commits
+// SubscribeMaxInFlight max queued messages
 func SubscribeMaxInFlight(n int) broker.SubscribeOption {
 	return broker.SetSubscribeOption(subscribeMaxInflightKey{}, n)
 }
+
+type publishPromiseKey struct{}
+
+// PublishPromise set the kafka promise func for Produce
+func PublishPromise(fn func(*kgo.Record, error)) broker.PublishOption {
+	return broker.SetPublishOption(publishPromiseKey{}, fn)
+}
+
+// ClientPublishKey set the kafka message key (client option)
+func ClientPublishPromise(fn func(*kgo.Record, error)) client.PublishOption {
+	return client.SetPublishOption(publishPromiseKey{}, fn)
+}

subscriber.go

@@ -0,0 +1,250 @@
+package kgo
+
+import (
+	"context"
+	"sync"
+	"time"
+
+	"github.com/twmb/franz-go/pkg/kgo"
+	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/metadata"
+)
+
+type tp struct {
+	t string
+	p int32
+}
+
+type consumer struct {
+	c         *kgo.Client
+	topic     string
+	partition int32
+	opts      broker.SubscribeOptions
+	kopts     broker.Options
+	handler   broker.Handler
+	quit      chan struct{}
+	done      chan struct{}
+	recs      chan kgo.FetchTopicPartition
+}
+
+type subscriber struct {
+	c         *kgo.Client
+	topic     string
+	opts      broker.SubscribeOptions
+	kopts     broker.Options
+	handler   broker.Handler
+	closed    bool
+	done      chan struct{}
+	consumers map[tp]*consumer
+	sync.RWMutex
+}
+
+func (s *subscriber) Options() broker.SubscribeOptions {
+	return s.opts
+}
+
+func (s *subscriber) Topic() string {
+	return s.topic
+}
+
+func (s *subscriber) Unsubscribe(ctx context.Context) error {
+	if s.closed {
+		return nil
+	}
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	default:
+		close(s.done)
+		s.closed = true
+	}
+	return nil
+}
+
+func (s *subscriber) poll(ctx context.Context) {
+	maxInflight := DefaultSubscribeMaxInflight
+	if s.opts.Context != nil {
+		if n, ok := s.opts.Context.Value(subscribeMaxInflightKey{}).(int); n > 0 && ok {
+			maxInflight = n
+		}
+	}
+	for {
+		select {
+		case <-ctx.Done():
+			s.c.Close()
+			return
+		case <-s.done:
+			s.c.Close()
+			return
+		default:
+			fetches := s.c.PollRecords(ctx, maxInflight)
+			if fetches.IsClientClosed() {
+				s.kopts.Logger.Errorf(ctx, "[kgo] client closed")
+				s.closed = true
+				return
+			}
+			fetches.EachError(func(t string, p int32, err error) {
+				s.kopts.Logger.Fatalf(ctx, "[kgo] fetch topic %s partition %d err: %v", t, p, err)
+			})
+
+			fetches.EachPartition(func(p kgo.FetchTopicPartition) {
+				tp := tp{p.Topic, p.Partition}
+				s.consumers[tp].recs <- p
+			})
+			s.c.AllowRebalance()
+		}
+	}
+}
+
+func (s *subscriber) killConsumers(ctx context.Context, lost map[string][]int32) {
+	var wg sync.WaitGroup
+	defer wg.Wait()
+
+	for topic, partitions := range lost {
+		for _, partition := range partitions {
+			tp := tp{topic, partition}
+			pc := s.consumers[tp]
+			delete(s.consumers, tp)
+			close(pc.quit)
+			s.kopts.Logger.Debugf(ctx, "[kgo] waiting for work to finish topic %s partition %d", topic, partition)
+			wg.Add(1)
+			go func() { <-pc.done; wg.Done() }()
+		}
+	}
+}
+
+func (s *subscriber) lost(ctx context.Context, _ *kgo.Client, lost map[string][]int32) {
+	s.kopts.Logger.Debugf(ctx, "[kgo] lost %#+v", lost)
+	s.killConsumers(ctx, lost)
+}
+
+func (s *subscriber) revoked(ctx context.Context, c *kgo.Client, revoked map[string][]int32) {
+	s.kopts.Logger.Debugf(ctx, "[kgo] revoked %#+v", revoked)
+	s.killConsumers(ctx, revoked)
+	if err := c.CommitMarkedOffsets(ctx); err != nil {
+		s.kopts.Logger.Errorf(ctx, "[kgo] revoked CommitMarkedOffsets err: %v", err)
+	}
+}
+
+func (s *subscriber) assigned(_ context.Context, c *kgo.Client, assigned map[string][]int32) {
+	for topic, partitions := range assigned {
+		for _, partition := range partitions {
+			pc := &consumer{
+				c:         c,
+				topic:     topic,
+				partition: partition,
+
+				quit:    make(chan struct{}),
+				done:    make(chan struct{}),
+				recs:    make(chan kgo.FetchTopicPartition, 4),
+				handler: s.handler,
+				kopts:   s.kopts,
+				opts:    s.opts,
+			}
+			s.consumers[tp{topic, partition}] = pc
+			go pc.consume()
+		}
+	}
+}
+
+func (pc *consumer) consume() {
+	defer close(pc.done)
+	pc.kopts.Logger.Debugf(pc.kopts.Context, "starting, topic %s partition %d", pc.topic, pc.partition)
+	defer pc.kopts.Logger.Debugf(pc.kopts.Context, "killing, topic %s partition %d", pc.topic, pc.partition)
+
+	eh := pc.kopts.ErrorHandler
+	if pc.opts.ErrorHandler != nil {
+		eh = pc.opts.ErrorHandler
+	}
+
+	for {
+		select {
+		case <-pc.quit:
+			return
+		case p := <-pc.recs:
+			for _, record := range p.Records {
+				ts := time.Now()
+				pc.kopts.Meter.Counter(broker.SubscribeMessageInflight, "endpoint", record.Topic).Inc()
+				p := eventPool.Get().(*event)
+				p.msg.Header = nil
+				p.msg.Body = nil
+				p.topic = record.Topic
+				p.err = nil
+				p.ack = false
+				if pc.kopts.Codec.String() == "noop" {
+					p.msg.Header = metadata.New(len(record.Headers))
+					for _, hdr := range record.Headers {
+						p.msg.Header.Set(hdr.Key, string(hdr.Value))
+					}
+					p.msg.Body = record.Value
+				} else if pc.opts.BodyOnly {
+					p.msg.Body = record.Value
+				} else {
+					if err := pc.kopts.Codec.Unmarshal(record.Value, p.msg); err != nil {
+						pc.kopts.Meter.Counter(broker.SubscribeMessageTotal, "endpoint", record.Topic, "status", "failure").Inc()
+						p.err = err
+						p.msg.Body = record.Value
+						if eh != nil {
+							_ = eh(p)
+							pc.kopts.Meter.Counter(broker.SubscribeMessageInflight, "endpoint", record.Topic).Dec()
+							if p.ack {
+								pc.c.MarkCommitRecords(record)
+							} else {
+								eventPool.Put(p)
+								pc.kopts.Logger.Fatalf(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
+								return
+							}
+							eventPool.Put(p)
+							te := time.Since(ts)
+							pc.kopts.Meter.Summary(broker.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic).Update(te.Seconds())
+							pc.kopts.Meter.Histogram(broker.SubscribeMessageDurationSeconds, "endpoint", record.Topic).Update(te.Seconds())
+							continue
+						} else {
+							if pc.kopts.Logger.V(logger.ErrorLevel) {
+								pc.kopts.Logger.Errorf(pc.kopts.Context, "[kgo]: failed to unmarshal: %v", err)
+							}
+						}
+						te := time.Since(ts)
+						pc.kopts.Meter.Counter(broker.SubscribeMessageInflight, "endpoint", record.Topic).Dec()
+						pc.kopts.Meter.Summary(broker.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic).Update(te.Seconds())
+						pc.kopts.Meter.Histogram(broker.SubscribeMessageDurationSeconds, "endpoint", record.Topic).Update(te.Seconds())
+						eventPool.Put(p)
+						pc.kopts.Logger.Fatalf(pc.kopts.Context, "[kgo] Unmarshal err not handled wtf?")
+						return
+					}
+				}
+				err := pc.handler(p)
+				if err == nil {
+					pc.kopts.Meter.Counter(broker.SubscribeMessageTotal, "endpoint", record.Topic, "status", "success").Inc()
+				} else {
+					pc.kopts.Meter.Counter(broker.SubscribeMessageTotal, "endpoint", record.Topic, "status", "failure").Inc()
+				}
+				pc.kopts.Meter.Counter(broker.SubscribeMessageInflight, "endpoint", record.Topic).Dec()
+				if err == nil && pc.opts.AutoAck {
+					p.ack = true
+				} else if err != nil {
+					p.err = err
+					if eh != nil {
+						_ = eh(p)
+					} else {
+						if pc.kopts.Logger.V(logger.ErrorLevel) {
+							pc.kopts.Logger.Errorf(pc.kopts.Context, "[kgo]: subscriber error: %v", err)
+						}
+					}
+				}
+				te := time.Since(ts)
+				pc.kopts.Meter.Summary(broker.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic).Update(te.Seconds())
+				pc.kopts.Meter.Histogram(broker.SubscribeMessageDurationSeconds, "endpoint", record.Topic).Update(te.Seconds())
+				if p.ack {
+					eventPool.Put(p)
+					pc.c.MarkCommitRecords(record)
+				} else {
+					eventPool.Put(p)
+					pc.kopts.Logger.Fatalf(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
+					return
+				}
+			}
+		}
+	}
+}

util.go

@@ -1,213 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"errors"
-	"sync"
-
-	kgo "github.com/twmb/franz-go/pkg/kgo"
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/logger"
-)
-
-var ErrLostMessage = errors.New("message not marked for offsets commit and will be lost in next iteration")
-
-var pPool = sync.Pool{
-	New: func() interface{} {
-		return &publication{msg: &broker.Message{}}
-	},
-}
-
-type worker struct {
-	done         chan struct{}
-	recs         chan []*kgo.Record
-	cherr        chan error
-	handler      broker.Handler
-	batchHandler broker.BatchHandler
-	opts         broker.SubscribeOptions
-	kopts        broker.Options
-	tpmap        map[string][]int32
-	maxInflight  int
-	reader       *kgo.Client
-	ctx          context.Context
-}
-
-func (s *subscriber) run(ctx context.Context) {
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-s.kopts.Context.Done():
-			return
-		default:
-			fetches := s.reader.PollFetches(ctx)
-			if fetches.IsClientClosed() {
-				// TODO: fatal ?
-				return
-			}
-			if len(fetches.Errors()) > 0 {
-				for _, err := range fetches.Errors() {
-					s.kopts.Logger.Fatalf(ctx, "fetch err topic %s partition %d: %v", err.Topic, err.Partition, err.Err)
-				}
-				// TODO: fatal ?
-				return
-			}
-
-			fetches.EachPartition(func(p kgo.FetchTopicPartition) {
-				s.Lock()
-				consumers := s.consumers[p.Topic]
-				s.Unlock()
-				if consumers == nil {
-					return
-				}
-				w, ok := consumers[p.Partition]
-				if !ok {
-					return
-				}
-				select {
-				case err := <-w.cherr:
-					s.kopts.Logger.Fatalf(ctx, "handle err: %v", err)
-					return
-				case w.recs <- p.Records:
-				case <-w.done:
-				}
-			})
-		}
-	}
-}
-
-func (s *subscriber) assigned(ctx context.Context, _ *kgo.Client, assigned map[string][]int32) {
-	maxInflight := DefaultSubscribeMaxInflight
-
-	if s.opts.Context != nil {
-		if n, ok := s.opts.Context.Value(subscribeMaxInflightKey{}).(int); n > 0 && ok {
-			maxInflight = n
-		}
-	}
-
-	s.Lock()
-	for topic, partitions := range assigned {
-		if s.consumers[topic] == nil {
-			s.consumers[topic] = make(map[int32]worker)
-		}
-		for _, partition := range partitions {
-			w := worker{
-				done:         make(chan struct{}),
-				recs:         make(chan []*kgo.Record),
-				cherr:        make(chan error),
-				kopts:        s.kopts,
-				opts:         s.opts,
-				ctx:          ctx,
-				tpmap:        map[string][]int32{topic: []int32{partition}},
-				reader:       s.reader,
-				handler:      s.handler,
-				batchHandler: s.batchhandler,
-				maxInflight:  maxInflight,
-			}
-			s.consumers[topic][partition] = w
-			go w.handle()
-		}
-	}
-	s.Unlock()
-}
-
-func (s *subscriber) revoked(_ context.Context, _ *kgo.Client, revoked map[string][]int32) {
-	s.Lock()
-	for topic, partitions := range revoked {
-		ptopics := s.consumers[topic]
-		for _, partition := range partitions {
-			w := ptopics[partition]
-			delete(ptopics, partition)
-			if len(ptopics) == 0 {
-				delete(s.consumers, topic)
-			}
-			close(w.done)
-		}
-	}
-	s.Unlock()
-}
-
-func (w *worker) handle() {
-	var err error
-
-	eh := w.kopts.ErrorHandler
-	if w.opts.ErrorHandler != nil {
-		eh = w.opts.ErrorHandler
-	}
-
-	paused := false
-	for {
-		select {
-		case <-w.ctx.Done():
-			w.cherr <- w.ctx.Err()
-			return
-		case <-w.done:
-			return
-		case recs := <-w.recs:
-			if len(recs) >= w.maxInflight {
-				paused = true
-				w.reader.PauseFetchPartitions(w.tpmap)
-			}
-			for _, record := range recs {
-				p := pPool.Get().(*publication)
-				p.msg.Header = nil
-				p.msg.Body = nil
-				p.topic = record.Topic
-				p.err = nil
-				p.ack = false
-				if w.opts.BodyOnly {
-					p.msg.Body = record.Value
-				} else {
-					if err := w.kopts.Codec.Unmarshal(record.Value, p.msg); err != nil {
-						p.err = err
-						p.msg.Body = record.Value
-						if eh != nil {
-							_ = eh(p)
-							if p.ack {
-								w.reader.MarkCommitRecords(record)
-							} else {
-								w.cherr <- ErrLostMessage
-								pPool.Put(p)
-								return
-							}
-							pPool.Put(p)
-							continue
-						} else {
-							if w.kopts.Logger.V(logger.ErrorLevel) {
-								w.kopts.Logger.Errorf(w.kopts.Context, "[kgo]: failed to unmarshal: %v", err)
-							}
-						}
-						pPool.Put(p)
-						w.cherr <- err
-						return
-					}
-				}
-				err = w.handler(p)
-				if err == nil && w.opts.AutoAck {
-					p.ack = true
-				} else if err != nil {
-					p.err = err
-					if eh != nil {
-						_ = eh(p)
-					} else {
-						if w.kopts.Logger.V(logger.ErrorLevel) {
-							w.kopts.Logger.Errorf(w.kopts.Context, "[kgo]: subscriber error: %v", err)
-						}
-					}
-				}
-				if p.ack {
-					pPool.Put(p)
-					w.reader.MarkCommitRecords(record)
-				} else {
-					pPool.Put(p)
-					w.cherr <- ErrLostMessage
-					return
-				}
-			}
-			if paused {
-				paused = false
-				w.reader.ResumeFetchPartitions(w.tpmap)
-			}
-		}
-	}
-}