Merge pull request #47 from unistack-org/dependabot/go_modules/github.com/twmb/franz-go-1.4.0

Bump github.com/twmb/franz-go from 1.3.4 to 1.4.0
2022-03-05 19:29:48 +03:00 · 2022-03-05 16:08:42 +00:00 · 2022-03-05 19:07:55 +03:00 · 2022-03-01 00:24:55 +03:00 · 2022-02-28 11:20:47 +00:00 · 2022-02-25 09:56:38 +03:00
14 changed files with 689 additions and 562 deletions
--- a/.github/workflows/autoapprove.yml
+++ b/.github/workflows/autoapprove.yml
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: approve
-        uses: hmarr/auto-approve-action@v3
+        uses: hmarr/auto-approve-action@v2
        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
        id: approve
        with:
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,13 +10,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
      with:
-        go-version: 1.17
+        go-version: 1.16
    - name: checkout
      uses: actions/checkout@v3
    - name: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      with:
        path: ~/go/pkg/mod
        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -34,7 +34,7 @@ jobs:
      - name: checkout
        uses: actions/checkout@v3
      - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        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
@@ -45,12 +45,12 @@ jobs:
    - name: checkout
      uses: actions/checkout@v3
    - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
      with:
-        go-version: 1.17
+        go-version: 1.16
    # Initializes the CodeQL tools for scanning.
    - name: init
-      uses: github/codeql-action/init@v2
+      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.
@@ -61,7 +61,7 @@ jobs:
    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v1

    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@@ -75,4 +75,4 @@ jobs:
    #   make release

    - name: analyze
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@@ -15,7 +15,7 @@ jobs:
    steps:
      - name: metadata
        id: metadata
-        uses: dependabot/fetch-metadata@v1.3.6
+        uses: dependabot/fetch-metadata@v1.3.0
        with:
          github-token: "${{ secrets.TOKEN }}"
      - name: merge
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -10,13 +10,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
      with:
-        go-version: 1.17
+        go-version: 1.16
    - name: checkout
      uses: actions/checkout@v3
    - name: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
      with:
        path: ~/go/pkg/mod
        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -34,7 +34,7 @@ jobs:
      - name: checkout
        uses: actions/checkout@v3
      - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        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/event.go
+++ b/event.go
@@ -1,42 +0,0 @@
-package kgo
-
-import (
-	"sync"
-
-	"go.unistack.org/micro/v3/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{}}
-	},
-}
--- a/go.mod
+++ b/go.mod
@@ -1,22 +1,9 @@
 module go.unistack.org/micro-broker-kgo/v3

-go 1.17
+go 1.16

 require (
-	github.com/twmb/franz-go v1.12.1
-	github.com/twmb/franz-go/pkg/kmsg v1.4.0
-	go.unistack.org/micro/v3 v3.10.38
-)
-
-require (
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
-	github.com/klauspost/compress v1.16.0 // indirect
-	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
-	github.com/pierrec/lz4/v4 v4.1.17 // indirect
-	golang.org/x/sys v0.17.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
-	google.golang.org/grpc v1.61.1 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	github.com/twmb/franz-go v1.4.0
+	github.com/twmb/franz-go/pkg/kmsg v0.0.0-20220301191019-c3fc8e03e6f4
+	go.unistack.org/micro/v3 v3.8.21
 )
