remove noisy logs from event hooks and add tests (#192 )

[v3] update ci (#187 )
* update ci * attempt to fix lint/test job * attempt to fix lint/test job
2025-07-10 10:49:49 +03:00 · 2025-06-10 16:22:25 +03:00 · 2025-05-21 11:56:47 +03:00 · 2025-05-21 11:36:28 +03:00 · 2025-05-21 11:26:54 +03:00 · 2025-05-21 08:35:30 +03:00
23 changed files with 861 additions and 348 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
--- a/.github/ISSUE_TEMPLATE/feature-request---enhancement.md
+++ b/.github/ISSUE_TEMPLATE/feature-request---enhancement.md
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
--- a/.github/workflows/job_coverage.yml
+++ b/.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 }}
--- a/.github/workflows/job_lint.yml
+++ b/.github/workflows/job_lint.yml
@@ -3,10 +3,10 @@ name: lint
 on:
  pull_request:
    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
+    branches: [ master, v3, v4 ]
+    paths-ignore:
+      - '.github/**'
+      - '.gitea/**'

 jobs:
  lint:
@@ -20,10 +20,10 @@ jobs:
      uses: actions/setup-go@v5
      with:
        cache-dependency-path: "**/*.sum"
-        go-version: 'stable' 
+        go-version: 'stable'
    - 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'
--- a/.github/workflows/job_test.yml
+++ b/.github/workflows/job_test.yml
@@ -3,15 +3,12 @@ name: test
 on:
  pull_request:
    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
+    branches: [ master, v3, v4 ]
  push:
-    branches:
-    - master
-    - v3
-    - v4
+    branches: [ master, v3, v4 ]
+    paths-ignore:
+      - '.github/**'
+      - '.gitea/**'

 jobs:
  test:
--- a/.github/workflows/job_tests.yml
+++ b/.github/workflows/job_tests.yml
@@ -3,15 +3,12 @@ name: test
 on:
  pull_request:
    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
+    branches: [ master, v3, v4 ]
  push:
-    branches:
-    - master
-    - v3
-    - v4
+    branches: [ master, v3, v4 ]
+    paths-ignore:
+      - '.github/**'
+      - '.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        
+        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        
+        go test -mod readonly -v ./... || true
--- a/.golangci.yml
+++ b/.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
--- a/carrier.go
+++ b/carrier.go
@@ -6,7 +6,7 @@ import (
 	"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.
@@ -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(strings.Join(v, ","))
+				r.Headers[i].Value = []byte(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(strings.Join(v, ",")),
+			Value: []byte(v),
 		})

 		seen[k] = struct{}{}
--- a/errors.go
+++ b/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)
+}
--- a/event.go
+++ b/event.go
@@ -0,0 +1,50 @@
+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{}}
+	},
+}
--- a/go.mod
+++ b/go.mod
@@ -1,24 +1,32 @@
-module go.unistack.org/micro-broker-kgo/v4
+module go.unistack.org/micro-broker-kgo/v3

