Apply Code Coverage Badge

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

.github/workflows/job_coverage.yml

@@ -0,0 +1,53 @@
+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_lint.yml

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

.github/workflows/job_sync.yml

@@ -0,0 +1,94 @@
+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" ]; 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

.github/workflows/job_test.yml

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

.github/workflows/job_tests.yml

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

.golangci.yml

@@ -1,21 +1,5 @@
 run:
   concurrency: 8
-  deadline: 5m
+  timeout: 5m
   issues-exit-code: 1
   tests: true
-
-linters:
-  enable:
-    - staticcheck
-    - unused
-    - gosimple
-    - govet
-    - prealloc
-    - unconvert
-    - nakedret
-
-linters-settings:
-  govet:
-    check-all: true
-    enable:
-      - fieldalignment

README.md

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

broker.go

@@ -1,69 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"net"
-	"sync/atomic"
-	"time"
-
-	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/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) {
-	if err != nil {
-		m.connected.Store(0)
-		if m.fatalOnError {
-			m.log.Fatal(context.TODO(), "kgo.OnGroupManageError", err)
-		}
-	}
-}
-
-func (m *hookEvent) OnBrokerConnect(_ kgo.BrokerMetadata, _ time.Duration, _ net.Conn, err error) {
-	if err != nil {
-		m.connected.Store(0)
-		if m.fatalOnError {
-			m.log.Fatal(context.TODO(), "kgo.OnBrokerConnect", err)
-		}
-	}
-}
-
-func (m *hookEvent) OnBrokerDisconnect(_ kgo.BrokerMetadata, _ net.Conn) {
-	m.connected.Store(0)
-}
-
-func (m *hookEvent) OnBrokerWrite(_ kgo.BrokerMetadata, _ int16, _ int, _ time.Duration, _ time.Duration, err error) {
-	if err != nil {
-		m.connected.Store(0)
-		if m.fatalOnError {
-			m.log.Fatal(context.TODO(), "kgo.OnBrokerWrite", err)
-		}
-	}
-}
-
-func (m *hookEvent) OnBrokerRead(_ kgo.BrokerMetadata, _ int16, _ int, _ time.Duration, _ time.Duration, err error) {
-	if err != nil {
-		m.connected.Store(0)
-	}
-}
-
-func (m *hookEvent) OnProduceRecordUnbuffered(_ *kgo.Record, err error) {
-	if err != nil {
-		m.connected.Store(0)
-	}
-}

carrier.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
 )
 
 // RecordCarrier injects and extracts traces from a kgo.Record.
@@ -77,7 +77,7 @@ loop:
 		for i := 0; i < len(r.Headers); i++ {
 			if strings.EqualFold(r.Headers[i].Key, k) {
 				// Key exist, update the value.
-				r.Headers[i].Value = []byte(v)
+				r.Headers[i].Value = []byte(strings.Join(v, ","))
 				continue loop
 			}
 		}
@@ -85,7 +85,7 @@ loop:
 		// Key does not exist, append new header.
 		r.Headers = append(r.Headers, kgo.RecordHeader{
 			Key:   k,
-			Value: []byte(v),
+			Value: []byte(strings.Join(v, ",")),
 		})
 
 		seen[k] = struct{}{}

errors.go

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

event.go

