test notify

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

.gitea/workflows/job_lint.yml

@@ -3,10 +3,10 @@ name: lint
 on:
   pull_request:
     types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
+    branches:
-    paths-ignore:
+    - master
-      - '.github/**'
+    - v3
-      - '.gitea/**'
+    - v4
 
 jobs:
   lint:
@@ -24,6 +24,6 @@ jobs:
     - name: setup deps
       run: go get -v ./...
     - name: run lint
-      uses: golangci/golangci-lint-action@v6
+      uses: https://github.com/golangci/golangci-lint-action@v6
       with:
         version: 'latest'

.gitea/workflows/job_notify.yml

@@ -0,0 +1,17 @@
+name: notify
+on: [push]
+jobs:
+  notify:
+    name: notify
+    runs-on: ubuntu-latest
+    steps:
+      - name: send
+        uses: appleboy/telegram-action@master
+        with:
+          to: ${{ secrets.TELEGRAM_TO }}
+          token: ${{ secrets.TELEGRAM_TOKEN }}
+          message: |
+            New commit by ${{ github.actor }}:
+            Commit: ${{ github.event.commits[0].message }}
+            Repository: ${{ github.repository }}
+            Changes: https://git.unistack.org/${{ github.repository }}/commit/${{github.sha}}

.gitea/workflows/job_test.yml

@@ -3,12 +3,15 @@ name: test
 on:
   pull_request:
     types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
+    branches:
+    - master
+    - v3
+    - v4
   push:
-    branches: [ master, v3, v4 ]
+    branches:
-    paths-ignore:
+    - master
-      - '.github/**'
+    - v3
-      - '.gitea/**'
+    - v4
 
 jobs:
   test:

.gitea/workflows/job_tests.yml

@@ -3,12 +3,15 @@ name: test
 on:
   pull_request:
     types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
+    branches:
+    - master
+    - v3
+    - v4
   push:
-    branches: [ master, v3, v4 ]
+    branches:
-    paths-ignore:
+    - master
-      - '.github/**'
+    - v3
-      - '.gitea/**'
+    - v4
 
 jobs:
   test:
@@ -32,19 +35,19 @@ jobs:
         go-version: 'stable'
     - name: setup go work
       env:
-        GOWORK: ${{ github.workspace }}/go.work
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
       run: |
         go work init
         go work use .
         go work use micro-tests        
     - name: setup deps
       env:
-        GOWORK: ${{ github.workspace }}/go.work
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
       run: go get -v ./...
     - name: run tests
       env:
         INTEGRATION_TESTS: yes
-        GOWORK: ${{ github.workspace }}/go.work
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
       run: |
         cd micro-tests
         go test -mod readonly -v ./... || true        

.github/workflows/job_coverage.yml

@@ -1,53 +0,0 @@
-name: coverage
-
-on:
-  push:
-    branches: [ main, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
-  pull_request:
-    branches: [ main, v3, v4 ]
-
-jobs:
-
-  build:
-    if: github.server_url != 'https://github.com'
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-
-    - name: test coverage
-      run: |
-        go test -v -cover ./... -covermode=count -coverprofile coverage.out -coverpkg ./...
-        go tool cover -func coverage.out -o coverage.out
-
-    - name: coverage badge
-      uses: tj-actions/coverage-badge-go@v2
-      with:
-        green: 80
-        filename: coverage.out
-
-    - uses: stefanzweifel/git-auto-commit-action@v4
-      name: autocommit
-      with:
-        commit_message: Apply Code Coverage Badge
-        skip_fetch: false
-        skip_checkout: false
-        file_pattern: ./README.md
-
-    - name: push
-      if: steps.auto-commit-action.outputs.changes_detected == 'true'
-      uses: ad-m/github-push-action@master
-      with:
-        github_token: ${{ github.token }}
-        branch: ${{ github.ref }}

.github/workflows/job_sync.yml

@@ -1,94 +0,0 @@
-name: sync
-
-on:
-  schedule:
-    - cron: '*/5 * * * *'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  sync:
-    if: github.server_url != 'https://github.com'
-    runs-on: ubuntu-latest
-    steps:
-    - name: init
-      run: |
-        git config --global user.email "vtolstov <vtolstov@users.noreply.github.com>"
-        git config --global user.name "github-actions[bot]"
-        echo "machine git.unistack.org login vtolstov password ${{ secrets.TOKEN_GITEA }}" >> /root/.netrc
-        echo "machine github.com login vtolstov password ${{ secrets.TOKEN_GITHUB }}" >> /root/.netrc
-
-    - name: check master
-      id: check_master
-      run: |
-        src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/master | cut -f1)
-        dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/master | cut -f1)
-        echo "src_hash=$src_hash"
-        echo "dst_hash=$dst_hash"
-        if [ "$src_hash" != "$dst_hash" -a "$src_hash" != "" -a "" != "$dst_hash" ]; then
-          echo "sync_needed=true" >> $GITHUB_OUTPUT
-        else
-          echo "sync_needed=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: sync master
-      if: steps.check_master.outputs.sync_needed == 'true'
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream master
-        git push upstream master --progress
-        git push origin master --progress
-        cd ../
-        rm -rf repo
-
-    - name: check v3
-      id: check_v3
-      run: |
-        src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/v3 | cut -f1)
-        dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/v3 | cut -f1)
-        echo "src_hash=$src_hash"
-        echo "dst_hash=$dst_hash"
-        if [ "$src_hash" != "$dst_hash" ]; then
-          echo "sync_needed=true" >> $GITHUB_OUTPUT
-        else
-          echo "sync_needed=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: sync v3
-      if: steps.check_v3.outputs.sync_needed == 'true'
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream v3
-        git push upstream v3 --progress
-        git push origin v3 --progress
-        cd ../
-        rm -rf repo
-
-    - name: check v4
-      id: check_v4
-      run: |
-        src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/v4 | cut -f1)
-        dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/v4 | cut -f1)
-        echo "src_hash=$src_hash"
-        echo "dst_hash=$dst_hash"
-        if [ "$src_hash" != "$dst_hash" ]; then
-          echo "sync_needed=true" >> $GITHUB_OUTPUT
-        else
-          echo "sync_needed=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: sync v4
-      if: steps.check_v4.outputs.sync_needed == 'true'
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
-        git pull --rebase upstream v4
-        git push upstream v4 --progress
-        git push origin v4 --progress
-        cd ../
-        rm -rf repo

.golangci.yml

@@ -1,5 +1,5 @@
 run:
   concurrency: 8
-  timeout: 5m
+  deadline: 5m
   issues-exit-code: 1
   tests: true

README.md

@@ -1,2 +1,9 @@
-# micro-broker-kgo
+# broker-kgo
-![Coverage](https://img.shields.io/badge/Coverage-64.8%25-yellow)
+
+TODO:
+
+1) экспортируем текущий оффсет для каждой партиции в группе
+2) экспортируем лаг для группы
+3) мониторим
+   1) если есть лаг больше нуля
+   2) если дельта оффсета за нужное нам время не 

carrier.go

@@ -1,12 +1,8 @@
 package kgo
 
 import (
-	"net/http"
-	"slices"
-	"strings"
-
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v3/metadata"
 )
 
 // RecordCarrier injects and extracts traces from a kgo.Record.
@@ -57,37 +53,24 @@ func (c RecordCarrier) Keys() []string {
 	return out
 }
 
-func setHeaders(r *kgo.Record, md metadata.Metadata, exclude ...string) {
+func setHeaders(r *kgo.Record, md metadata.Metadata) {
 	seen := make(map[string]struct{})
-
 loop:
 	for k, v := range md {
-		k = http.CanonicalHeaderKey(k)
-
-		if _, ok := seen[k]; ok {
-			continue loop
-		}
-
-		if slices.ContainsFunc(exclude, func(s string) bool {
-			return strings.EqualFold(s, k)
-		}) {
-			continue loop
-		}
-
 		for i := 0; i < len(r.Headers); i++ {
-			if strings.EqualFold(r.Headers[i].Key, k) {
+			if r.Headers[i].Key == k {
 				// Key exist, update the value.
-				r.Headers[i].Value = []byte(strings.Join(v, ","))
+				r.Headers[i].Value = []byte(v)
+				continue loop
+			} else if _, ok := seen[k]; ok {
 				continue loop
 			}
-		}
-
 			// Key does not exist, append new header.
 			r.Headers = append(r.Headers, kgo.RecordHeader{
 				Key:   k,
-			Value: []byte(strings.Join(v, ",")),
+				Value: []byte(v),
 			})
-
 			seen[k] = struct{}{}
 		}
 	}
+}

errors.go

@@ -1,10 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"errors"
-)
-
-func isContextError(err error) bool {
-	return errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)
-}

event.go

@@ -0,0 +1,48 @@
+package kgo
+
+import (
+	"context"
+	"sync"
+
+	"go.unistack.org/micro/v3/broker"
+)
+
+type event struct {
+	ctx   context.Context
+	topic string
+	err   error
+	sync.RWMutex
+	msg *broker.Message
+	ack bool
+}
+
+func (p *event) Context() context.Context {
+	return p.ctx
+}
+
+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,27 +1,28 @@
-module go.unistack.org/micro-broker-kgo/v4
+module go.unistack.org/micro-broker-kgo/v3
 