--- a/go.sum
+++ b/go.sum
@@ -1,45 +1,184 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/gnostic v0.6.6/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
+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/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
-github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4=
-github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/uuid v1.1.2/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/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+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.14.4 h1:eijASRJcobkVtSt81Olfh7JX43osYLwy5krOJo6YEu4=
+github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
-github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE=
+github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/twmb/franz-go v1.12.1 h1:8lWT8q0spL40Nfw6eonJ8OoPGLvF9arvadRRmcSiu9Y=
-github.com/twmb/franz-go v1.12.1/go.mod h1:Ofc5tSSUJKLmpRNUYSejUsAZKYAHDHywTS322KWdChQ=
-github.com/twmb/franz-go/pkg/kmsg v1.4.0 h1:tbp9hxU6m8qZhQTlpGiaIJOm4BXix5lsuEZ7K00dF0s=
-github.com/twmb/franz-go/pkg/kmsg v1.4.0/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
-go.unistack.org/micro/v3 v3.10.23 h1:4BE7NwwyJbCWOfzjzztamBxJSgRHHW1uQtMGNDLHG3s=
-go.unistack.org/micro/v3 v3.10.38 h1:g87FalXGCFcW6oUT8PtBIFHQYKAl8Ro69/dXIb3AoCo=
-go.unistack.org/micro/v3 v3.10.38/go.mod h1:eUgtvbtiiz6te93m0ZdmoecbitWwjdBmmr84srmEIKA=
-golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/twmb/franz-go v1.4.0 h1:AH/wEqRD4a8EGQkakQjR+5GFNR515BfJVX2xeUCeSzw=
+github.com/twmb/franz-go v1.4.0/go.mod h1:FfwAqMS5PQ6P7DLY539GrvmT6NorjIXU/uFCLoEDybQ=
+github.com/twmb/franz-go/pkg/kmsg v0.0.0-20220301191019-c3fc8e03e6f4 h1:M1kTQy+dMZWjXW2Ps1XBPwhbmV3xjR8XAtQ4Vlwx8gU=
+github.com/twmb/franz-go/pkg/kmsg v0.0.0-20220301191019-c3fc8e03e6f4/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/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.unistack.org/micro-proto/v3 v3.2.1 h1:z7+V97LcAwMbBiYStmf8b6fFk2UPJTzni+rxNqk4NrI=
+go.unistack.org/micro-proto/v3 v3.2.1/go.mod h1:ZltVWNECD5yK+40+OCONzGw4OtmSdTpVi8/KFgo9dqM=
+go.unistack.org/micro/v3 v3.8.21 h1:8vYxtIlPnCBZ888BrQSP6+b0CFQcn5FiaqDpI5XqorQ=
+go.unistack.org/micro/v3 v3.8.21/go.mod h1:aBOCQ6SkAwKMRI7Q1CIsQA2S88ibyJfweJZlT1M2qpE=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-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-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+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.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk=
-google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY=
-google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+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.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+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.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/kgo.go
+++ b/kgo.go
@@ -3,57 +3,26 @@ package kgo // import "go.unistack.org/micro-broker-kgo/v3"

 import (
 	"context"
-	"errors"
 	"fmt"
-	"math/rand"
 	"strings"
 	"sync"
 	"time"

-	"github.com/twmb/franz-go/pkg/kgo"
+	"github.com/twmb/franz-go/pkg/kerr"
+	kgo "github.com/twmb/franz-go/pkg/kgo"
 	"github.com/twmb/franz-go/pkg/kmsg"
+	"github.com/twmb/franz-go/pkg/kversion"
 	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
-	id "go.unistack.org/micro/v3/util/id"
+	"go.unistack.org/micro/v3/util/id"
 	mrand "go.unistack.org/micro/v3/util/rand"
 )

-var _ broker.Broker = (*Broker)(nil)
+var _ broker.Broker = &kBroker{}