-go 1.23.0
+go 1.23.8
+
+toolchain go1.24.3

 require (
-	github.com/twmb/franz-go v1.18.1
-	github.com/twmb/franz-go/pkg/kadm v1.15.0
-	github.com/twmb/franz-go/pkg/kmsg v1.9.0
+	github.com/google/uuid v1.6.0
+	github.com/stretchr/testify v1.10.0
+	github.com/twmb/franz-go v1.19.5
+	github.com/twmb/franz-go/pkg/kadm v1.16.0
+	github.com/twmb/franz-go/pkg/kmsg v1.11.2
 	go.opentelemetry.io/otel v1.34.0
-	go.unistack.org/micro/v4 v4.1.4
+	go.unistack.org/micro/v3 v3.11.44
 )

 require (
 	github.com/ash3in/uuidv8 v1.2.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // 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
-	github.com/spf13/cast v1.7.1 // indirect
-	go.unistack.org/micro-proto/v4 v4.1.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 // indirect
+	google.golang.org/grpc v1.70.0 // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -2,10 +2,11 @@ github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7Oputl
 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/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -20,28 +21,38 @@ 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.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
-github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 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.1 h1:D75xxCDyvTqBSiImFx2lkPduE39jz1vaD7+FNc+vMkc=
-github.com/twmb/franz-go v1.18.1/go.mod h1:Uzo77TarcLTUZeLuGq+9lNpSkfZI+JErv7YJhlDjs9M=
-github.com/twmb/franz-go/pkg/kadm v1.15.0 h1:Yo3NAPfcsx3Gg9/hdhq4vmwO77TqRRkvpUcGWzjworc=
-github.com/twmb/franz-go/pkg/kadm v1.15.0/go.mod h1:MUdcUtnf9ph4SFBLLA/XxE29rvLhWYLM9Ygb8dfSCvw=
-github.com/twmb/franz-go/pkg/kmsg v1.9.0 h1:JojYUph2TKAau6SBtErXpXGC7E3gg4vGZMv9xFU/B6M=
-github.com/twmb/franz-go/pkg/kmsg v1.9.0/go.mod h1:CMbfazviCyY6HM0SXuG5t9vOwYDHRCSrJJyBAe5paqg=
+github.com/twmb/franz-go v1.19.5 h1:W7+o8D0RsQsedqib71OVlLeZ0zI6CbFra7yTYhZTs5Y=
+github.com/twmb/franz-go v1.19.5/go.mod h1:4kFJ5tmbbl7asgwAGVuyG1ZMx0NNpYk7EqflvWfPCpM=
+github.com/twmb/franz-go/pkg/kadm v1.16.0 h1:STMs1t5lYR5mR974PSiwNzE5TvsosByTp+rKXLOhAjE=
+github.com/twmb/franz-go/pkg/kadm v1.16.0/go.mod h1:MUdcUtnf9ph4SFBLLA/XxE29rvLhWYLM9Ygb8dfSCvw=
+github.com/twmb/franz-go/pkg/kmsg v1.11.2 h1:hIw75FpwcAjgeyfIGFqivAvwC5uNIOWRGvQgZhH4mhg=
+github.com/twmb/franz-go/pkg/kmsg v1.11.2/go.mod h1:CFfkkLysDNmukPYhGzuUcDtf46gQSqCZHMW1T4Z+wDE=
 go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
 go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
-go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk=
-go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
-go.unistack.org/micro/v4 v4.1.4 h1:gyjVPP9g7UAFZlhEbla9Ih/BeKJfBLAbN/NvAhJCpKU=
-go.unistack.org/micro/v4 v4.1.4/go.mod h1:lr3oYED8Ay1vjK68QqRw30QOtdk/ffpZqMFDasOUhKw=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+go.unistack.org/micro/v3 v3.11.44 h1:A+T8zVcL2vlL66kn/Y4rqhtBybLO829wFEYZJYorDOU=
+go.unistack.org/micro/v3 v3.11.44/go.mod h1:13EFW2ps3BN9mpYbp9K0oQu/VDjEN6LJ4wwdom7hcXQ=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
+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.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+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.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
+google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
 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=
--- a/hook_event.go
+++ b/hook_event.go
@@ -7,13 +7,13 @@ import (
 	"time"

 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
 )

 type hookEvent struct {
 	log          logger.Logger
-	fatalOnError bool
 	connected    *atomic.Uint32
+	fatalOnError bool
 }

 var (
@@ -26,44 +26,48 @@ var (
 )

 func (m *hookEvent) OnGroupManageError(err error) {
-	if err != nil {
-		m.connected.Store(0)
-		if m.fatalOnError {
-			m.log.Fatal(context.TODO(), "kgo.OnGroupManageError", err)
-		}
+	switch {
+	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
+		return
+	default:
+		m.log.Error(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)
-		}
+	switch {
+	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
+		return
+	default:
+		m.log.Error(context.TODO(), "kgo.OnBrokerConnect", err)
 	}
 }

-func (m *hookEvent) OnBrokerDisconnect(_ kgo.BrokerMetadata, _ net.Conn) {
-	m.connected.Store(0)
-}
+func (m *hookEvent) OnBrokerDisconnect(_ kgo.BrokerMetadata, _ net.Conn) {}

 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)
-		}
+	switch {
+	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
+		return
+	default:
+		m.log.Error(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)
+	switch {
+	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
+		return
+	default:
+		m.log.Error(context.TODO(), "kgo.OnBrokerRead", err)
 	}
 }

 func (m *hookEvent) OnProduceRecordUnbuffered(_ *kgo.Record, err error) {
-	if err != nil {
-		m.connected.Store(0)
+	switch {
+	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
+		return
+	default:
+		m.log.Error(context.TODO(), "kgo.OnProduceRecordUnbuffered", err)
 	}
 }
--- a/hook_event_test.go
+++ b/hook_event_test.go
@@ -0,0 +1,362 @@
+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/v3/logger"
+)
+
+func TestHookEvent_OnGroupManageError(t *testing.T) {
+	tests := []struct {
+		name                  string
+		inputErr              error
+		expectedErrorIsCalled bool
+		expectedErrorMsg      string
+	}{
+		{
+			name:                  "error is nil",
+			inputErr:              nil,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "context canceled",
+			inputErr:              context.Canceled,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "context deadline exceeded",
+			inputErr:              context.DeadlineExceeded,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: deadline exceeded (os package)",
+			inputErr:              os.ErrDeadlineExceeded,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: EOF (io package)",
+			inputErr:              io.EOF,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: closed network connection (net package)",
+			inputErr:              net.ErrClosed,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "some error",
+			inputErr:              errors.New("some error"),
+			expectedErrorIsCalled: true,
+			expectedErrorMsg:      "kgo.OnGroupManageError",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			log := &mockLogger{}
+			he := &hookEvent{log: log}
+			he.OnGroupManageError(tt.inputErr)
+			require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
+			require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
+		})
+	}
+}
+
+func TestHookEvent_OnBrokerConnect(t *testing.T) {
+	tests := []struct {
+		name                  string
+		inputErr              error
+		expectedErrorIsCalled bool
+		expectedErrorMsg      string
+	}{
+		{
+			name:                  "error is nil",
+			inputErr:              nil,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "context canceled",
+			inputErr:              context.Canceled,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "context deadline exceeded",
+			inputErr:              context.DeadlineExceeded,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: deadline exceeded (os package)",
+			inputErr:              os.ErrDeadlineExceeded,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: EOF (io package)",
+			inputErr:              io.EOF,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: closed network connection (net package)",
+			inputErr:              net.ErrClosed,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "some error",
+			inputErr:              errors.New("some error"),
+			expectedErrorIsCalled: true,
+			expectedErrorMsg:      "kgo.OnBrokerConnect",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			log := &mockLogger{}
+			he := &hookEvent{log: log}
+			he.OnBrokerConnect(kgo.BrokerMetadata{}, 0, nil, tt.inputErr)
+			require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
+			require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
+		})
+	}
+}
+
+func TestHookEvent_OnBrokerWrite(t *testing.T) {
+	tests := []struct {
+		name                  string
+		inputErr              error
+		expectedErrorIsCalled bool
+		expectedErrorMsg      string
+	}{
+		{
+			name:                  "error is nil",
+			inputErr:              nil,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "context canceled",
+			inputErr:              context.Canceled,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "context deadline exceeded",
+			inputErr:              context.DeadlineExceeded,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: deadline exceeded (os package)",
+			inputErr:              os.ErrDeadlineExceeded,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: EOF (io package)",
+			inputErr:              io.EOF,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: closed network connection (net package)",
+			inputErr:              net.ErrClosed,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "some error",
+			inputErr:              errors.New("some error"),
+			expectedErrorIsCalled: true,
+			expectedErrorMsg:      "kgo.OnBrokerWrite",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			log := &mockLogger{}
+			he := &hookEvent{log: log}
+			he.OnBrokerWrite(kgo.BrokerMetadata{}, 0, 0, 0, 0, tt.inputErr)
+			require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
+			require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
+		})
+	}
+}
+
+func TestHookEvent_OnBrokerRead(t *testing.T) {
+	tests := []struct {
+		name                  string
+		inputErr              error
+		expectedErrorIsCalled bool
+		expectedErrorMsg      string
+	}{
+		{
+			name:                  "error is nil",
+			inputErr:              nil,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "context canceled",
+			inputErr:              context.Canceled,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "context deadline exceeded",
+			inputErr:              context.DeadlineExceeded,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: deadline exceeded (os package)",
+			inputErr:              os.ErrDeadlineExceeded,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: EOF (io package)",
+			inputErr:              io.EOF,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: closed network connection (net package)",
+			inputErr:              net.ErrClosed,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "some error",
+			inputErr:              errors.New("some error"),
+			expectedErrorIsCalled: true,
+			expectedErrorMsg:      "kgo.OnBrokerRead",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			log := &mockLogger{}
+			he := &hookEvent{log: log}
+			he.OnBrokerRead(kgo.BrokerMetadata{}, 0, 0, 0, 0, tt.inputErr)
+			require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
+			require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
+		})
+	}
+}
+
+func TestHookEvent_OnProduceRecordUnbuffered(t *testing.T) {
+	tests := []struct {
+		name                  string
+		inputErr              error
+		expectedErrorIsCalled bool
+		expectedErrorMsg      string
+	}{
+		{
+			name:                  "error is nil",
+			inputErr:              nil,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "context canceled",
+			inputErr:              context.Canceled,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "context deadline exceeded",
+			inputErr:              context.DeadlineExceeded,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: deadline exceeded (os package)",
+			inputErr:              os.ErrDeadlineExceeded,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: EOF (io package)",
+			inputErr:              io.EOF,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "retryable error: closed network connection (net package)",
+			inputErr:              net.ErrClosed,
+			expectedErrorIsCalled: false,
+		},
+		{
+			name:                  "some error",
+			inputErr:              errors.New("some error"),
+			expectedErrorIsCalled: true,
+			expectedErrorMsg:      "kgo.OnProduceRecordUnbuffered",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			log := &mockLogger{}
+			he := &hookEvent{log: log}
+			he.OnProduceRecordUnbuffered(&kgo.Record{}, tt.inputErr)
+			require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
+			require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
+		})
+	}
+}
+
+// Mocks
+
+type mockLogger struct {
+	errorIsCalled bool
+	errorMsg      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(context.Context, string, ...interface{}) {
+	panic("implement me")
+}
+
+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")
+}
--- a/kgo.go
+++ b/kgo.go
@@ -11,27 +11,20 @@ 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/v4/broker"
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
-	"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"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/semconv"
+	"go.unistack.org/micro/v3/tracer"
+	mjitter "go.unistack.org/micro/v3/util/jitter"
+	mrand "go.unistack.org/micro/v3/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 {
@@ -64,17 +57,17 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
 }()

 type Broker struct {
-	funcPublish   broker.FuncPublish
-	funcSubscribe broker.FuncSubscribe
-	c             *kgo.Client
-	connected     *atomic.Uint32
+	c         *kgo.Client
+	connected *atomic.Uint32
+
+	done chan struct{}

 	kopts []kgo.Opt
 	subs  []*Subscriber

 	opts broker.Options
-
 	sync.RWMutex
+
 	init bool
 }