-go 1.24.0
+go 1.22.7
+
+toolchain go1.23.3
 
 require (
-	github.com/stretchr/testify v1.11.1
+	github.com/google/uuid v1.6.0
-	github.com/twmb/franz-go v1.20.2
+	github.com/twmb/franz-go v1.18.0
-	github.com/twmb/franz-go/pkg/kadm v1.17.1
+	github.com/twmb/franz-go/pkg/kadm v1.14.0
-	github.com/twmb/franz-go/pkg/kfake v0.0.0-20250508175730-72e1646135e3
+	github.com/twmb/franz-go/pkg/kmsg v1.9.0
-	github.com/twmb/franz-go/pkg/kmsg v1.12.0
+	go.opentelemetry.io/otel v1.33.0
-	go.opentelemetry.io/otel v1.38.0
+	go.unistack.org/micro/v3 v3.11.22
-	go.unistack.org/micro/v4 v4.1.24
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
-	github.com/klauspost/compress v1.18.1 // indirect
-	github.com/matoous/go-nanoid v1.5.1 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/spf13/cast v1.10.0 // indirect
+	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	go.unistack.org/micro-proto/v4 v4.1.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/crypto v0.43.0 // indirect
+	golang.org/x/net v0.32.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
+	golang.org/x/sys v0.28.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
+	google.golang.org/grpc v1.69.2 // indirect
+	google.golang.org/protobuf v1.36.0 // indirect
 )

go.sum

@@ -1,59 +1,48 @@
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 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/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
-github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
+github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
-github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
+github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIct4=
-github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
 github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
 github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/twmb/franz-go v1.18.0 h1:25FjMZfdozBywVX+5xrWC2W+W76i0xykKjTdEeD2ejw=
-github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
+github.com/twmb/franz-go v1.18.0/go.mod h1:zXCGy74M0p5FbXsLeASdyvfLFsBvTubVqctIaa5wQ+I=
-github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
+github.com/twmb/franz-go/pkg/kadm v1.14.0 h1:nAn1co1lXzJQocpzyIyOFOjUBf4WHWs5/fTprXy2IZs=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/twmb/franz-go/pkg/kadm v1.14.0/go.mod h1:XjOPz6ZaXXjrW2jVCfLuucP8H1w2TvD6y3PT2M+aAM4=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/twmb/franz-go/pkg/kmsg v1.9.0 h1:JojYUph2TKAau6SBtErXpXGC7E3gg4vGZMv9xFU/B6M=
-github.com/twmb/franz-go v1.19.5 h1:W7+o8D0RsQsedqib71OVlLeZ0zI6CbFra7yTYhZTs5Y=
+github.com/twmb/franz-go/pkg/kmsg v1.9.0/go.mod h1:CMbfazviCyY6HM0SXuG5t9vOwYDHRCSrJJyBAe5paqg=
-github.com/twmb/franz-go v1.19.5/go.mod h1:4kFJ5tmbbl7asgwAGVuyG1ZMx0NNpYk7EqflvWfPCpM=
+go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
-github.com/twmb/franz-go v1.20.2 h1:CiwhyKZHW6vqSHJkh+RTxFAJkio0jBjM/JQhx/HZ72A=
+go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
-github.com/twmb/franz-go v1.20.2/go.mod h1:YCnepDd4gl6vdzG03I5Wa57RnCTIC6DVEyMpDX/J8UA=
+go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
-github.com/twmb/franz-go/pkg/kadm v1.16.1 h1:IEkrhTljgLHJ0/hT/InhXGjPdmWfFvxp7o/MR7vJ8cw=
+go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
-github.com/twmb/franz-go/pkg/kadm v1.16.1/go.mod h1:Ue/ye1cc9ipsQFg7udFbbGiFNzQMqiH73fGC2y0rwyc=
+go.unistack.org/micro/v3 v3.11.0 h1:usQ+8wQuOWpQd4+DGhFXSgZ+e+wOBjuT3W5GJZ02bSs=
-github.com/twmb/franz-go/pkg/kadm v1.17.1 h1:Bt02Y/RLgnFO2NP2HVP1kd2TFtGRiJZx+fSArjZDtpw=
+go.unistack.org/micro/v3 v3.11.0/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
-github.com/twmb/franz-go/pkg/kadm v1.17.1/go.mod h1:s4duQmrDbloVW9QTMXhs6mViTepze7JLG43xwPcAeTg=
+go.unistack.org/micro/v3 v3.11.22 h1:VPtp/+rp/baKlNb6WVlx4ZzufYuwHrfABoftnDi1uek=
-github.com/twmb/franz-go/pkg/kfake v0.0.0-20250508175730-72e1646135e3 h1:p24opKWPySAy8xSl8NqRgOv7Q+bX7kdrQirBVRJzQfo=
+go.unistack.org/micro/v3 v3.11.22/go.mod h1:TjF2+KJ2RG+IB4d0wnXtaF5KgqwAqy/AMh+w9gDpRHg=
-github.com/twmb/franz-go/pkg/kfake v0.0.0-20250508175730-72e1646135e3/go.mod h1:7uQs3Ae6HkWT1Y9elMbqtAcNFCI0y6+iS+Phw49L49U=
+golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
-github.com/twmb/franz-go/pkg/kmsg v1.11.2 h1:hIw75FpwcAjgeyfIGFqivAvwC5uNIOWRGvQgZhH4mhg=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-github.com/twmb/franz-go/pkg/kmsg v1.11.2/go.mod h1:CFfkkLysDNmukPYhGzuUcDtf46gQSqCZHMW1T4Z+wDE=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-github.com/twmb/franz-go/pkg/kmsg v1.12.0 h1:CbatD7ers1KzDNgJqPbKOq0Bz/WLBdsTH75wgzeVaPc=
+golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-github.com/twmb/franz-go/pkg/kmsg v1.12.0/go.mod h1:+DPt4NC8RmI6hqb8G09+3giKObE6uD2Eya6CfqBpeJY=
+golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
-go.unistack.org/micro/v4 v4.1.21 h1:F9PrbI1BhXSDS0FopwcO5wWrT2Xh38w9VhVZZBHjfg8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 h1:Z7FRVJPSMaHQxD0uXU8WdgFh8PseLM8Q8NzhnpMrBhQ=
-go.unistack.org/micro/v4 v4.1.21/go.mod h1:nlBXTbx0rQrSZX4HPp2m57PHmpuGPWUd0O+jpUIiPto=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
-go.unistack.org/micro/v4 v4.1.24 h1:PbkSWJS3ssB5A0y0tOdOw6u9e2Mk4yombF4yR0Jshvo=
+google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-go.unistack.org/micro/v4 v4.1.24/go.mod h1:nlBXTbx0rQrSZX4HPp2m57PHmpuGPWUd0O+jpUIiPto=
+google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
-golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
+google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
-golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

hook_event.go

@@ -1,108 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"net"
-	"sync/atomic"
-	"time"
-
-	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v4/logger"
-)
-
-type hookEvent struct {
-	log          logger.Logger
-	fatalOnError bool
-	connected    *atomic.Uint32
-}
-
-var (
-	_ kgo.HookBrokerConnect           = &hookEvent{}
-	_ kgo.HookBrokerDisconnect        = &hookEvent{}
-	_ kgo.HookBrokerRead              = &hookEvent{}
-	_ kgo.HookBrokerWrite             = &hookEvent{}
-	_ kgo.HookGroupManageError        = &hookEvent{}
-	_ kgo.HookProduceRecordUnbuffered = &hookEvent{}
-)
-
-func (m *hookEvent) OnGroupManageError(err error) {
-	switch {
-	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
-		return
-	default:
-		ctx := context.TODO()
-		logMsg := "kgo.OnGroupManageError"
-
-		if m.fatalOnError {
-			m.log.Fatal(ctx, logMsg, err)
-		} else {
-			m.log.Error(ctx, logMsg, err)
-		}
-	}
-}
-
-func (m *hookEvent) OnBrokerConnect(_ kgo.BrokerMetadata, _ time.Duration, _ net.Conn, err error) {
-	switch {
-	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
-		return
-	default:
-		ctx := context.TODO()
-		logMsg := "kgo.OnBrokerConnect"
-
-		if m.fatalOnError {
-			m.log.Fatal(ctx, logMsg, err)
-		} else {
-			m.log.Error(ctx, logMsg, err)
-		}
-	}
-}
-
-func (m *hookEvent) OnBrokerDisconnect(_ kgo.BrokerMetadata, _ net.Conn) {}
-
-func (m *hookEvent) OnBrokerWrite(_ kgo.BrokerMetadata, _ int16, _ int, _ time.Duration, _ time.Duration, err error) {
-	switch {
-	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
-		return
-	default:
-		ctx := context.TODO()
-		logMsg := "kgo.OnBrokerWrite"
-
-		if m.fatalOnError {
-			m.log.Fatal(ctx, logMsg, err)
-		} else {
-			m.log.Error(ctx, logMsg, err)
-		}
-	}
-}
-
-func (m *hookEvent) OnBrokerRead(_ kgo.BrokerMetadata, _ int16, _ int, _ time.Duration, _ time.Duration, err error) {
-	switch {
-	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
-		return
-	default:
-		ctx := context.TODO()
-		logMsg := "kgo.OnBrokerRead"
-
-		if m.fatalOnError {
-			m.log.Fatal(ctx, logMsg, err)
-		} else {
-			m.log.Error(ctx, logMsg, err)
-		}
-	}
-}
-
-func (m *hookEvent) OnProduceRecordUnbuffered(_ *kgo.Record, err error) {
-	switch {
-	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
-		return
-	default:
-		ctx := context.TODO()
-		logMsg := "kgo.OnProduceRecordUnbuffered"
-
-		if m.fatalOnError {
-			m.log.Fatal(ctx, logMsg, err)
-		} else {
-			m.log.Error(ctx, logMsg, err)
-		}
-	}
-}