-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
+type kBroker struct {
+	writer    *kgo.Client // used only to push messages
 	kopts     []kgo.Opt
 	connected bool
 	init      bool
@@ -62,34 +31,79 @@ type Broker struct {
 	subs []*subscriber
 }

-func (k *Broker) Address() string {
+type subscriber struct {
+	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 *Broker) Name() string {
+func (k *kBroker) Name() string {
 	return k.opts.Name
 }

-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 {
+func (k *kBroker) Connect(ctx context.Context) error {
 	k.RLock()
 	if k.connected {
 		k.RUnlock()
@@ -102,20 +116,51 @@ func (k *Broker) Connect(ctx context.Context) error {
 		nctx = ctx
 	}

-	c, err := k.connect(nctx, k.kopts...)
-	if err != nil {
-		return err
-	}
+	kaddrs := k.opts.Addrs

-	k.Lock()
-	k.c = c
-	k.connected = true
-	k.Unlock()
+	// shuffle addrs
+	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
+		}
+
+		// Request versions in order to guess Kafka Cluster version
+		versionsReq := kmsg.NewApiVersionsRequest()
+		versionsRes, err := versionsReq.RequestWith(ctx, c)
+		if err != nil {
+			return fmt.Errorf("failed to request api versions: %w", err)
+		}
+		err = kerr.ErrorForCode(versionsRes.ErrorCode)
+		if err != nil {
+			return fmt.Errorf("failed to request api versions. Inner kafka error: %w", err)
+		}
+		versions := kversion.FromApiVersionsResponse(versionsRes)
+
+		if k.opts.Logger.V(logger.InfoLevel) {
+			logger.Infof(ctx, "[kgo] connected to to kafka cluster version %v", versions.VersionGuess())
+		}
+
+		k.Lock()
+		k.connected = true
+		k.writer = c
+		k.Unlock()
+	}

 	return nil
 }

-func (k *Broker) Disconnect(ctx context.Context) error {
+func (k *kBroker) Disconnect(ctx context.Context) error {
 	k.RLock()
 	if !k.connected {
 		k.RUnlock()
@@ -123,39 +168,37 @@ func (k *Broker) 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()
 	default:
 		for _, sub := range k.subs {
-			if sub.closed {
-				continue
-			}
 			if err := sub.Unsubscribe(ctx); err != nil {
 				return err
 			}
 		}
-		if k.c != nil {
-			k.c.CloseAllowingRebalance()
-			// k.c.Close()
-		}
+		k.writer.Close()
 	}

 	k.connected = false
 	return nil
 }

-func (k *Broker) Init(opts ...broker.Option) error {
+func (k *kBroker) 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)
 	}
@@ -179,39 +222,33 @@ func (k *Broker) Init(opts ...broker.Option) error {
 		}
 	}

+	//	kgo.RecordPartitioner(),
+
+	k.init = true
+
 	return nil
 }

-func (k *Broker) Options() broker.Options {
+func (k *kBroker) Options() broker.Options {
 	return k.opts
 }

-func (k *Broker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (k *kBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
 	return k.publish(ctx, msgs, opts...)
 }

-func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
+func (k *kBroker) 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 *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (k *kBroker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
 	k.RLock()
-	ok := k.connected
-	k.RUnlock()
-
-	if !ok {
-		k.Lock()
-		c, err := k.connect(ctx, k.kopts...)
-		if err != nil {
-			k.Unlock()
-			return err
-		}
-		k.c = c
-		k.connected = true
-		k.Unlock()
+	if !k.connected {
+		k.RUnlock()
+		return broker.ErrNotConnected
 	}
-
+	k.RUnlock()
 	options := broker.NewPublishOptions(opts...)
 	records := make([]*kgo.Record, 0, len(msgs))
 	var errs []string
@@ -225,9 +262,11 @@ func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...br
 	}

 	for _, msg := range msgs {
-		rec := &kgo.Record{Context: ctx, Key: key}
+		rec := &kgo.Record{Key: key}
 		rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
-		if options.BodyOnly || k.opts.Codec.String() == "noop" {
+		if options.BodyOnly {
+			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)})
@@ -241,7 +280,7 @@ func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...br
 		records = append(records, rec)
 	}

-	results := k.c.ProduceSync(ctx, records...)
+	results := k.writer.ProduceSync(ctx, records...)
 	for _, result := range results {
 		if result.Err != nil {
 			errs = append(errs, result.Err.Error())
@@ -255,11 +294,53 @@ func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...br
 	return nil
 }

-func (k *Broker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+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
+	}
+	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 *Broker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
 	options := broker.NewSubscribeOptions(opts...)

 	if options.Group == "" {
@@ -270,59 +351,54 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 		options.Group = uid
 	}

-	commitInterval := DefaultCommitInterval
+	kaddrs := k.opts.Addrs
+
+	// 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 {
-			commitInterval = v
+			td = v
 		}
 	}

 	sub := &subscriber{
 		topic:     topic,
+		done:      make(chan struct{}),
 		opts:      options,
 		handler:   handler,
 		kopts:     k.opts,
-		consumers: make(map[tp]*consumer),
-		done:      make(chan struct{}),
+		consumers: make(map[string]map[int32]worker),
 	}

 	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.AutoCommitInterval(commitInterval),
+		// kgo.KeepControlRecords(),
+		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.lost),
-		kgo.AutoCommitMarks(),
+		kgo.OnPartitionsLost(sub.revoked),
 	)

-	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...)
+	reader, err := kgo.NewClient(kopts...)
 	if err != nil {
 		return nil, err
 	}

-	mdreq := kmsg.NewMetadataRequest()
-	mdreq.Topics = []kmsg.MetadataRequestTopic{
-		{Topic: &topic},
-	}
-
-	mdrsp, err := mdreq.RequestWith(ctx, c)
-	if err != nil {
-		return nil, err
-	} else if mdrsp.Topics[0].ErrorCode != 0 {
-		return nil, fmt.Errorf("topic %s not exists or permission error", topic)
-	}
-
-	sub.c = c
-	go sub.poll(ctx)
+	sub.reader = reader
+	go sub.run(ctx)

 	k.Lock()
 	k.subs = append(k.subs, sub)
@@ -330,32 +406,45 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 	return sub, nil
 }