@@ -102,68 +95,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.PublishOptions
-	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.RLock()
-	c, ok := b.opts.Codecs[ct]
-	b.RUnlock()
-	if ok {
-		return c, nil
-	}
-	return nil, codec.ErrUnknownContentType
-}
-
-func (b *Broker) NewMessage(ctx context.Context, hdr metadata.Metadata, body interface{}, opts ...broker.PublishOption) (broker.Message, error) {
-	options := broker.NewPublishOptions(opts...)
-	m := &kgoMessage{ctx: ctx, hdr: hdr, opts: options}
-	c, err := b.newCodec(m.opts.ContentType)
-	if err == nil {
-		m.body, err = c.Marshal(body)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	return m, nil
-}
-
 func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *hookTracer, error) {
 	var c *kgo.Client
 	var err error
@@ -215,6 +146,25 @@ func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *ho
 			return nil, nil, err
 		}
 		k.connected.Store(1)
+
+		if fatalOnError {
+			go func() {
+				c := 3
+				n := 0
+				tc := mjitter.NewTicker(500*time.Millisecond, 1*time.Second)
+				defer tc.Stop()
+				for range tc.C {
+					if k.connected.Load() == 0 {
+						if n > c {
+							k.opts.Logger.Fatal(context.Background(), "broker fatal error")
+						}
+						n++
+					} else {
+						n = 0
+					}
+				}
+			}()
+		}
 		return c, htracer, nil
 	}
 }