@@ -1,50 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"sync"
-
-	"go.unistack.org/micro/v3/broker"
-)
-
-type event struct {
-	msg *broker.Message
-	err error
-	ctx context.Context
-
-	topic string
-
-	sync.RWMutex
-	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,27 @@
-module go.unistack.org/micro-broker-kgo/v3
+module go.unistack.org/micro-broker-kgo/v4
 
-go 1.23.0
+go 1.23.8
 
 require (
-	github.com/google/uuid v1.6.0
+	github.com/stretchr/testify v1.10.0
-	github.com/twmb/franz-go v1.18.1
+	github.com/twmb/franz-go v1.19.5
-	github.com/twmb/franz-go/pkg/kadm v1.15.0
+	github.com/twmb/franz-go/pkg/kadm v1.16.0
-	github.com/twmb/franz-go/pkg/kmsg v1.9.0
+	github.com/twmb/franz-go/pkg/kfake v0.0.0-20250508175730-72e1646135e3
-	go.opentelemetry.io/otel v1.34.0
+	github.com/twmb/franz-go/pkg/kmsg v1.11.2
-	go.unistack.org/micro/v3 v3.11.41
+	go.opentelemetry.io/otel v1.36.0
+	go.unistack.org/micro/v4 v4.1.17
 )
 
 require (
-	github.com/ash3in/uuidv8 v1.2.0 // indirect
+	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.18.0 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
 	github.com/matoous/go-nanoid v1.5.1 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	golang.org/x/crypto v0.35.0 // indirect
+	github.com/spf13/cast v1.9.2 // indirect
-	golang.org/x/sys v0.30.0 // indirect
+	go.unistack.org/micro-proto/v4 v4.1.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 // indirect
+	golang.org/x/crypto v0.39.0 // indirect
-	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,18 +1,11 @@
-github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
-github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
-github.com/ash3in/uuidv8 v1.2.0 h1:2oogGdtCPwaVtyvPPGin4TfZLtOGE5F+W++E880G6SI=
-github.com/ash3in/uuidv8 v1.2.0/go.mod h1:BnU0wJBxnzdEKmVg4xckBkD+VZuecTFTUP3M0dWgyY4=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 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/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+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.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+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.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -23,58 +16,32 @@ github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIc
 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/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 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.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/spf13/cast v1.9.2 h1:SsGfm7M8QOFtEzumm7UZrZdLLquNdzFYfIbEXntcFbE=
+github.com/spf13/cast v1.9.2/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/twmb/franz-go v1.18.0 h1:25FjMZfdozBywVX+5xrWC2W+W76i0xykKjTdEeD2ejw=
+github.com/twmb/franz-go v1.19.5 h1:W7+o8D0RsQsedqib71OVlLeZ0zI6CbFra7yTYhZTs5Y=
-github.com/twmb/franz-go v1.18.0/go.mod h1:zXCGy74M0p5FbXsLeASdyvfLFsBvTubVqctIaa5wQ+I=
+github.com/twmb/franz-go v1.19.5/go.mod h1:4kFJ5tmbbl7asgwAGVuyG1ZMx0NNpYk7EqflvWfPCpM=
-github.com/twmb/franz-go v1.18.1 h1:D75xxCDyvTqBSiImFx2lkPduE39jz1vaD7+FNc+vMkc=
+github.com/twmb/franz-go/pkg/kadm v1.16.0 h1:STMs1t5lYR5mR974PSiwNzE5TvsosByTp+rKXLOhAjE=
-github.com/twmb/franz-go v1.18.1/go.mod h1:Uzo77TarcLTUZeLuGq+9lNpSkfZI+JErv7YJhlDjs9M=
+github.com/twmb/franz-go/pkg/kadm v1.16.0/go.mod h1:MUdcUtnf9ph4SFBLLA/XxE29rvLhWYLM9Ygb8dfSCvw=
-github.com/twmb/franz-go/pkg/kadm v1.14.0 h1:nAn1co1lXzJQocpzyIyOFOjUBf4WHWs5/fTprXy2IZs=
+github.com/twmb/franz-go/pkg/kfake v0.0.0-20250508175730-72e1646135e3 h1:p24opKWPySAy8xSl8NqRgOv7Q+bX7kdrQirBVRJzQfo=
-github.com/twmb/franz-go/pkg/kadm v1.14.0/go.mod h1:XjOPz6ZaXXjrW2jVCfLuucP8H1w2TvD6y3PT2M+aAM4=
+github.com/twmb/franz-go/pkg/kfake v0.0.0-20250508175730-72e1646135e3/go.mod h1:7uQs3Ae6HkWT1Y9elMbqtAcNFCI0y6+iS+Phw49L49U=
-github.com/twmb/franz-go/pkg/kadm v1.15.0 h1:Yo3NAPfcsx3Gg9/hdhq4vmwO77TqRRkvpUcGWzjworc=
+github.com/twmb/franz-go/pkg/kmsg v1.11.2 h1:hIw75FpwcAjgeyfIGFqivAvwC5uNIOWRGvQgZhH4mhg=
-github.com/twmb/franz-go/pkg/kadm v1.15.0/go.mod h1:MUdcUtnf9ph4SFBLLA/XxE29rvLhWYLM9Ygb8dfSCvw=
+github.com/twmb/franz-go/pkg/kmsg v1.11.2/go.mod h1:CFfkkLysDNmukPYhGzuUcDtf46gQSqCZHMW1T4Z+wDE=
-github.com/twmb/franz-go/pkg/kmsg v1.9.0 h1:JojYUph2TKAau6SBtErXpXGC7E3gg4vGZMv9xFU/B6M=
+go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
-github.com/twmb/franz-go/pkg/kmsg v1.9.0/go.mod h1:CMbfazviCyY6HM0SXuG5t9vOwYDHRCSrJJyBAe5paqg=
+go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
-go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
+go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk=
-go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
+go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
-go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.unistack.org/micro/v4 v4.1.17 h1:26QDtRSYVpozYuassyvLP4sEQRo3dxgD3sVILRXmIPo=
-go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.unistack.org/micro/v4 v4.1.17/go.mod h1:xleO2M5Yxh4s6I+RUcLrEpUjobefh+71ctrdIfn7TUs=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
-go.unistack.org/micro/v3 v3.11.37 h1:ZcpnXAYEMcAwmnVb5b7o8/PylGnILxXMHaUlRrPmRI0=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-go.unistack.org/micro/v3 v3.11.37/go.mod h1:POGU5hstnAT9LH70m8FalyQSNi2GfIew71K75JenIZk=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
-go.unistack.org/micro/v3 v3.11.41 h1:dP4sBLIZpMo+MWGe5bbESewK8wBzYm4Yik/67x4dEtQ=
-go.unistack.org/micro/v3 v3.11.41/go.mod h1:POGU5hstnAT9LH70m8FalyQSNi2GfIew71K75JenIZk=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
-golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 h1:Z7FRVJPSMaHQxD0uXU8WdgFh8PseLM8Q8NzhnpMrBhQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 h1:ZSlhAUqC4r8TPzqLXQ0m3upBNZeF+Y8jQ3c4CR3Ujms=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
-google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
-google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
-google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
-google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
-google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
-google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 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=

hook_event.go

@@ -0,0 +1,108 @@
+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

@@ -0,0 +1,471 @@
+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")
+}

kgo.go

@@ -11,19 +11,27 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/google/uuid"
 	"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/codec"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v3/semconv"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/options"
-	mrand "go.unistack.org/micro/v3/util/rand"
+	"go.unistack.org/micro/v4/semconv"
+	"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 {
@@ -56,6 +64,8 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
 }()
 
 type Broker struct {
+	funcPublish   broker.FuncPublish
+	funcSubscribe broker.FuncSubscribe
 	c             *kgo.Client
 	connected     *atomic.Uint32
 
@@ -64,7 +74,7 @@ type Broker struct {
 
 	opts broker.Options
 
-	sync.RWMutex
+	mu   sync.RWMutex
 	init bool
 }
 
@@ -92,6 +102,74 @@ 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
@@ -142,11 +220,9 @@ 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
+	}
 }
 
 func (k *Broker) Connect(ctx context.Context) error {
@@ -164,10 +240,10 @@ func (k *Broker) Connect(ctx context.Context) error {
 		return err
 	}
 
-	k.Lock()
+	k.mu.Lock()
 	k.c = c
 	k.connected.Store(1)
-	k.Unlock()
+	k.mu.Unlock()
 
 	return nil
 }