hook_event_test.go

@@ -1,471 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"errors"
-	"io"
-	"net"
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v4/logger"
-)
-
-func TestHookEvent_OnGroupManageError(t *testing.T) {
-	tests := []struct {
-		name                  string
-		inputErr              error
-		fatalOnError          bool
-		expectedErrorIsCalled bool
-		expectedErrorMsg      string
-		expectedFatalIsCalled bool
-		expectedFatalMsg      string
-	}{
-		{
-			name:                  "error is nil",
-			inputErr:              nil,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "context canceled",
-			inputErr:              context.Canceled,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "context deadline exceeded",
-			inputErr:              context.DeadlineExceeded,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: deadline exceeded (os package)",
-			inputErr:              os.ErrDeadlineExceeded,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: EOF (io package)",
-			inputErr:              io.EOF,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: closed network connection (net package)",
-			inputErr:              net.ErrClosed,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "some error (non-fatal)",
-			inputErr:              errors.New("some error"),
-			fatalOnError:          false,
-			expectedErrorIsCalled: true,
-			expectedErrorMsg:      "kgo.OnGroupManageError",
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "some error (fatal)",
-			inputErr:              errors.New("some error"),
-			fatalOnError:          true,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: true,
-			expectedFatalMsg:      "kgo.OnGroupManageError",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			log := &mockLogger{}
-			he := &hookEvent{log: log, fatalOnError: tt.fatalOnError}
-			he.OnGroupManageError(tt.inputErr)
-			require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
-			require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
-			require.Equal(t, tt.expectedFatalIsCalled, log.fatalIsCalled)
-			require.Equal(t, tt.expectedFatalMsg, log.fatalMsg)
-		})
-	}
-}
-
-func TestHookEvent_OnBrokerConnect(t *testing.T) {
-	tests := []struct {
-		name                  string
-		inputErr              error
-		fatalOnError          bool
-		expectedErrorIsCalled bool
-		expectedErrorMsg      string
-		expectedFatalIsCalled bool
-		expectedFatalMsg      string
-	}{
-		{
-			name:                  "error is nil",
-			inputErr:              nil,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "context canceled",
-			inputErr:              context.Canceled,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "context deadline exceeded",
-			inputErr:              context.DeadlineExceeded,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: deadline exceeded (os package)",
-			inputErr:              os.ErrDeadlineExceeded,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: EOF (io package)",
-			inputErr:              io.EOF,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: closed network connection (net package)",
-			inputErr:              net.ErrClosed,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "some error (non-fatal)",
-			inputErr:              errors.New("some error"),
-			fatalOnError:          false,
-			expectedErrorIsCalled: true,
-			expectedErrorMsg:      "kgo.OnBrokerConnect",
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "some error (fatal)",
-			inputErr:              errors.New("some error"),
-			fatalOnError:          true,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: true,
-			expectedFatalMsg:      "kgo.OnBrokerConnect",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			log := &mockLogger{}
-			he := &hookEvent{log: log, fatalOnError: tt.fatalOnError}
-			he.OnBrokerConnect(kgo.BrokerMetadata{}, 0, nil, tt.inputErr)
-			require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
-			require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
-			require.Equal(t, tt.expectedFatalIsCalled, log.fatalIsCalled)
-			require.Equal(t, tt.expectedFatalMsg, log.fatalMsg)
-		})
-	}
-}
-
-func TestHookEvent_OnBrokerWrite(t *testing.T) {
-	tests := []struct {
-		name                  string
-		inputErr              error
-		fatalOnError          bool
-		expectedErrorIsCalled bool
-		expectedErrorMsg      string
-		expectedFatalIsCalled bool
-		expectedFatalMsg      string
-	}{
-		{
-			name:                  "error is nil",
-			inputErr:              nil,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "context canceled",
-			inputErr:              context.Canceled,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "context deadline exceeded",
-			inputErr:              context.DeadlineExceeded,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: deadline exceeded (os package)",
-			inputErr:              os.ErrDeadlineExceeded,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: EOF (io package)",
-			inputErr:              io.EOF,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: closed network connection (net package)",
-			inputErr:              net.ErrClosed,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "some error (non-fatal)",
-			inputErr:              errors.New("some error"),
-			fatalOnError:          false,
-			expectedErrorIsCalled: true,
-			expectedErrorMsg:      "kgo.OnBrokerWrite",
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "some error (fatal)",
-			inputErr:              errors.New("some error"),
-			fatalOnError:          true,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: true,
-			expectedFatalMsg:      "kgo.OnBrokerWrite",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			log := &mockLogger{}
-			he := &hookEvent{log: log, fatalOnError: tt.fatalOnError}
-			he.OnBrokerWrite(kgo.BrokerMetadata{}, 0, 0, 0, 0, tt.inputErr)
-			require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
-			require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
-			require.Equal(t, tt.expectedFatalIsCalled, log.fatalIsCalled)
-			require.Equal(t, tt.expectedFatalMsg, log.fatalMsg)
-		})
-	}
-}
-
-func TestHookEvent_OnBrokerRead(t *testing.T) {
-	tests := []struct {
-		name                  string
-		inputErr              error
-		fatalOnError          bool
-		expectedErrorIsCalled bool
-		expectedErrorMsg      string
-		expectedFatalIsCalled bool
-		expectedFatalMsg      string
-	}{
-		{
-			name:                  "error is nil",
-			inputErr:              nil,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "context canceled",
-			inputErr:              context.Canceled,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "context deadline exceeded",
-			inputErr:              context.DeadlineExceeded,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: deadline exceeded (os package)",
-			inputErr:              os.ErrDeadlineExceeded,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: EOF (io package)",
-			inputErr:              io.EOF,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: closed network connection (net package)",
-			inputErr:              net.ErrClosed,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "some error (non-fatal)",
-			inputErr:              errors.New("some error"),
-			fatalOnError:          false,
-			expectedErrorIsCalled: true,
-			expectedErrorMsg:      "kgo.OnBrokerRead",
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "some error (fatal)",
-			inputErr:              errors.New("some error"),
-			fatalOnError:          true,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: true,
-			expectedFatalMsg:      "kgo.OnBrokerRead",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			log := &mockLogger{}
-			he := &hookEvent{log: log, fatalOnError: tt.fatalOnError}
-			he.OnBrokerRead(kgo.BrokerMetadata{}, 0, 0, 0, 0, tt.inputErr)
-			require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
-			require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
-			require.Equal(t, tt.expectedFatalIsCalled, log.fatalIsCalled)
-			require.Equal(t, tt.expectedFatalMsg, log.fatalMsg)
-		})
-	}
-}
-
-func TestHookEvent_OnProduceRecordUnbuffered(t *testing.T) {
-	tests := []struct {
-		name                  string
-		inputErr              error
-		fatalOnError          bool
-		expectedErrorIsCalled bool
-		expectedErrorMsg      string
-		expectedFatalIsCalled bool
-		expectedFatalMsg      string
-	}{
-		{
-			name:                  "error is nil",
-			inputErr:              nil,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "context canceled",
-			inputErr:              context.Canceled,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "context deadline exceeded",
-			inputErr:              context.DeadlineExceeded,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: deadline exceeded (os package)",
-			inputErr:              os.ErrDeadlineExceeded,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: EOF (io package)",
-			inputErr:              io.EOF,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "retryable error: closed network connection (net package)",
-			inputErr:              net.ErrClosed,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "some error (non-fatal)",
-			inputErr:              errors.New("some error"),
-			fatalOnError:          false,
-			expectedErrorIsCalled: true,
-			expectedErrorMsg:      "kgo.OnProduceRecordUnbuffered",
-			expectedFatalIsCalled: false,
-		},
-		{
-			name:                  "some error (fatal)",
-			inputErr:              errors.New("some error"),
-			fatalOnError:          true,
-			expectedErrorIsCalled: false,
-			expectedFatalIsCalled: true,
-			expectedFatalMsg:      "kgo.OnProduceRecordUnbuffered",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			log := &mockLogger{}
-			he := &hookEvent{log: log, fatalOnError: tt.fatalOnError}
-			he.OnProduceRecordUnbuffered(&kgo.Record{}, tt.inputErr)
-			require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
-			require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
-			require.Equal(t, tt.expectedFatalIsCalled, log.fatalIsCalled)
-			require.Equal(t, tt.expectedFatalMsg, log.fatalMsg)
-		})
-	}
-}
-
-// Mocks
-
-type mockLogger struct {
-	errorIsCalled bool
-	errorMsg      string
-
-	fatalIsCalled bool
-	fatalMsg      string
-}
-
-func (m *mockLogger) Init(...logger.Option) error {
-	panic("implement me")
-}
-
-func (m *mockLogger) Clone(...logger.Option) logger.Logger {
-	panic("implement me")
-}
-
-func (m *mockLogger) V(logger.Level) bool {
-	panic("implement me")
-}
-
-func (m *mockLogger) Level(logger.Level) {
-	panic("implement me")
-}
-
-func (m *mockLogger) Options() logger.Options {
-	panic("implement me")
-}
-
-func (m *mockLogger) Fields(...interface{}) logger.Logger {
-	panic("implement me")
-}
-
-func (m *mockLogger) Info(context.Context, string, ...interface{}) {
-	panic("implement me")
-}
-
-func (m *mockLogger) Trace(context.Context, string, ...interface{}) {
-	panic("implement me")
-}
-
-func (m *mockLogger) Debug(context.Context, string, ...interface{}) {
-	panic("implement me")
-}
-
-func (m *mockLogger) Warn(context.Context, string, ...interface{}) {
-	panic("implement me")
-}
-
-func (m *mockLogger) Error(ctx context.Context, msg string, args ...interface{}) {
-	m.errorIsCalled = true
-	m.errorMsg = msg
-}
-
-func (m *mockLogger) Fatal(ctx context.Context, msg string, args ...interface{}) {
-	m.fatalIsCalled = true
-	m.fatalMsg = msg
-}
-
-func (m *mockLogger) Log(context.Context, logger.Level, string, ...interface{}) {
-	panic("implement me")
-}
-
-func (m *mockLogger) Name() string {
-	panic("implement me")
-}
-
-func (m *mockLogger) String() string {
-	panic("implement me")
-}