@@ -276,6 +226,7 @@ func (k *Broker) Disconnect(ctx context.Context) error {
 	}

 	k.connected.Store(0)
+	close(k.done)
 	return nil
 }

@@ -310,18 +261,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
@@ -331,88 +270,83 @@ func (k *Broker) Options() broker.Options {
 	return k.opts
 }

-func (b *Broker) Publish(ctx context.Context, topic string, messages ...broker.Message) error {
-	return b.funcPublish(ctx, topic, messages...)
+func (k *Broker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+	return k.publish(ctx, msgs, opts...)
 }

-func (b *Broker) fnPublish(ctx context.Context, topic string, messages ...broker.Message) error {
-	return b.publish(ctx, topic, messages...)
+func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
+	msg.Header.Set(metadata.HeaderTopic, topic)
+	return k.publish(ctx, []*broker.Message{msg}, opts...)
 }

-func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.Message) error {
-	if b.connected.Load() == 0 {
-		c, _, err := b.connect(ctx, b.kopts...)
-		if err != nil {
-			return err
-		}
-		b.Lock()
-		b.c = c
-		b.Unlock()
-	}
-
-	records := make([]*kgo.Record, 0, len(messages))
+func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+	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)

-	for _, msg := range messages {
+	if options.Context != nil {
+		if k, ok := options.Context.Value(publishKey{}).([]byte); ok && k != nil {
+			key = k
+		}
+		if p, ok := options.Context.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
+			promise = p
+		}
+	}