-func (k *Broker) String() string {
+func (k *kBroker) String() string {
 	return "kgo"
 }

-func NewBroker(opts ...broker.Option) *Broker {
-	rand.Seed(time.Now().Unix())
+func NewBroker(opts ...broker.Option) *kBroker {
 	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]
-	})
+	if options.Codec.String() != "noop" {
+		options.Logger.Infof(options.Context, "broker codec not noop, disable plain kafka headers usage")
+	}
 	kopts := []kgo.Opt{
-		kgo.DialTimeout(3 * time.Second),
 		kgo.DisableIdempotentWrite(),
 		kgo.ProducerBatchCompression(kgo.NoCompression()),
 		kgo.WithLogger(&mlogger{l: options.Logger, ctx: options.Context}),
-		// kgo.WithLogger(kgo.BasicLogger(os.Stderr, kgo.LogLevelDebug, func() string { return time.Now().Format(time.StampMilli) })),
-		kgo.WithHooks(&metrics{meter: options.Meter}),
-		kgo.SeedBrokers(kaddrs...),
-		kgo.RetryBackoffFn(DefaultRetryBackoffFn),
-		kgo.BlockRebalanceOnPoll(),
-		kgo.Balancers(kgo.CooperativeStickyBalancer()),
-		kgo.FetchIsolationLevel(kgo.ReadUncommitted()),
+		kgo.RetryBackoffFn(
+			func() func(int) time.Duration {
+				var rng mrand.Rand
+				return func(fails int) time.Duration {
+					const (
+						min = 250 * time.Millisecond
+						max = 2 * time.Second
+					)
+					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 {
@@ -364,7 +453,7 @@ func NewBroker(opts ...broker.Option) *Broker {
 		}
 	}

-	return &Broker{
+	return &kBroker{
 		opts:  options,
 		kopts: kopts,
 	}
--- a/kgo_test.go
+++ b/kgo_test.go
@@ -28,23 +28,6 @@ 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()
--- a/logger.go
+++ b/logger.go
@@ -1,55 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/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([]interface{}, 0, len(args))
-		for i := 0; i <= len(args)/2; i += 2 {
-			fields = append(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
-}
--- a/options.go
+++ b/options.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"time"

-	"github.com/twmb/franz-go/pkg/kgo"
+	kgo "github.com/twmb/franz-go/pkg/kgo"
 	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v3/server"
 )

 // DefaultCommitInterval specifies how fast send commit offsets to kafka
@@ -48,7 +49,7 @@ func Options(opts ...kgo.Opt) broker.Option {
 	}
 }

-// SubscribeOptions pass additional options to broker in Subscribe
+// SubscribeOptions pass additional options to broker
 func SubscribeOptions(opts ...kgo.Opt) broker.SubscribeOption {
 	return func(o *broker.SubscribeOptions) {
 		if o.Context == nil {
@@ -63,6 +64,21 @@ func SubscribeOptions(opts ...kgo.Opt) broker.SubscribeOption {
 	}
 }

+// SubscriberOptions pass additional options to broker
+func SubscriberOptions(opts ...kgo.Opt) server.SubscriberOption {
+	return func(o *server.SubscriberOptions) {
+		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
@@ -70,7 +86,7 @@ func CommitInterval(td time.Duration) broker.Option {
 	return broker.SetOption(commitIntervalKey{}, td)
 }

-var DefaultSubscribeMaxInflight = 10
+var DefaultSubscribeMaxInflight = 1000

 type subscribeMaxInflightKey struct{}

--- a/subscriber.go
+++ b/subscriber.go
@@ -1,234 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"sync"
-
-	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/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:
-		s.c.PauseFetchTopics(s.topic)
-		s.c.CloseAllowingRebalance()
-		kc := make(map[string][]int32)
-		for ctp := range s.consumers {
-			kc[ctp.t] = append(kc[ctp.t], ctp.p)
-		}
-		s.killConsumers(ctx, kc)
-		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.CloseAllowingRebalance()
-			return
-		case <-s.done:
-			return
-		default:
-			fetches := s.c.PollRecords(ctx, maxInflight)
-			if !s.closed && fetches.IsClientClosed() {
-				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 {
-				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 {
-						p.err = err
-						p.msg.Body = record.Value
-						if eh != nil {
-							_ = eh(p)
-							if p.ack {
-								pc.c.MarkCommitRecords(record)
-							} else {
-								eventPool.Put(p)
-								pc.kopts.Logger.Infof(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
-								return
-							}
-							eventPool.Put(p)
-							continue
-						} else {
-							if pc.kopts.Logger.V(logger.ErrorLevel) {
-								pc.kopts.Logger.Errorf(pc.kopts.Context, "[kgo]: failed to unmarshal: %v", err)
-							}
-						}
-						eventPool.Put(p)
-						pc.kopts.Logger.Infof(pc.kopts.Context, "[kgo] Unmarshal err not handled wtf?")
-						return
-					}
-				}
-				err := pc.handler(p)
-				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)
-						}
-					}
-				}
-				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
-				}
-			}
-		}
-	}
-}
--- a/util.go
+++ b/util.go
@@ -0,0 +1,244 @@
+package kgo
+
+import (
+	"context"
+	"errors"
+	"sync"
+
+	kgo "github.com/twmb/franz-go/pkg/kgo"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
+)
+
+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.NewMessage("")}
+	},
+}
+
+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
+					if l := len(record.Headers); l > 0 {
+						if p.msg.Header == nil {
+							p.msg.Header = metadata.New(l)
+						}
+						for _, h := range record.Headers {
+							p.msg.Header.Set(h.Key, string(h.Value))
+						}
+					}
+				} else if w.kopts.Codec.String() == "noop" {
+					p.msg.Body = record.Value
+					p.msg.Header = metadata.New(len(record.Headers))
+					for _, h := range record.Headers {
+						p.msg.Header.Set(h.Key, string(h.Value))
+					}
+				} else {
+					if err := w.kopts.Codec.Unmarshal(record.Value, p.msg); err != nil {
+						p.err = err
+						p.msg.Body = record.Value
+						if l := len(record.Headers); l > 0 {
+							if p.msg.Header == nil {
+								p.msg.Header = metadata.New(l)
+							}
+							for _, h := range record.Headers {
+								p.msg.Header.Set(h.Key, string(h.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
+					}
+					if l := len(record.Headers); l > 0 {
+						if p.msg.Header == nil {
+							p.msg.Header = metadata.New(l)
+						}
+						for _, h := range record.Headers {
+							p.msg.Header.Set(h.Key, string(h.Value))
+						}
+					}
+				}
+				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)
+			}
+		}
+	}
+}
Author	SHA1	Message	Date
Vasiliy Tolstov	141c7fb848	Merge pull request #47 from unistack-org/dependabot/go_modules/github.com/twmb/franz-go-1.4.0 Bump github.com/twmb/franz-go from 1.3.4 to 1.4.0	2022-03-05 19:29:48 +03:00
dependabot[bot]	f347ca4e12	Bump github.com/twmb/franz-go from 1.3.4 to 1.4.0 Bumps [github.com/twmb/franz-go](https://github.com/twmb/franz-go) from 1.3.4 to 1.4.0. - [Release notes](https://github.com/twmb/franz-go/releases) - [Changelog](https://github.com/twmb/franz-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/twmb/franz-go/compare/v1.3.4...v1.4.0) --- updated-dependencies: - dependency-name: github.com/twmb/franz-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-03-05 16:08:42 +00:00
Vasiliy Tolstov	c78bffdb8d	update workflows Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2022-03-05 19:07:55 +03:00
Vasiliy Tolstov	49ba8880f2	Merge pull request #43 from unistack-org/dependabot/github_actions/golangci/golangci-lint-action-3.1.0 Bump golangci/golangci-lint-action from 2 to 3.1.0	2022-03-01 00:24:55 +03:00
dependabot[bot]	bbd840b96e	Bump golangci/golangci-lint-action from 2 to 3.1.0 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 2 to 3.1.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v2...v3.1.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-28 11:20:47 +00:00
Vasiliy Tolstov	1ee739de80	Merge pull request #40 from unistack-org/dependabot/go_modules/github.com/twmb/franz-go-1.3.4 Bump github.com/twmb/franz-go from 1.3.1 to 1.3.4	2022-02-25 09:56:38 +03:00
dependabot[bot]	7f0265b6d1	Bump github.com/twmb/franz-go from 1.3.1 to 1.3.4 Bumps [github.com/twmb/franz-go](https://github.com/twmb/franz-go) from 1.3.1 to 1.3.4. - [Release notes](https://github.com/twmb/franz-go/releases) - [Changelog](https://github.com/twmb/franz-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/twmb/franz-go/compare/v1.3.1...v1.3.4) --- updated-dependencies: - dependency-name: github.com/twmb/franz-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-25 06:44:46 +00:00
Vasiliy Tolstov	4dc19dc63f	Merge pull request #41 from unistack-org/dependabot/github_actions/dependabot/fetch-metadata-1.2.1 Bump dependabot/fetch-metadata from 1.1.1 to 1.2.1	2022-02-25 09:43:55 +03:00
dependabot[bot]	5eb2718cd4	Bump dependabot/fetch-metadata from 1.1.1 to 1.2.1 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.1.1 to 1.2.1. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.1.1...v1.2.1) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-23 11:21:19 +00:00
Vasiliy Tolstov	b4c98e207f	Merge pull request #36 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.21 Bump go.unistack.org/micro/v3 from 3.8.20 to 3.8.21	2022-01-31 14:24:54 +03:00
dependabot[bot]	20652894b3	Bump go.unistack.org/micro/v3 from 3.8.20 to 3.8.21 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.20 to 3.8.21. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.20...v3.8.21) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-31 11:23:03 +00:00
Vasiliy Tolstov	27bb8c50d1	Merge pull request #35 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.20 Bump go.unistack.org/micro/v3 from 3.8.19 to 3.8.20	2022-01-26 14:22:43 +03:00
dependabot[bot]	b90ef8cdf3	Bump go.unistack.org/micro/v3 from 3.8.19 to 3.8.20 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.19 to 3.8.20. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.19...v3.8.20) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-26 11:20:53 +00:00
Vasiliy Tolstov	222370f96c	Merge pull request #34 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.19 Bump go.unistack.org/micro/v3 from 3.8.18 to 3.8.19	2022-01-25 14:19:20 +03:00
dependabot[bot]	1152be720d	Bump go.unistack.org/micro/v3 from 3.8.18 to 3.8.19 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.18 to 3.8.19. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.18...v3.8.19) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-25 11:17:09 +00:00
Vasiliy Tolstov	f0b9665816	Merge pull request #33 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.18 Bump go.unistack.org/micro/v3 from 3.8.16 to 3.8.18	2022-01-24 14:27:56 +03:00
dependabot[bot]	310e9a8ceb	Bump go.unistack.org/micro/v3 from 3.8.16 to 3.8.18 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.16 to 3.8.18. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.16...v3.8.18) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-24 11:25:57 +00:00
Vasiliy Tolstov	cc155511e1	Merge pull request #32 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.16 Bump go.unistack.org/micro/v3 from 3.8.15 to 3.8.16	2022-01-21 14:18:09 +03:00
dependabot[bot]	0a0c592b64	Bump go.unistack.org/micro/v3 from 3.8.15 to 3.8.16 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.15 to 3.8.16. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.15...v3.8.16) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-21 11:16:10 +00:00
Vasiliy Tolstov	372c5c92f0	Merge pull request #31 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.15 Bump go.unistack.org/micro/v3 from 3.8.14 to 3.8.15	2022-01-20 14:27:53 +03:00
dependabot[bot]	2601514578	Bump go.unistack.org/micro/v3 from 3.8.14 to 3.8.15 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.14 to 3.8.15. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.14...v3.8.15) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-20 11:26:00 +00:00
Vasiliy Tolstov	8a1856e814	Merge pull request #29 from unistack-org/dependabot/go_modules/github.com/twmb/franz-go-1.3.1 Bump github.com/twmb/franz-go from 1.2.6 to 1.3.1	2022-01-12 15:30:57 +03:00
dependabot[bot]	08e04cdb70	Bump github.com/twmb/franz-go from 1.2.6 to 1.3.1 Bumps [github.com/twmb/franz-go](https://github.com/twmb/franz-go) from 1.2.6 to 1.3.1. - [Release notes](https://github.com/twmb/franz-go/releases) - [Changelog](https://github.com/twmb/franz-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/twmb/franz-go/compare/v1.2.6...v1.3.1) --- updated-dependencies: - dependency-name: github.com/twmb/franz-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-11 11:29:28 +00:00
Vasiliy Tolstov	7286521472	Merge pull request #30 from unistack-org/dependabot/go_modules/go.unistack.org/micro/v3-3.8.14 Bump go.unistack.org/micro/v3 from 3.8.12 to 3.8.14	2022-01-11 14:28:38 +03:00
dependabot[bot]	b01e2b5563	Bump go.unistack.org/micro/v3 from 3.8.12 to 3.8.14 Bumps [go.unistack.org/micro/v3](https://github.com/unistack-org/micro) from 3.8.12 to 3.8.14. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.8.12...v3.8.14) --- updated-dependencies: - dependency-name: go.unistack.org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-11 11:26:30 +00:00