kadmtest.go

@@ -0,0 +1,65 @@
+//go:build ignore
+
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/twmb/franz-go/pkg/kadm"
+	"github.com/twmb/franz-go/pkg/kgo"
+	"github.com/twmb/franz-go/pkg/kversion"
+
+	//"github.com/twmb/franz-go/pkg/sasl/scram"
+	"github.com/twmb/franz-go/pkg/sasl/plain"
+)
+
+func die(msg string, args ...any) {
+	fmt.Fprintf(os.Stderr, msg, args...)
+	os.Exit(1)
+}
+
+func main() {
+	seeds := []string{"vm-kafka-ump01tn.mbrd.ru:9092", "vm-kafka-ump02tn.mbrd.ru:9092", "vm-kafka-ump03tn.mbrd.ru:9092"}
+
+	pass := "XXXXX"
+	user := "XXXXX"
+
+	var adminClient *kadm.Client
+	{
+		client, err := kgo.NewClient(
+			kgo.SeedBrokers(seeds...),
+			// kgo.SASL((scram.Auth{User: user, Pass: pass}).AsSha512Mechanism()),
+			kgo.SASL((plain.Auth{User: user, Pass: pass}).AsMechanism()),
+
+			// Do not try to send requests newer than 2.4.0 to avoid breaking changes in the request struct.
+			// Sometimes there are breaking changes for newer versions where more properties are required to set.
+			kgo.MaxVersions(kversion.V2_4_0()),
+		)
+		if err != nil {
+			panic(err)
+		}
+		defer client.Close()
+
+		adminClient = kadm.NewClient(client)
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+	defer cancel()
+
+	dg, err := adminClient.DescribeGroups(ctx, "interestrate_loader")
+	if err != nil {
+		die("failed to describe group: %v", err)
+	}
+
+	for _, m := range dg["interestrate_loader"].Members {
+		mc, _ := m.Assigned.AsConsumer()
+		for _, mt := range mc.Topics {
+			for _, p := range mt.Partitions {
+				fmt.Printf("client:%s\tpartitions: %d\n", m.ClientID, p)
+			}
+		}
+	}
+}

kgo.go

@@ -5,39 +5,31 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"math/rand/v2"
+	"math/rand"
-	"strconv"
+	"net/http"
 	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"github.com/twmb/franz-go/pkg/kadm"
+	"github.com/google/uuid"
 	"github.com/twmb/franz-go/pkg/kgo"
 	"github.com/twmb/franz-go/pkg/kmsg"
-	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v3/semconv"
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v3/tracer"
-	"go.unistack.org/micro/v4/semconv"
+	mrand "go.unistack.org/micro/v3/util/rand"
-	"go.unistack.org/micro/v4/tracer"
-	"go.unistack.org/micro/v4/util/id"
-	mrand "go.unistack.org/micro/v4/util/rand"
 )
 
 var _ broker.Broker = (*Broker)(nil)
 
-var messagePool = sync.Pool{
-	New: func() interface{} {
-		return &kgoMessage{}
-	},
-}
-
 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
@@ -53,7 +45,7 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
 		backoff := min * time.Duration(1<<(fails-1))
 
 		rngMu.Lock()
-		jitter := 0.8 + 0.4*rand.Float64()
+		jitter := 0.8 + 0.4*rng.Float64()
 		rngMu.Unlock()
 
 		backoff = time.Duration(float64(backoff) * jitter)
@@ -66,18 +58,13 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
 }()
 
 type Broker struct {
-	funcPublish   broker.FuncPublish
-	funcSubscribe broker.FuncSubscribe
-	c             *kgo.Client
-	connected     *atomic.Uint32
-
-	kopts []kgo.Opt
-	subs  []*Subscriber
-
-	opts broker.Options
-
-	mu   sync.RWMutex
 	init      bool
+	c         *kgo.Client
+	kopts     []kgo.Opt
+	connected *atomic.Uint32
+	sync.RWMutex
+	opts broker.Options
+	subs []*Subscriber
 }
 
 func (r *Broker) Live() bool {
@@ -104,74 +91,6 @@ func (k *Broker) Client() *kgo.Client {
 	return k.c
 }
 
-type kgoMessage struct {
-	c     codec.Codec
-	topic string
-	ctx   context.Context
-	body  []byte
-	hdr   metadata.Metadata
-	opts  broker.MessageOptions
-	ack   bool
-}
-
-func (m *kgoMessage) Ack() error {
-	m.ack = true
-	return nil
-}
-
-func (m *kgoMessage) Body() []byte {
-	return m.body
-}
-
-func (m *kgoMessage) Header() metadata.Metadata {
-	return m.hdr
-}
-
-func (m *kgoMessage) Context() context.Context {
-	return m.ctx
-}
-
-func (m *kgoMessage) Topic() string {
-	return ""
-}
-
-func (m *kgoMessage) Unmarshal(dst interface{}, opts ...codec.Option) error {
-	return m.c.Unmarshal(m.body, dst)
-}
-
-func (b *Broker) newCodec(ct string) (codec.Codec, error) {
-	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
-		ct = ct[:idx]
-	}
-	b.mu.RLock()
-	c, ok := b.opts.Codecs[ct]
-	b.mu.RUnlock()
-	if ok {
-		return c, nil
-	}
-	return nil, codec.ErrUnknownContentType
-}
-
-func (b *Broker) NewMessage(ctx context.Context, hdr metadata.Metadata, body interface{}, opts ...broker.MessageOption) (broker.Message, error) {
-	options := broker.NewMessageOptions(opts...)
-	if options.ContentType == "" {
-		options.ContentType = b.opts.ContentType
-	}
-
-	m := &kgoMessage{ctx: ctx, hdr: hdr.Copy(), opts: options}
-	c, err := b.newCodec(m.opts.ContentType)
-	if err == nil {
-		m.body, err = c.Marshal(body)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	m.hdr.Set(metadata.HeaderContentType, m.opts.ContentType)
-
-	return m, nil
-}
-
 func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *hookTracer, error) {
 	var c *kgo.Client
 	var err error
@@ -189,18 +108,10 @@ func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *ho
 		}
 	}
 
-	var fatalOnError bool
-	if k.opts.Context != nil {
-		if v, ok := k.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
-			fatalOnError = v
-		}
-	}
-
 	htracer := &hookTracer{group: group, clientID: clientID, tracer: k.opts.Tracer}
 	opts = append(opts,
 		kgo.WithHooks(&hookMeter{meter: k.opts.Meter}),
 		kgo.WithHooks(htracer),
-		kgo.WithHooks(&hookEvent{log: k.opts.Logger, fatalOnError: fatalOnError, connected: k.connected}),
 	)
 
 	select {
@@ -222,9 +133,8 @@ func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *ho
 			}
 			return nil, nil, err
 		}
-		k.connected.Store(1)
-		return c, htracer, nil
 	}