-		if mctx := msg.Context(); mctx != nil {
-			if k, ok := mctx.Value(publishKey{}).([]byte); ok && k != nil {
-				key = k
-			}
-			if p, ok := mctx.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
-				promise = p
+	for _, msg := range msgs {
+		rec := &kgo.Record{Context: ctx, Key: key}
+
+		rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
+		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
 			}
 		}
-
-		rec := &kgo.Record{
-			Context: ctx,
-			Key:     key,
-			Topic:   topic,
-			Value:   msg.Body(),
-		}
-
-		b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
-
-		setHeaders(rec, msg.Header())
-
 		records = append(records, rec)
 	}

-	ts := time.Now()
-
 	if promise != nil {
-
+		ts := time.Now()
 		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()
-				b.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.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())
+				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)
 			})
 		}
 		return nil
 	}
+	ts := time.Now()

-	results := b.c.ProduceSync(ctx, records...)
+	results := k.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())
-		b.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.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())
+		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()
 		}
 	}

@@ -439,50 +373,31 @@ 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) {
-	return b.funcSubscribe(ctx, topic, handler, opts...)
+func (k *Broker) BatchSubscribe(_ context.Context, _ string, _ broker.BatchHandler, _ ...broker.SubscribeOption) (broker.Subscriber, error) {
+	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 v, ok := b.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
+	if k.opts.Context != nil {
+		if v, ok := k.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
 			commitInterval = v
 		}
 	}

 	var fatalOnError bool
-	if b.opts.Context != nil {
-		if v, ok := b.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
-			fatalOnError = v
-		}
-	}
-
-	if options.Context != nil {
-		if v, ok := options.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
+	if k.opts.Context != nil {
+		if v, ok := k.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
 			fatalOnError = v
 		}
 	}