@@ -185,8 +261,8 @@ func (k *Broker) Disconnect(ctx context.Context) error {
 	ctx, span = k.opts.Tracer.Start(ctx, "Disconnect")
 	defer span.Finish()
 
-	k.Lock()
+	k.mu.Lock()
-	defer k.Unlock()
+	defer k.mu.Unlock()
 	select {
 	case <-nctx.Done():
 		return nctx.Err()
@@ -210,8 +286,8 @@ func (k *Broker) Disconnect(ctx context.Context) error {
 }
 
 func (k *Broker) Init(opts ...broker.Option) error {
-	k.Lock()
+	k.mu.Lock()
-	defer k.Unlock()
+	defer k.mu.Unlock()
 
 	if len(opts) == 0 && k.init {
 		return nil
@@ -240,6 +316,18 @@ 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
@@ -249,101 +337,93 @@ func (k *Broker) Options() broker.Options {
 	return k.opts
 }
 
-func (k *Broker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (b *Broker) Publish(ctx context.Context, topic string, messages ...broker.Message) error {
-	return k.publish(ctx, msgs, opts...)
+	return b.funcPublish(ctx, topic, messages...)
 }
 
-func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
+func (b *Broker) fnPublish(ctx context.Context, topic string, messages ...broker.Message) error {
-	msg.Header.Set(metadata.HeaderTopic, topic)
+	return b.publish(ctx, topic, messages...)
-	return k.publish(ctx, []*broker.Message{msg}, opts...)
 }
 
-func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.Message) error {
-	k.Lock()
+	var records []*kgo.Record
-	if k.connected.Load() == 0 {
+
-		c, _, err := k.connect(ctx, k.kopts...)
+	for _, msg := range messages {
-		if err != nil {
+
-			k.Unlock()
+		rec := &kgo.Record{
-			return err
+			Context: msg.Context(),
-		}
+			Topic:   topic,
-		k.c = c
+			Value:   msg.Body(),
-		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 options.Context != nil {
+			if k, ok := rec.Context.Value(messageKey{}).([]byte); ok && k != nil {
-		if k, ok := options.Context.Value(publishKey{}).([]byte); ok && k != nil {
+				rec.Key = k
-			key = k
 			}
-		if p, ok := options.Context.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
+			if p, ok := rec.Context.Value(messagePromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
 				promise = p
 			}
 		}
 
-	for _, msg := range msgs {
+		kmsg, ok := msg.(*kgoMessage)
-		rec := &kgo.Record{Context: ctx, Key: key}
+		if !ok {
+			continue
+		}
+		if kmsg.opts.Context != nil {
+			if k, ok := kmsg.opts.Context.Value(messageKey{}).([]byte); ok && k != nil {
+				rec.Key = k
+			}
+			if p, ok := kmsg.opts.Context.Value(messagePromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
+				promise = p
+			}
+		}
 
-		rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
+		setHeaders(rec, msg.Header())
-		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
-			setHeaders(rec, msg.Header)
-		} else {
-			rec.Value, err = k.opts.Codec.Marshal(msg)
-			if err != nil {
-				return err
-			}
-		}
-		records = append(records, rec)
-	}
 
 		if promise != nil {
 			ts := time.Now()
-		for _, rec := range records {
+			b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
-			k.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
+			b.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
 				te := time.Since(ts)
-				k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Dec()
+				b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Dec()
-				k.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
+				b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
-				k.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
+				b.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
 				if err != nil {
-					k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "failure").Inc()
+					b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "failure").Inc()
 				} else {
-					k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "success").Inc()
+					b.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 {
-		k.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
+			b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "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.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
-		k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
+			b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
 			if result.Err != nil {
-			k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
+				b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
 				errs = append(errs, result.Err.Error())
 			} else {
-			k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "success").Inc()
+				b.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
 }
@@ -364,33 +444,50 @@ func (k *Broker) TopicExists(ctx context.Context, topic string) error {
 	return nil
 }
 
-func (k *Broker) BatchSubscribe(_ context.Context, _ string, _ broker.BatchHandler, _ ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (b *Broker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	return nil, nil
+	return b.funcSubscribe(ctx, topic, handler, opts...)
 }
 
-func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+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
+	}
+
 	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 := uuid.NewRandom()
+		uid, err := id.New()
 		if err != nil {
 			return nil, err
 		}
-		options.Group = uid.String()
+		options.Group = uid
 	}
 
 	commitInterval := DefaultCommitInterval
-	if k.opts.Context != nil {
+	if b.opts.Context != nil {
-		if v, ok := k.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
+		if v, ok := b.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
 			commitInterval = v
 		}
 	}
 
+	var messagePool bool
 	var fatalOnError bool
-	if k.opts.Context != nil {
+	if b.opts.Context != nil {
-		if v, ok := k.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
+		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 {
@@ -403,14 +500,15 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 		topic:        topic,
 		opts:         options,
 		handler:      handler,
-		kopts:        k.opts,
+		kopts:        b.opts,
 		consumers:    make(map[tp]*consumer),
 		done:         make(chan struct{}),
 		fatalOnError: fatalOnError,
-		connected:    k.connected,
+		connected:    b.connected,
+		messagePool:  messagePool,
 	}
 
-	kopts := append(k.kopts,
+	kopts := append(b.kopts,
 		kgo.ConsumerGroup(options.Group),
 		kgo.ConsumeTopics(topic),
 		kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
@@ -430,7 +528,7 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 		}
 	}
 
-	c, htracer, err := k.connect(ctx, kopts...)
+	c, htracer, err := b.connect(ctx, kopts...)
 	if err != nil {
 		return nil, err
 	}
@@ -452,9 +550,10 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 
 	go sub.poll(ctx)
 
-	k.Lock()
+	b.mu.Lock()
-	k.subs = append(k.subs, sub)
+	b.subs = append(b.subs, sub)
-	k.Unlock()
+	b.mu.Unlock()
+
 	return sub, nil
 }
 

kgo_test.go

@@ -2,54 +2,51 @@ package kgo_test
 
 import (
 	"context"
-	"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/v3"
+	kgo "go.unistack.org/micro-broker-kgo/v4"
-	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v4/broker"
-	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v3/logger/slog"
+	"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)
 	group    = "38"
 	prefill  = true
-	loglevel = logger.DebugLevel
+	loglevel = logger.ErrorLevel
+	cluster  *kfake.Cluster
 )
 
-var bm = &broker.Message{
+func TestMain(m *testing.M) {
-	Header: map[string]string{"hkey": "hval", metadata.HeaderTopic: "test"},
+	cluster = kfake.MustCluster(
-	Body:   []byte(`"body"`),
+		kfake.AllowAutoTopicCreation(),
+	)
+	defer cluster.Close()
+	m.Run()
 }
 
 func TestFail(t *testing.T) {
-	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
-		t.Skip()
-	}
-
 	logger.DefaultLogger = slog.NewLogger()
 	if err := logger.DefaultLogger.Init(logger.WithLevel(loglevel)); err != nil {
 		t.Fatal(err)
 	}
 	ctx := context.Background()
 
-	var addrs []string
-	if addr := os.Getenv("BROKER_ADDRS"); len(addr) == 0 {
-		addrs = []string{"127.0.0.1:9092"}
-	} else {
-		addrs = strings.Split(addr, ",")
-	}
-
 	b := kgo.NewBroker(
-		broker.Addrs(addrs...),
+		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),
+		kgo.Options(
+			kg.ClientID("test"),
+			kg.FetchMaxBytes(10*1024*1024),
 			kg.AllowAutoTopicCreation(),
 		),
 	)
@@ -72,34 +69,41 @@ func TestFail(t *testing.T) {
 	}()
 
 	t.Logf("broker health %v", b.Health())
-	msgs := make([]*broker.Message, 0, msgcnt)
+	msgs := make([]broker.Message, 0, msgcnt)
 	for i := int64(0); i < msgcnt; i++ {
-		msgs = append(msgs, bm)
+		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")
+			//		t.Logf("broker publish")
-		if err := b.Publish(ctx, "test", msg); err != nil {
+			if err := b.Publish(ctx, "test.fail", msg); err != nil {
 				t.Fatal(err)
 			}
 		}
+	}()
 	//	t.Skip()
 
 	idx := int64(0)
-	fn := func(msg broker.Event) error {
+	fn := func(msg broker.Message) error {
 		atomic.AddInt64(&idx, 1)
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
-		t.Logf("ack")
+		// t.Logf("ack")
 		return msg.Ack()
 	}
 
-	sub, err := b.Subscribe(ctx, "test", fn,
+	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)
@@ -112,17 +116,26 @@ func TestFail(t *testing.T) {
 			t.Logf("health works")
 			break
 		}
-		time.Sleep(1 * time.Second)
+		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.Addrs(addrs...),
+		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)),
+		kgo.Options(
+			kg.ClientID("test"),
+			kg.FetchMaxBytes(10*1024*1024),
+			kg.AllowAutoTopicCreation(),
+		),
 	)
 	if err := b.Init(); err != nil {
 		t.Fatal(err)
@@ -134,26 +147,21 @@ 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()
 
-	var addrs []string
-	if addr := os.Getenv("BROKER_ADDRS"); len(addr) == 0 {
-		addrs = []string{"127.0.0.1:29091", "127.0.0.2:29092", "127.0.0.3:29093"}
-	} else {
-		addrs = strings.Split(addr, ",")
-	}
-
 	b := kgo.NewBroker(
-		broker.Addrs(addrs...),
+		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)),
+		kgo.Options(
+			kg.ClientID("test"),
+			kg.FetchMaxBytes(10*1024*1024),
+			kg.AllowAutoTopicCreation(),
+		),
 	)
 
 	if err := b.Init(); err != nil {
@@ -170,25 +178,26 @@ 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++ {
-			msgs = append(msgs, bm)
+			m, _ := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
+			msgs = append(msgs, m)
 		}
 
-		if err := b.BatchPublish(ctx, msgs); err != nil {
+		if err := b.Publish(ctx, "test.pubsub", msgs...); err != nil {
 			t.Fatal(err)
 		}
 		//	t.Skip()
 	}
 	done := make(chan bool, 1)
 	idx := int64(0)
-	fn := func(msg broker.Event) error {
+	fn := func(msg broker.Message) error {
 		atomic.AddInt64(&idx, 1)
 		// time.Sleep(200 * time.Millisecond)
 		return msg.Ack()
 	}
 
-	sub, err := b.Subscribe(ctx, "test", fn,
+	sub, err := b.Subscribe(ctx, "test.pubsub", fn,
 		broker.SubscribeAutoAck(true),
 		broker.SubscribeGroup(group),
 		broker.SubscribeBodyOnly(true))
@@ -213,7 +222,7 @@ func TestPubSub(t *testing.T) {
 				if prc := atomic.LoadInt64(&idx); prc == msgcnt {
 					close(done)
 				} else {
-					t.Logf("processed %v\n", prc)
+					t.Logf("processed %v of %v\n", prc, msgcnt)
 				}
 			case <-ticker.C:
 				close(done)

logger.go

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

meter.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v4/meter"
 )
 
 type hookMeter struct {

options.go

@@ -5,8 +5,7 @@ import (
 	"time"
 
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v4/broker"
-	"go.unistack.org/micro/v3/client"
 )
 
 var (
@@ -28,16 +27,11 @@ func SubscribeContext(ctx context.Context) broker.SubscribeOption {
 	return broker.SetSubscribeOption(subscribeContextKey{}, ctx)
 }
 
-type publishKey struct{}
+type messageKey struct{}
 
-// PublishKey set the kafka message key (broker option)
+// MessageKey set the kafka message key (broker option)
-func PublishKey(key []byte) broker.PublishOption {
+func MessageKey(key []byte) broker.MessageOption {
-	return broker.SetPublishOption(publishKey{}, key)
+	return broker.SetMessageOption(messageKey{}, key)
-}
-
-// ClientPublishKey set the kafka message key (client option)
-func ClientPublishKey(key []byte) client.PublishOption {
-	return client.SetPublishOption(publishKey{}, key)
 }
 
 type optionsKey struct{}
@@ -109,14 +103,16 @@ func SubscribeFatalOnError(b bool) broker.SubscribeOption {
 	return broker.SetSubscribeOption(fatalOnErrorKey{}, b)
 }
 
-type publishPromiseKey struct{}
+type messagePromiseKey struct{}
 
-// PublishPromise set the kafka promise func for Produce
+// MessagePromise set the kafka promise func for Produce
-func PublishPromise(fn func(*kgo.Record, error)) broker.PublishOption {
+func MessagePromise(fn func(*kgo.Record, error)) broker.MessageOption {
-	return broker.SetPublishOption(publishPromiseKey{}, fn)
+	return broker.SetMessageOption(messagePromiseKey{}, fn)
 }
 
-// ClientPublishKey set the kafka message key (client option)
+type subscribeMessagePoolKey struct{}
-func ClientPublishPromise(fn func(*kgo.Record, error)) client.PublishOption {
+
-	return client.SetPublishOption(publishPromiseKey{}, fn)
+// SubscribeMessagePool optionaly enabled/disable message pool
+func SubscribeMessagePool(b bool) broker.SubscribeOption {
+	return broker.SetSubscribeOption(subscribeMessagePoolKey{}, b)
 }

subscriber.go

@@ -11,11 +11,11 @@ import (
 	"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 {
@@ -33,8 +33,9 @@ type consumer struct {
 	kopts       broker.Options
 	partition   int32
 	opts        broker.SubscribeOptions
-	handler   broker.Handler
+	handler     interface{}
 	connected   *atomic.Uint32
+	messagePool bool
 }
 
 type Subscriber struct {
@@ -42,14 +43,13 @@ type Subscriber struct {
 	c            *kgo.Client
 	htracer      *hookTracer
 	topic        string
-
+	messagePool  bool
-	handler broker.Handler
+	handler      interface{}
 	done         chan struct{}
 	kopts        broker.Options
 	opts         broker.SubscribeOptions
-
 	connected    *atomic.Uint32
-	sync.RWMutex
+	mu           sync.RWMutex
 	closed       bool
 	fatalOnError bool
 }
@@ -117,11 +117,11 @@ func (s *Subscriber) poll(ctx context.Context) {
 					continue
 				}
 
-				s.Lock()
+				s.mu.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.kopts.Meter.Counter(semconv.BrokerGroupLag, "topic", s.topic, "group", s.opts.Group, "partition", strconv.Itoa(int(p))).Set(uint64(l.Lag))
 				}
-				s.Unlock()
+				s.mu.Unlock()
 
 			}
 		}
@@ -146,7 +146,12 @@ func (s *Subscriber) poll(ctx context.Context) {
 
 			fetches.EachPartition(func(p kgo.FetchTopicPartition) {
 				tps := tp{p.Topic, p.Partition}
-				s.consumers[tps].recs <- p
+				s.mu.Lock()
+				c := s.consumers[tps]
+				s.mu.Unlock()
+				if c != nil {
+					c.recs <- p
+				}
 			})
 			s.c.AllowRebalance()
 		}
@@ -160,8 +165,15 @@ func (s *Subscriber) killConsumers(ctx context.Context, lost map[string][]int32)
 	for topic, partitions := range lost {
 		for _, partition := range partitions {
 			tps := tp{topic, partition}
-			pc := s.consumers[tps]
+			s.mu.Lock()
+			pc, ok := s.consumers[tps]
+			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))
@@ -174,7 +186,7 @@ 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)
+		//		s.connected.Store(0)
 		if s.fatalOnError {
 			s.kopts.Logger.Fatal(context.TODO(), "kgo.AutoCommitCallback error", err)
 		}
@@ -212,29 +224,29 @@ 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.Lock()
+			s.mu.Lock()
 			s.consumers[tp{topic, partition}] = pc
-			s.Unlock()
+			s.mu.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))
 	}
 
-	eh := pc.kopts.ErrorHandler
+	var pm *kgoMessage
-	if pc.opts.ErrorHandler != nil {
-		eh = pc.opts.ErrorHandler
-	}
 
 	for {
 		select {
@@ -245,100 +257,64 @@ 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)
+
-				p.msg.Header = nil
+				if pc.messagePool {
-				p.msg.Body = nil
+					pm = messagePool.Get().(*kgoMessage)
-				p.topic = record.Topic
+				} else {
-				p.err = nil
+					pm = &kgoMessage{}
-				p.ack = false
+				}
-				p.msg.Header = metadata.New(len(record.Headers))
+				pm.body = record.Value
-				p.ctx = ctx
+				pm.topic = record.Topic
+				pm.ack = false
+				pm.hdr = metadata.New(len(record.Headers))
+				pm.ctx = ctx
 				for _, hdr := range record.Headers {
-					p.msg.Header.Set(hdr.Key, string(hdr.Value))
+					pm.hdr.Set(hdr.Key, string(hdr.Value))
 				}
-				if pc.kopts.Codec.String() == "noop" {
+				pm.hdr.Set("Micro-Offset", strconv.FormatInt(record.Offset, 10))
-					p.msg.Body = record.Value
+				pm.hdr.Set("Micro-Partition", strconv.FormatInt(int64(record.Partition), 10))
-				} else if pc.opts.BodyOnly {
+				pm.hdr.Set("Micro-Topic", record.Topic)
-					p.msg.Body = record.Value
+				pm.hdr.Set("Micro-Key", string(record.Key))
-				} else {
+				pm.hdr.Set("Micro-Timestamp", strconv.FormatInt(record.Timestamp.Unix(), 10))
-					sp.AddEvent("codec unmarshal start")
+				switch h := pc.handler.(type) {
-					err := pc.kopts.Codec.Unmarshal(record.Value, p.msg)
+				case func(broker.Message) error:
-					sp.AddEvent("codec unmarshal stop")
+					err = h(pm)
+				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()
-						p.err = err
+				} else if pc.opts.AutoAck {
-						p.msg.Body = record.Value
+					pm.ack = true
-						if eh != nil {
+				}
-							_ = eh(p)
+
-							pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
+				te := time.Since(ts)
-							if p.ack {
+				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())
+
+				ack := pm.ack
+				if pc.messagePool {
+					messagePool.Put(p)
+				}
+				if ack {
 					pc.c.MarkCommitRecords(record)
 				} else {
-								eventPool.Put(p)
+					if sp != nil {
-								pc.connected.Store(0)
+						sp.Finish()
-								pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
+					}
+					//					pc.connected.Store(0)
+					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] message not commited")
 					return
 				}
-							eventPool.Put(p)
+				if sp != nil {
-							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
-						} else {
-							pc.kopts.Logger.Error(pc.kopts.Context, "[kgo]: unmarshal error", err)
-						}
-						te := time.Since(ts)
-						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.connected.Store(0)
-						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.connected.Store(0)
-					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
-					sp.SetStatus(tracer.SpanStatusError, "ErrLostMessage")
-					sp.Finish()
-					return
-				}
-				sp.Finish()
-			}
 		}
 	}
 }

tracer.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/twmb/franz-go/pkg/kgo"
 	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 type hookTracer struct {
@@ -32,6 +32,9 @@ 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,
@@ -77,6 +80,9 @@ 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)),
@@ -96,6 +102,9 @@ 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,
@@ -141,6 +150,9 @@ func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
 // 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()
 }
@@ -155,6 +167,13 @@ 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,