+	return c, htracer, nil
 }
 
 func (k *Broker) Connect(ctx context.Context) error {
@@ -242,72 +152,10 @@ func (k *Broker) Connect(ctx context.Context) error {
 		return err
 	}
 
-	k.mu.Lock()
+	k.Lock()
 	k.c = c
 	k.connected.Store(1)
-	k.mu.Unlock()
+	k.Unlock()
-
-	exposeLag := false
-	if k.opts.Context != nil {
-		if v, ok := k.opts.Context.Value(exposeLagKey{}).(bool); ok && v {
-			exposeLag = v
-		}
-	}
-
-	if exposeLag {
-		var mu sync.Mutex
-		var lastUpdate time.Time
-		type pl struct {
-			p string
-			l float64
-		}
-
-		lag := make(map[string]map[string]pl) // topic => group => partition => lag
-		ac := kadm.NewClient(k.c)
-
-		updateStats := func() {
-			mu.Lock()
-			if time.Since(lastUpdate) < DefaultStatsInterval {
-				return
-			}
-			mu.Unlock()
-
-			k.mu.Lock()
-			groups := make([]string, 0, len(k.subs))
-			for _, g := range k.subs {
-				groups = append(groups, g.opts.Group)
-			}
-			k.mu.Unlock()
-
-			dgls, err := ac.Lag(ctx, groups...)
-			if err != nil || !dgls.Ok() {
-				k.opts.Logger.Error(k.opts.Context, "kgo describe group lag error", err)
-				return
-			}
-
-			for gn, dgl := range dgls {
-				for tn, lmap := range dgl.Lag {
-					if _, ok := lag[tn]; !ok {
-						lag[tn] = make(map[string]pl)
-					}
-					for p, l := range lmap {
-						lag[tn][gn] = pl{p: strconv.Itoa(int(p)), l: float64(l.Lag)}
-					}
-				}
-			}
-		}
-
-		for tn, dg := range lag {
-			for gn, gl := range dg {
-				k.opts.Meter.Gauge(semconv.BrokerGroupLag,
-					func() float64 { updateStats(); return gl.l },
-					"topic", tn,
-					"group", gn,
-					"partition", gl.p)
-			}
-		}
-
-	}
 
 	return nil
 }
@@ -325,8 +173,8 @@ func (k *Broker) Disconnect(ctx context.Context) error {
 	ctx, span = k.opts.Tracer.Start(ctx, "Disconnect")
 	defer span.Finish()
 
-	k.mu.Lock()
+	k.Lock()
-	defer k.mu.Unlock()
+	defer k.Unlock()
 	select {
 	case <-nctx.Done():
 		return nctx.Err()
@@ -350,8 +198,8 @@ func (k *Broker) Disconnect(ctx context.Context) error {
 }
 
 func (k *Broker) Init(opts ...broker.Option) error {
-	k.mu.Lock()
+	k.Lock()
-	defer k.mu.Unlock()
+	defer k.Unlock()
 
 	if len(opts) == 0 && k.init {
 		return nil
@@ -380,18 +228,6 @@ func (k *Broker) Init(opts ...broker.Option) error {
 		}
 	}
 
-	k.funcPublish = k.fnPublish
-	k.funcSubscribe = k.fnSubscribe
-
-	k.opts.Hooks.EachPrev(func(hook options.Hook) {
-		switch h := hook.(type) {
-		case broker.HookPublish:
-			k.funcPublish = h(k.funcPublish)
-		case broker.HookSubscribe:
-			k.funcSubscribe = h(k.funcSubscribe)
-		}
-	})
-
 	k.init = true
 
 	return nil
@@ -401,93 +237,99 @@ func (k *Broker) Options() broker.Options {
 	return k.opts
 }
 
-func (b *Broker) Publish(ctx context.Context, topic string, messages ...broker.Message) error {
+func (k *Broker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
-	return b.funcPublish(ctx, topic, messages...)
+	return k.publish(ctx, msgs, opts...)
 }
 
-func (b *Broker) fnPublish(ctx context.Context, topic string, messages ...broker.Message) error {
+func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
-	return b.publish(ctx, topic, messages...)
+	msg.Header.Set(metadata.HeaderTopic, topic)
+	return k.publish(ctx, []*broker.Message{msg}, opts...)
 }
 
-func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.Message) error {
+func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
-	var records []*kgo.Record
+	k.Lock()
-
+	if k.connected.Load() == 0 {
-	for _, msg := range messages {
+		c, _, err := k.connect(ctx, k.kopts...)
-
+		if err != nil {
-		rec := &kgo.Record{
+			k.Unlock()
-			Context: msg.Context(),
+			return err
-			Topic:   topic,
-			Value:   msg.Body(),
 		}
+		k.c = c
+		k.connected.Store(1)
+	}
+	k.Unlock()
 
+	options := broker.NewPublishOptions(opts...)
+	records := make([]*kgo.Record, 0, len(msgs))
+	var errs []string
+	var err error
+	var key []byte
 	var promise func(*kgo.Record, error)
-		if rec.Context != nil {
+
-			if k, ok := rec.Context.Value(messageKey{}).([]byte); ok && k != nil {
+	if options.Context != nil {
-				rec.Key = k
+		if k, ok := options.Context.Value(publishKey{}).([]byte); ok && k != nil {
+			key = k
 		}
-			if p, ok := rec.Context.Value(messagePromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
+		if p, ok := options.Context.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
 			promise = p
 		}
 	}
 
-		kmsg, ok := msg.(*kgoMessage)
+	for _, msg := range msgs {
-		if !ok {
+		rec := &kgo.Record{Context: ctx, Key: key}
-			continue
+		rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
+		msg.Header.Del(metadata.HeaderTopic)
+		k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
+		if options.BodyOnly || k.opts.Codec.String() == "noop" {
+			rec.Value = msg.Body
+			for k, v := range msg.Header {
+				rec.Headers = append(rec.Headers, kgo.RecordHeader{Key: http.CanonicalHeaderKey(k), Value: []byte(v)})
 			}
-		if kmsg.opts.Context != nil {
+		} else {
-			if k, ok := kmsg.opts.Context.Value(messageKey{}).([]byte); ok && k != nil {
+			rec.Value, err = k.opts.Codec.Marshal(msg)
-				rec.Key = k
+			if err != nil {
-			}
+				return err
-			if p, ok := kmsg.opts.Context.Value(messagePromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
-				promise = p
 			}
 		}
-
+		records = append(records, rec)
-		setHeaders(rec, msg.Header())
+	}
 
 	if promise != nil {
 		ts := time.Now()
-			b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
+		for _, rec := range records {
-			b.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
+			k.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
 				te := time.Since(ts)
-				b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Dec()
+				k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Dec()
-				b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
+				k.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
-				b.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
+				k.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
 				if err != nil {
-					b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "failure").Inc()
+					k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "failure").Inc()
 				} else {
-					b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "success").Inc()
+					k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "success").Inc()
 				}
 				promise(r, err)
 			})
-			continue
-		} else {
-			records = append(records, rec)
 		}
+		return nil
 	}
-
-	if len(records) > 0 {
-		var errs []string
 	ts := time.Now()
-		b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", topic, "topic", topic).Set(uint64(len(records)))
+	results := k.c.ProduceSync(ctx, records...)
-		results := b.c.ProduceSync(ctx, records...)
 	te := time.Since(ts)
 	for _, result := range results {
-			b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
+		k.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
-			b.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
+		k.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
-			b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
+		k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
 		if result.Err != nil {
-				b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
+			k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
 			errs = append(errs, result.Err.Error())
 		} else {
-				b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "success").Inc()
+			k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "success").Inc()
 		}
 	}
 
 	if len(errs) > 0 {
 		return fmt.Errorf("publish error: %s", strings.Join(errs, "\n"))
 	}
-	}
 
 	return nil
 }
@@ -508,71 +350,38 @@ func (k *Broker) TopicExists(ctx context.Context, topic string) error {
 	return nil
 }
 
-func (b *Broker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (k *Broker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	return b.funcSubscribe(ctx, topic, handler, opts...)
+	return nil, nil
-}
-
-func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	if err := broker.IsValidHandler(handler); err != nil {
-		return nil, err
 }
 
+func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
 	options := broker.NewSubscribeOptions(opts...)
 
-	switch handler.(type) {
-	default:
-		return nil, broker.ErrInvalidHandler
-	case func(broker.Message) error:
-		break
-	case func([]broker.Message) error:
-		break
-	}
-
 	if options.Group == "" {
-		uid, err := id.New()
+		uid, err := uuid.NewRandom()
 		if err != nil {
 			return nil, err
 		}
-		options.Group = uid
+		options.Group = uid.String()
 	}
 
 	commitInterval := DefaultCommitInterval
-	if b.opts.Context != nil {
+	if k.opts.Context != nil {
-		if v, ok := b.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
+		if v, ok := k.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
 			commitInterval = v
 		}
 	}
 
-	var messagePool bool
-	var fatalOnError bool
-	if b.opts.Context != nil {
-		if v, ok := b.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
-			fatalOnError = v
-		}
-		if v, ok := b.opts.Context.Value(subscribeMessagePoolKey{}).(bool); ok && v {
-			messagePool = v
-		}
-	}
-
-	if options.Context != nil {
-		if v, ok := options.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
-			fatalOnError = v
-		}
-	}
-
 	sub := &Subscriber{
 		topic:     topic,
 		opts:      options,
 		handler:   handler,
-		kopts:        b.opts,
+		kopts:     k.opts,
 		consumers: make(map[tp]*consumer),
 		done:      make(chan struct{}),
-		fatalOnError: fatalOnError,
-		connected:    b.connected,
-		messagePool:  messagePool,
 	}
 
-	kopts := append(b.kopts,
+	kopts := append(k.kopts,
 		kgo.ConsumerGroup(options.Group),
 		kgo.ConsumeTopics(topic),
 		kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
@@ -580,9 +389,7 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
 		kgo.AutoCommitInterval(commitInterval),
 		kgo.OnPartitionsAssigned(sub.assigned),
 		kgo.OnPartitionsRevoked(sub.revoked),
-		kgo.StopProducerOnDataLossDetected(),
 		kgo.OnPartitionsLost(sub.lost),
-		kgo.AutoCommitCallback(sub.autocommit),
 		kgo.AutoCommitMarks(),
 	)
 
@@ -592,7 +399,7 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
 		}
 	}
 