@@ -491,14 +406,14 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
 		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,
+		connected:    k.connected,
 	}

-	kopts := append(b.kopts,
+	kopts := append(k.kopts,
 		kgo.ConsumerGroup(options.Group),
 		kgo.ConsumeTopics(topic),
 		kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
@@ -518,7 +433,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
 	}
@@ -540,10 +455,9 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac

 	go sub.poll(ctx)

-	b.Lock()
-	b.subs = append(b.subs, sub)
-	b.Unlock()
-
+	k.Lock()
+	k.subs = append(k.subs, sub)
+	k.Unlock()
 	return sub, nil
 }

@@ -583,5 +497,6 @@ func NewBroker(opts ...broker.Option) *Broker {
 		connected: &atomic.Uint32{},
 		opts:      options,
 		kopts:     kopts,
+		done:      make(chan struct{}),
 	}
 }
--- a/kgo_test.go
+++ b/kgo_test.go
@@ -9,11 +9,11 @@ import (
 	"time"

 	kg "github.com/twmb/franz-go/pkg/kgo"
-	kgo "go.unistack.org/micro-broker-kgo/v4"
-	"go.unistack.org/micro/v4/broker"
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/logger/slog"
-	"go.unistack.org/micro/v4/metadata"
+	kgo "go.unistack.org/micro-broker-kgo/v3"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/logger/slog"
+	"go.unistack.org/micro/v3/metadata"
 )

 var (
@@ -23,6 +23,11 @@ var (
 	loglevel = logger.DebugLevel
 )

+var bm = &broker.Message{
+	Header: map[string]string{"hkey": "hval", metadata.HeaderTopic: "test"},
+	Body:   []byte(`"body"`),
+}
+
 func TestFail(t *testing.T) {
 	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
 		t.Skip()
@@ -67,10 +72,9 @@ 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++ {
-		m, _ := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
-		msgs = append(msgs, m)
+		msgs = append(msgs, bm)
 	}

 	for _, msg := range msgs {
@@ -82,7 +86,7 @@ func TestFail(t *testing.T) {
 	//	t.Skip()

 	idx := int64(0)
-	fn := func(msg broker.Message) error {
+	fn := func(msg broker.Event) error {
 		atomic.AddInt64(&idx, 1)
 		time.Sleep(500 * time.Millisecond)
 		t.Logf("ack")
@@ -113,6 +117,10 @@ func TestFail(t *testing.T) {
 }

 func TestConnect(t *testing.T) {
+	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
+		t.Skip()
+	}
+
 	var addrs []string
 	ctx := context.TODO()
 	b := kgo.NewBroker(
@@ -166,20 +174,19 @@ 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, m)
+			msgs = append(msgs, bm)
 		}

-		if err := b.Publish(ctx, "test", 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()
--- a/logger.go
+++ b/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 {
--- a/meter.go
+++ b/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 {
--- a/options.go
+++ b/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 (
@@ -34,6 +35,11 @@ func PublishKey(key []byte) broker.PublishOption {
 	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{}

 // Options pass additional options to broker
@@ -109,3 +115,8 @@ type publishPromiseKey struct{}
 func PublishPromise(fn func(*kgo.Record, error)) broker.PublishOption {
 	return broker.SetPublishOption(publishPromiseKey{}, fn)
 }
+
+// ClientPublishKey set the kafka message key (client option)
+func ClientPublishPromise(fn func(*kgo.Record, error)) client.PublishOption {
+	return client.SetPublishOption(publishPromiseKey{}, fn)
+}
--- a/subscriber.go
+++ 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/v4/broker"
-	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/semconv"
-	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/semconv"
+	"go.unistack.org/micro/v3/tracer"
 )

 type tp struct {
@@ -24,34 +24,44 @@ type tp struct {
 }

 type consumer struct {
-	topic     string
+	topic string
+
 	c         *kgo.Client
 	htracer   *hookTracer
-	quit      chan struct{}
-	done      chan struct{}
-	recs      chan kgo.FetchTopicPartition
-	kopts     broker.Options
-	partition int32
-	opts      broker.SubscribeOptions
-	handler   interface{}
 	connected *atomic.Uint32
+
+	quit chan struct{}
+	done chan struct{}
+	recs chan kgo.FetchTopicPartition
+
+	handler broker.Handler
+
+	kopts broker.Options
+	opts  broker.SubscribeOptions
+
+	partition int32
 }

 type Subscriber struct {
+	topic string
+
 	consumers map[tp]*consumer
+
 	c         *kgo.Client
 	htracer   *hookTracer
-	topic     string
-
-	handler interface{}
-	done    chan struct{}
-	kopts   broker.Options
-	opts    broker.SubscribeOptions
-
 	connected *atomic.Uint32
-	sync.RWMutex
+
+	handler broker.Handler
+
+	done chan struct{}
+
+	kopts broker.Options
+	opts  broker.SubscribeOptions
+
 	closed       bool
 	fatalOnError bool
+
+	sync.RWMutex
 }

 func (s *Subscriber) Client() *kgo.Client {
@@ -177,7 +187,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)
 		}
@@ -228,14 +238,17 @@ func (s *Subscriber) assigned(_ context.Context, c *kgo.Client, assigned map[str
 }

 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
+	if pc.opts.ErrorHandler != nil {
+		eh = pc.opts.ErrorHandler
+	}
+
 	for {
 		select {
 		case <-pc.quit:
@@ -245,49 +258,121 @@ 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 := messagePool.Get().(*kgoMessage)
-
-				p.body = record.Value
+				p := eventPool.Get().(*event)
+				p.msg.Header = nil
+				p.msg.Body = nil
 				p.topic = record.Topic
+				p.err = nil
 				p.ack = false
-				p.hdr = metadata.New(len(record.Headers))
+				p.msg.Header = metadata.New(len(record.Headers))
 				p.ctx = ctx
 				for _, hdr := range record.Headers {
-					p.hdr.Set(hdr.Key, string(hdr.Value))
+					p.msg.Header.Set(hdr.Key, string(hdr.Value))
 				}
-
-				switch h := pc.handler.(type) {
-				case func(broker.Message) error:
-					err = h(p)
-				case func([]broker.Message) error:
-					err = h([]broker.Message{p})
+				if pc.kopts.Codec.String() == "noop" {
+					p.msg.Body = record.Value
+				} else if pc.opts.BodyOnly {
+					p.msg.Body = record.Value
+				} else {
+					if sp != nil {
+						sp.AddEvent("codec unmarshal start")
+					}
+					err := pc.kopts.Codec.Unmarshal(record.Value, p.msg)
+					if sp != nil {
+						sp.AddEvent("codec unmarshal stop")
+					}
+					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
+						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.connected.Store(0)
+								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
+						} 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?")
+						if sp != nil {
+							sp.Finish()
+						}
+						return
+					}
 				}
-
-				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
-				if err != nil {
-					sp.SetStatus(tracer.SpanStatusError, err.Error())
+				if sp != nil {
+					sp.AddEvent("handler start")
+				}
+				err := pc.handler(p)
+				if sp != nil {
+					sp.AddEvent("handler stop")
+				}
+				if err == nil {
+					pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "success").Inc()
+				} else {
+					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.ack = true
 				}
-
+				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 {
+						if sp != nil {
+							sp.AddEvent("error handler start")
+						}
+						_ = eh(p)
+						if sp != nil {
+							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())
-
-				ack := p.ack
-				messagePool.Put(p)
-
-				if ack {
+				if p.ack {
+					eventPool.Put(p)
 					pc.c.MarkCommitRecords(record)
 				} else {
-					sp.Finish()
-					pc.connected.Store(0)
-					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] message not commited")
+					eventPool.Put(p)
+					//					pc.connected.Store(0)
+					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
+					if sp != nil {
+						sp.SetStatus(tracer.SpanStatusError, "ErrLostMessage")
+						sp.Finish()
+					}
 					return
 				}
-
-				sp.Finish()
+				if sp != nil {
+					sp.Finish()
+				}
 			}
 		}
 	}
--- a/tracer.go
+++ b/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/v4/metadata"
-	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/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,
Author	SHA1	Message	Date
pugnack	d5d1e26d7b	remove noisy logs from event hooks and add tests (#192 ) Some checks failed coverage / build (push) Failing after 2m7s Details test / test (push) Failing after 19m17s Details	2025-07-10 10:49:49 +03:00
pugnack	aabfecfd3d	[v3] update ci (#187 ) Some checks failed test / test (push) Has been cancelled Details coverage / build (push) Has been cancelled Details * update ci * attempt to fix lint/test job * attempt to fix lint/test job	2025-06-10 16:22:25 +03:00
Василий Толстов	ff7a88fcce	Merge pull request 'added check span!=nil && conn close' (#154 ) from devstigneev/micro-broker-kgo:v3 into v3 All checks were successful test / test (push) Successful in 2m10s Details Reviewed-on: #154	2025-05-21 11:56:47 +03:00
Evstigneev Denis	397f5414b3	removed reconn Some checks failed lint / lint (pull_request) Failing after 56s Details test / test (pull_request) Successful in 2m28s Details	2025-05-21 11:36:28 +03:00
Evstigneev Denis	9dd6efddf9	added check span!=nil && conn close Some checks failed lint / lint (pull_request) Failing after 1m3s Details test / test (pull_request) Successful in 3m27s Details	2025-05-21 11:26:54 +03:00
Василий Толстов	1e587b348a	Merge pull request 'move from v4 enabled tracer && added fieldalignment struct && upd deps' (#153 ) from devstigneev/micro-broker-kgo:v3 into v3 Some checks failed test / test (push) Failing after 16m56s Details Reviewed-on: #153	2025-05-21 08:35:30 +03:00
Evstigneev Denis	8475922d42	move from v4 enabled tracer && added fieldalignment struct && upd deps Some checks failed lint / lint (pull_request) Failing after 1m41s Details test / test (pull_request) Failing after 18m1s Details	2025-05-20 14:22:58 +03:00
Vasiliy Tolstov	69fe6994ae	dont modify connected state on errors Some checks failed test / test (push) Failing after 1m25s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2025-05-02 19:07:03 +03:00
Vasiliy Tolstov	6360feb351	fixup group lag metric All checks were successful test / test (push) Successful in 3m27s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2025-04-23 10:50:50 +03:00
Vasiliy Tolstov	0845f4873b	try to recover kafka fatals All checks were successful test / test (push) Successful in 4m38s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2025-04-07 18:55:28 +03:00
Vasiliy Tolstov	747e35148f	disable connected state changes now All checks were successful test / test (push) Successful in 2m4s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2025-03-12 20:40:30 +03:00
Vasiliy Tolstov	21f06fee6c	fixup panic All checks were successful test / test (push) Successful in 2m21s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2025-03-12 16:59:43 +03:00