-	c, htracer, err := b.connect(ctx, kopts...)
+	c, htracer, err := k.connect(ctx, kopts...)
 	if err != nil {
 		return nil, err
 	}
@@ -614,10 +421,9 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
 
 	go sub.poll(ctx)
 
-	b.mu.Lock()
+	k.Lock()
-	b.subs = append(b.subs, sub)
+	k.subs = append(k.subs, sub)
-	b.mu.Unlock()
+	k.Unlock()
-
 	return sub, nil
 }
 
@@ -644,7 +450,7 @@ func NewBroker(opts ...broker.Option) *Broker {
 		kgo.BlockRebalanceOnPoll(),
 		kgo.Balancers(kgo.CooperativeStickyBalancer()),
 		kgo.FetchIsolationLevel(kgo.ReadUncommitted()),
-		kgo.UnknownTopicRetries(1),
+		kgo.UnknownTopicRetries(0),
 	}
 
 	if options.Context != nil {

kgo_test.go

@@ -2,140 +2,39 @@ package kgo_test
 
 import (
 	"context"
+	"fmt"
+	"os"
+	"strings"
 	"sync/atomic"
 	"testing"
 	"time"
 
-	"github.com/twmb/franz-go/pkg/kfake"
 	kg "github.com/twmb/franz-go/pkg/kgo"
-	kgo "go.unistack.org/micro-broker-kgo/v4"
+	kgo "go.unistack.org/micro-broker-kgo/v3"
-	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v4/logger/slog"
-	"go.unistack.org/micro/v4/metadata"
 )
 
 var (
-	msgcnt   = int64(1200)
+	msgcnt   = int64(12000000)
 	group    = "38"
-	prefill  = true
+	prefill  = false
-	loglevel = logger.ErrorLevel
+	loglevel = logger.InfoLevel
-	cluster  *kfake.Cluster
 )
 
-func TestMain(m *testing.M) {
+var bm = &broker.Message{
-	cluster = kfake.MustCluster(
+	Header: map[string]string{"hkey": "hval", metadata.HeaderTopic: "test"},
-		kfake.AllowAutoTopicCreation(),
+	Body:   []byte(`"body"`),
-	)
-	defer cluster.Close()
-	m.Run()
-}
-
-func TestFail(t *testing.T) {
-	logger.DefaultLogger = slog.NewLogger()
-	if err := logger.DefaultLogger.Init(logger.WithLevel(loglevel)); err != nil {
-		t.Fatal(err)
-	}
-	ctx := context.Background()
-
-	b := kgo.NewBroker(
-		broker.ContentType("application/octet-stream"),
-		broker.Codec("application/octet-stream", codec.NewCodec()),
-		broker.Addrs(cluster.ListenAddrs()...),
-		kgo.CommitInterval(5*time.Second),
-		kgo.Options(
-			kg.ClientID("test"),
-			kg.FetchMaxBytes(10*1024*1024),
-			kg.AllowAutoTopicCreation(),
-		),
-	)
-
-	t.Logf("broker init")
-	if err := b.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	t.Logf("broker connect")
-	if err := b.Connect(ctx); err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		t.Logf("broker disconnect")
-		if err := b.Disconnect(ctx); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	t.Logf("broker health %v", b.Health())
-	msgs := make([]broker.Message, 0, msgcnt)
-	for i := int64(0); i < msgcnt; i++ {
-		m, err := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
-		if err != nil {
-			t.Fatal(err)
-		}
-		msgs = append(msgs, m)
-	}
-
-	go func() {
-		for _, msg := range msgs {
-			//		t.Logf("broker publish")
-			if err := b.Publish(ctx, "test.fail", msg); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-	//	t.Skip()
-
-	idx := int64(0)
-	fn := func(msg broker.Message) error {
-		atomic.AddInt64(&idx, 1)
-		time.Sleep(100 * time.Millisecond)
-		// t.Logf("ack")
-		return msg.Ack()
-	}
-
-	sub, err := b.Subscribe(ctx, "test.fail", fn,
-		broker.SubscribeAutoAck(true),
-		broker.SubscribeGroup(group),
-		broker.SubscribeBodyOnly(true))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		if err := sub.Unsubscribe(ctx); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	for {
-		t.Logf("health check")
-		if !b.Health() {
-			t.Logf("health works")
-			break
-		}
-		t.Logf("health sleep")
-		time.Sleep(100 * time.Millisecond)
-		if err := b.Disconnect(ctx); err != nil {
-			t.Fatal(err)
-		}
-	}
 }
 
 func TestConnect(t *testing.T) {
+	var addrs []string
 	ctx := context.TODO()
 	b := kgo.NewBroker(
-		broker.ContentType("application/octet-stream"),
+		broker.Addrs(addrs...),
-		broker.Codec("application/octet-stream", codec.NewCodec()),
-		broker.Addrs(cluster.ListenAddrs()...),
 		kgo.CommitInterval(5*time.Second),
-		kgo.Options(
+		kgo.Options(kg.ClientID("test"), kg.FetchMaxBytes(10*1024*1024)),
-			kg.ClientID("test"),
-			kg.FetchMaxBytes(10*1024*1024),
-			kg.AllowAutoTopicCreation(),
-		),
 	)
 	if err := b.Init(); err != nil {
 		t.Fatal(err)
@@ -147,23 +46,27 @@ func TestConnect(t *testing.T) {
 }
 
 func TestPubSub(t *testing.T) {
+	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
+		t.Skip()
+	}
+
 	if err := logger.DefaultLogger.Init(logger.WithLevel(loglevel)); err != nil {
 		t.Fatal(err)
 	}
 	ctx := context.Background()
 
-	b := kgo.NewBroker(
+	var addrs []string
-		broker.ContentType("application/octet-stream"),
+	if addr := os.Getenv("BROKER_ADDRS"); len(addr) == 0 {
-		broker.Codec("application/octet-stream", codec.NewCodec()),
+		addrs = []string{"127.0.0.1:29091", "127.0.0.2:29092", "127.0.0.3:29093"}
-		broker.Addrs(cluster.ListenAddrs()...),
+	} else {
-		kgo.CommitInterval(5*time.Second),
+		addrs = strings.Split(addr, ",")
-		kgo.Options(
+	}
-			kg.ClientID("test"),
-			kg.FetchMaxBytes(10*1024*1024),
-			kg.AllowAutoTopicCreation(),
-		),
-	)
 
+	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)
 	}
@@ -178,26 +81,25 @@ func TestPubSub(t *testing.T) {
 		}
 	}()
 	if prefill {
-		msgs := make([]broker.Message, 0, msgcnt)
+		msgs := make([]*broker.Message, 0, msgcnt)
 		for i := int64(0); i < msgcnt; i++ {
-			m, _ := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
+			msgs = append(msgs, bm)
-			msgs = append(msgs, m)
 		}
 
-		if err := b.Publish(ctx, "test.pubsub", msgs...); err != nil {
+		if err := b.BatchPublish(ctx, msgs); err != nil {
 			t.Fatal(err)
 		}
 		//	t.Skip()
 	}
 	done := make(chan bool, 1)
 	idx := int64(0)
-	fn := func(msg broker.Message) error {
+	fn := func(msg broker.Event) error {
 		atomic.AddInt64(&idx, 1)
 		// time.Sleep(200 * time.Millisecond)
 		return msg.Ack()
 	}
 
-	sub, err := b.Subscribe(ctx, "test.pubsub", fn,
+	sub, err := b.Subscribe(ctx, "test", fn,
 		broker.SubscribeAutoAck(true),
 		broker.SubscribeGroup(group),
 		broker.SubscribeBodyOnly(true))
@@ -222,7 +124,7 @@ func TestPubSub(t *testing.T) {
 				if prc := atomic.LoadInt64(&idx); prc == msgcnt {
 					close(done)
 				} else {
-					t.Logf("processed %v of %v\n", prc, msgcnt)
+					fmt.Printf("processed %v\n", prc)
 				}
 			case <-ticker.C:
 				close(done)

logger.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
 )
 
 type mlogger struct {

meter.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v3/meter"
 )
 
 type hookMeter struct {
@@ -61,7 +61,7 @@ const (
 	labelTopic   = "topic"
 )
 
-func (m *hookMeter) OnGroupManageError(_ error) {
+func (m *hookMeter) OnGroupManageError(err error) {
 	m.meter.Counter(metricBrokerGroupErrors).Inc()
 }
 

options.go

@@ -5,7 +5,8 @@ import (
 	"time"
 
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/client"
 )
 
 var (
@@ -14,7 +15,7 @@ var (
 	DefaultCommitInterval = 5 * time.Second
 
 	// DefaultStatsInterval specifies how fast check consumer lag
-	DefaultStatsInterval = 30 * time.Second
+	DefaultStatsInterval = 5 * time.Second
 
 	// DefaultSubscribeMaxInflight specifies how much messages keep inflight
 	DefaultSubscribeMaxInflight = 100
@@ -27,11 +28,16 @@ func SubscribeContext(ctx context.Context) broker.SubscribeOption {
 	return broker.SetSubscribeOption(subscribeContextKey{}, ctx)
 }
 
-type messageKey struct{}
+type publishKey struct{}
 
-// MessageKey set the kafka message key (broker option)
+// PublishKey set the kafka message key (broker option)
-func MessageKey(key []byte) broker.MessageOption {
+func PublishKey(key []byte) broker.PublishOption {
-	return broker.SetMessageOption(messageKey{}, key)
+	return broker.SetPublishOption(publishKey{}, key)
+}
+
+// ClientPublishKey set the kafka message key (client option)
+func ClientPublishKey(key []byte) client.PublishOption {
+	return client.SetPublishOption(publishKey{}, key)
 }
 
 type optionsKey struct{}
@@ -66,12 +72,6 @@ func SubscribeOptions(opts ...kgo.Opt) broker.SubscribeOption {
 	}
 }
 
-type fatalOnErrorKey struct{}
-
-func FatalOnError(b bool) broker.Option {
-	return broker.SetOption(fatalOnErrorKey{}, b)
-}
-
 type clientIDKey struct{}
 
 func ClientID(id string) broker.Option {
@@ -98,28 +98,14 @@ func SubscribeMaxInFlight(n int) broker.SubscribeOption {
 	return broker.SetSubscribeOption(subscribeMaxInflightKey{}, n)
 }
 
-// SubscribeMaxInFlight max queued messages
+type publishPromiseKey struct{}
-func SubscribeFatalOnError(b bool) broker.SubscribeOption {
+
-	return broker.SetSubscribeOption(fatalOnErrorKey{}, b)
+// PublishPromise set the kafka promise func for Produce
+func PublishPromise(fn func(*kgo.Record, error)) broker.PublishOption {
+	return broker.SetPublishOption(publishPromiseKey{}, fn)
 }
 
-type messagePromiseKey struct{}
+// ClientPublishKey set the kafka message key (client option)
-
+func ClientPublishPromise(fn func(*kgo.Record, error)) client.PublishOption {
-// MessagePromise set the kafka promise func for Produce
+	return client.SetPublishOption(publishPromiseKey{}, fn)
-func MessagePromise(fn func(*kgo.Record, error)) broker.MessageOption {
-	return broker.SetMessageOption(messagePromiseKey{}, fn)
-}
-
-type subscribeMessagePoolKey struct{}
-
-// SubscribeMessagePool optionaly enabled/disable message pool
-func SubscribeMessagePool(b bool) broker.SubscribeOption {
-	return broker.SetSubscribeOption(subscribeMessagePoolKey{}, b)
-}
-
-type exposeLagKey struct{}
-
-// ExposeLag enabled subscriber lag via [meter.Meter]
-func ExposeLag(b bool) broker.Option {
-	return broker.SetOption(exposeLagKey{}, b)
 }

subscriber.go

@@ -5,16 +5,15 @@ import (
 	"fmt"
 	"strconv"
 	"sync"
-	"sync/atomic"
 	"time"
 
+	"github.com/twmb/franz-go/pkg/kadm"
 	"github.com/twmb/franz-go/pkg/kgo"
-	"github.com/twmb/franz-go/pkg/kmsg"
+	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v3/semconv"
-	"go.unistack.org/micro/v4/semconv"
+	"go.unistack.org/micro/v3/tracer"
-	"go.unistack.org/micro/v4/tracer"
 )
 
 type tp struct {
@@ -23,34 +22,29 @@ type tp struct {
 }
 
 type consumer struct {
-	topic       string
 	c         *kgo.Client
+	topic     string
+	partition int32
 	htracer   *hookTracer
+	opts      broker.SubscribeOptions
+	kopts     broker.Options
+	handler   broker.Handler
 	quit      chan struct{}
 	done      chan struct{}
 	recs      chan kgo.FetchTopicPartition
-	kopts       broker.Options
-	partition   int32
-	opts        broker.SubscribeOptions
-	handler     interface{}
-	connected   *atomic.Uint32
-	messagePool bool
 }
 
 type Subscriber struct {
-	consumers    map[tp]*consumer
 	c         *kgo.Client
-	htracer      *hookTracer
 	topic     string
-	messagePool  bool
+	htracer   *hookTracer
-	handler      interface{}
-	done         chan struct{}
-	kopts        broker.Options
 	opts      broker.SubscribeOptions
-	connected    *atomic.Uint32
+	kopts     broker.Options
-	mu           sync.RWMutex
+	handler   broker.Handler
 	closed    bool
-	fatalOnError bool
+	done      chan struct{}
+	consumers map[tp]*consumer
+	sync.RWMutex
 }
 
 func (s *Subscriber) Client() *kgo.Client {
@@ -86,13 +80,46 @@ func (s *Subscriber) Unsubscribe(ctx context.Context) error {
 
 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
 		}
 	}
 
+	go func() {
+		ac := kadm.NewClient(s.c)
+		ticker := time.NewTicker(DefaultStatsInterval)
+
+		for {
+			select {
+			case <-ctx.Done():
+				ticker.Stop()
+				return
+			case <-ticker.C:
+				dgls, err := ac.Lag(ctx, s.opts.Group)
+				if err != nil || !dgls.Ok() {
+					continue
+				}
+
+				dgl, ok := dgls[s.opts.Group]
+				if !ok {
+					continue
+				}
+				lmap, ok := dgl.Lag[s.topic]
+				if !ok {
+					continue
+				}
+
+				s.Lock()
+				for p, l := range lmap {
+					s.kopts.Meter.Counter(semconv.BrokerGroupLag, "topic", s.topic, "group", s.opts.Group, "partition", strconv.Itoa(int(p)), "lag", strconv.Itoa(int(l.Lag)))
+				}
+				s.Unlock()
+
+			}
+		}
+	}()
+
 	for {
 		select {
 		case <-ctx.Done():
@@ -107,21 +134,12 @@ func (s *Subscriber) poll(ctx context.Context) {
 				return
 			}
 			fetches.EachError(func(t string, p int32, err error) {
-				if kgo.IsRetryableBrokerErr(err) {
-					s.kopts.Logger.Error(ctx, fmt.Sprintf("[kgo] fetch topic %s partition %d error", t, p), err)
-				} else {
 				s.kopts.Logger.Fatal(ctx, fmt.Sprintf("[kgo] fetch topic %s partition %d error", t, p), err)
-				}
 			})
 
 			fetches.EachPartition(func(p kgo.FetchTopicPartition) {
-				tps := tp{p.Topic, p.Partition}
+				tp := tp{p.Topic, p.Partition}
-				s.mu.Lock()
+				s.consumers[tp].recs <- p
-				c := s.consumers[tps]
-				s.mu.Unlock()
-				if c != nil {
-					c.recs <- p
-				}
 			})
 			s.c.AllowRebalance()
 		}
@@ -134,16 +152,9 @@ func (s *Subscriber) killConsumers(ctx context.Context, lost map[string][]int32)
 
 	for topic, partitions := range lost {
 		for _, partition := range partitions {
-			tps := tp{topic, partition}
+			tp := tp{topic, partition}
-			s.mu.Lock()
+			pc := s.consumers[tp]
-			pc, ok := s.consumers[tps]
+			delete(s.consumers, tp)
-			s.mu.Unlock()
-			if !ok {
-				continue
-			}
-			s.mu.Lock()
-			delete(s.consumers, tps)
-			s.mu.Unlock()
 			close(pc.quit)
 			if s.kopts.Logger.V(logger.DebugLevel) {
 				s.kopts.Logger.Debug(ctx, fmt.Sprintf("[kgo] waiting for work to finish topic %s partition %d", topic, partition))
@@ -154,21 +165,11 @@ func (s *Subscriber) killConsumers(ctx context.Context, lost map[string][]int32)
 	}
 }
 
-func (s *Subscriber) autocommit(_ *kgo.Client, _ *kmsg.OffsetCommitRequest, _ *kmsg.OffsetCommitResponse, err error) {
-	if err != nil {
-		//		s.connected.Store(0)
-		if s.fatalOnError {
-			s.kopts.Logger.Fatal(context.TODO(), "kgo.AutoCommitCallback error", err)
-		}
-	}
-}
-
 func (s *Subscriber) lost(ctx context.Context, _ *kgo.Client, lost map[string][]int32) {
-	if s.kopts.Logger.V(logger.ErrorLevel) {
+	if s.kopts.Logger.V(logger.DebugLevel) {
-		s.kopts.Logger.Error(ctx, fmt.Sprintf("[kgo] lost %#+v", lost))
+		s.kopts.Logger.Debug(ctx, fmt.Sprintf("[kgo] lost %#+v", lost))
 	}
 	s.killConsumers(ctx, lost)
-	// s.connected.Store(0)
 }
 
 func (s *Subscriber) revoked(ctx context.Context, c *kgo.Client, revoked map[string][]int32) {
@@ -178,7 +179,6 @@ func (s *Subscriber) revoked(ctx context.Context, c *kgo.Client, revoked map[str
 	s.killConsumers(ctx, revoked)
 	if err := c.CommitMarkedOffsets(ctx); err != nil {
 		s.kopts.Logger.Error(ctx, "[kgo] revoked CommitMarkedOffsets error", err)
-		// s.connected.Store(0)
 	}
 }
 
@@ -194,29 +194,28 @@ func (s *Subscriber) assigned(_ context.Context, c *kgo.Client, assigned map[str
 				done:      make(chan struct{}),
 				recs:      make(chan kgo.FetchTopicPartition, 100),
 				handler:   s.handler,
-				messagePool: s.messagePool,
 				kopts:     s.kopts,
 				opts:      s.opts,
-				connected:   s.connected,
 			}
-			s.mu.Lock()
+			s.Lock()
 			s.consumers[tp{topic, partition}] = pc
-			s.mu.Unlock()
+			s.Unlock()
 			go pc.consume()
 		}
 	}
 }
 
 func (pc *consumer) consume() {
-	var err error
-
 	defer close(pc.done)
 	if pc.kopts.Logger.V(logger.DebugLevel) {
 		pc.kopts.Logger.Debug(pc.kopts.Context, fmt.Sprintf("starting, topic %s partition %d", pc.topic, pc.partition))
 		defer pc.kopts.Logger.Debug(pc.kopts.Context, fmt.Sprintf("killing, topic %s partition %d", pc.topic, pc.partition))
 	}
 
-	var pm *kgoMessage
+	eh := pc.kopts.ErrorHandler
+	if pc.opts.ErrorHandler != nil {
+		eh = pc.opts.ErrorHandler
+	}
 
 	for {
 		select {
@@ -227,64 +226,97 @@ func (pc *consumer) consume() {
 				ctx, sp := pc.htracer.WithProcessSpan(record)
 				ts := time.Now()
 				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Inc()
-
+				p := eventPool.Get().(*event)
-				if pc.messagePool {
+				p.msg.Header = nil
-					pm = messagePool.Get().(*kgoMessage)
+				p.msg.Body = nil
-				} else {
+				p.topic = record.Topic
-					pm = &kgoMessage{}
+				p.err = nil
-				}
+				p.ack = false
-				pm.body = record.Value
+				p.msg.Header = metadata.New(len(record.Headers))
-				pm.topic = record.Topic
+				p.ctx = ctx
-				pm.ack = false
-				pm.hdr = metadata.New(len(record.Headers))
-				pm.ctx = ctx
 				for _, hdr := range record.Headers {
-					pm.hdr.Set(hdr.Key, string(hdr.Value))
+					p.msg.Header.Set(hdr.Key, string(hdr.Value))
 				}
-				pm.hdr.Set("Micro-Offset", strconv.FormatInt(record.Offset, 10))
+				if pc.kopts.Codec.String() == "noop" {
-				pm.hdr.Set("Micro-Partition", strconv.FormatInt(int64(record.Partition), 10))
+					p.msg.Body = record.Value
-				pm.hdr.Set("Micro-Topic", record.Topic)
+				} else if pc.opts.BodyOnly {
-				pm.hdr.Set("Micro-Key", string(record.Key))
+					p.msg.Body = record.Value
-				pm.hdr.Set("Micro-Timestamp", strconv.FormatInt(record.Timestamp.Unix(), 10))
+				} else {
-				switch h := pc.handler.(type) {
+					sp.AddEvent("codec unmarshal start")
-				case func(broker.Message) error:
+					err := pc.kopts.Codec.Unmarshal(record.Value, p.msg)
-					err = h(pm)
+					sp.AddEvent("codec unmarshal stop")
-				case func([]broker.Message) error:
-					err = h([]broker.Message{pm})
-				}
-
-				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
 					if err != nil {
-					if sp != nil {
 						sp.SetStatus(tracer.SpanStatusError, err.Error())
-					}
 						pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc()
-				} else if pc.opts.AutoAck {
+						p.err = err
-					pm.ack = true
+						p.msg.Body = record.Value
+						if eh != nil {
+							_ = eh(p)
+							pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
+							if p.ack {
+								pc.c.MarkCommitRecords(record)
+							} else {
+								eventPool.Put(p)
+								pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
+								return
 							}
-
+							eventPool.Put(p)
 							te := time.Since(ts)
 							pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
 							pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
-
+							continue
-				ack := pm.ack
-				if pc.messagePool {
-					messagePool.Put(p)
-				}
-				if ack {
-					pc.c.MarkCommitRecords(record)
 						} else {
-					if sp != nil {
+							pc.kopts.Logger.Error(pc.kopts.Context, "[kgo]: unmarshal error", err)
-						sp.Finish()
 						}
-					//					pc.connected.Store(0)
+						te := time.Since(ts)
-					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] message not commited")
+						pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
+						pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
+						pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
+						eventPool.Put(p)
+						pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] Unmarshal err not handled wtf?")
+						sp.Finish()
+						return
+					}
+				}
+				sp.AddEvent("handler start")
+				err := pc.handler(p)
+				sp.AddEvent("handler stop")
+				if err == nil {
+					pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "success").Inc()
+				} else {
+					sp.SetStatus(tracer.SpanStatusError, err.Error())
+					pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc()
+				}
+				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
+				if err == nil && pc.opts.AutoAck {
+					p.ack = true
+				} else if err != nil {
+					p.err = err
+					if eh != nil {
+						sp.AddEvent("error handler start")
+						_ = eh(p)
+						sp.AddEvent("error handler stop")
+					} else {
+						if pc.kopts.Logger.V(logger.ErrorLevel) {
+							pc.kopts.Logger.Error(pc.kopts.Context, "[kgo]: subscriber error", err)
+						}
+					}
+				}
+				te := time.Since(ts)
+				pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
+				pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
+				if p.ack {
+					eventPool.Put(p)
+					pc.c.MarkCommitRecords(record)
+				} else {
+					eventPool.Put(p)
+					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
+					sp.SetStatus(tracer.SpanStatusError, "ErrLostMessage")
+					sp.Finish()
 					return
 				}
-				if sp != nil {
 				sp.Finish()
 			}
 		}
 	}
 }
-}

tracer.go

@@ -6,14 +6,14 @@ import (
 
 	"github.com/twmb/franz-go/pkg/kgo"
 	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v3/tracer"
 )
 
 type hookTracer struct {
-	tracer   tracer.Tracer
 	clientID string
 	group    string
+	tracer   tracer.Tracer
 }
 
 var messagingSystem = semconv.MessagingSystemKey.String("kafka")
@@ -32,9 +32,6 @@ var (
 // the record's context, so it can be ended in the OnProduceRecordUnbuffered
 // hook.
 func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
-	if !m.tracer.Enabled() {
-		return
-	}
 	// Set up span options.
 	attrs := []interface{}{
 		messagingSystem,
@@ -71,7 +68,7 @@ func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
 		r.Context, _ = m.tracer.Start(r.Context, "sdk.broker", opts...)
 	}
 
-	setHeaders(r, omd, metadata.HeaderContentType)
+	setHeaders(r, omd)
 }
 
 // OnProduceRecordUnbuffered continues and ends the "publish" span for an
@@ -80,9 +77,6 @@ func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
 // It sets attributes with values unset when producing and records any error
 // that occurred during the publish operation.
 func (m *hookTracer) OnProduceRecordUnbuffered(r *kgo.Record, err error) {
-	if !m.tracer.Enabled() {
-		return
-	}
 	if span, ok := tracer.SpanFromContext(r.Context); ok {
 		span.AddLabels(
 			semconv.MessagingKafkaDestinationPartition(int(r.Partition)),
@@ -102,9 +96,6 @@ func (m *hookTracer) OnProduceRecordUnbuffered(r *kgo.Record, err error) {
 // OnFetchRecordUnbuffered hook and can be used in downstream consumer
 // processing.
 func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
-	if !m.tracer.Enabled() {
-		return
-	}
 	// Set up the span options.
 	attrs := []interface{}{
 		messagingSystem,
@@ -144,15 +135,12 @@ func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
 		r.Context, _ = m.tracer.Start(r.Context, "sdk.broker", opts...)
 	}
 
-	setHeaders(r, omd, metadata.HeaderContentType)
+	setHeaders(r, omd)
 }
 
 // OnFetchRecordUnbuffered continues and ends the "receive" span for an
 // unbuffered record.
 func (m *hookTracer) OnFetchRecordUnbuffered(r *kgo.Record, _ bool) {
-	if !m.tracer.Enabled() {
-		return
-	}
 	span, _ := tracer.SpanFromContext(r.Context)
 	span.Finish()
 }
@@ -167,13 +155,6 @@ func (m *hookTracer) OnFetchRecordUnbuffered(r *kgo.Record, _ bool) {
 // not a record which has been created for producing, so call this at the start of each
 // iteration of your processing for the record.
 func (m *hookTracer) WithProcessSpan(r *kgo.Record) (context.Context, tracer.Span) {
-	if r.Context == nil {
-		r.Context = context.Background()
-	}
-
-	if !m.tracer.Enabled() {
-		return r.Context, nil
-	}
 	// Set up the span options.
 	attrs := []interface{}{
 		messagingSystem,