add ExposeLag option, to be able to disable lag exporting

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
remove noisy logs from event hooks and add tests (#192 )
2025-10-09 23:37:07 +03:00 · 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
15 changed files with 473 additions and 684 deletions
--- a/.github/workflows/job_sync.yml
+++ b/.github/workflows/job_sync.yml
@@ -1,94 +0,0 @@
 name: sync
 on:
  schedule:
    - cron: '*/5 * * * *'
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:
 jobs:
  sync:
    if: github.server_url != 'https://github.com'
    runs-on: ubuntu-latest
    steps:
    - name: init
      run: |
        git config --global user.email "vtolstov <vtolstov@users.noreply.github.com>"
        git config --global user.name "github-actions[bot]"
        echo "machine git.unistack.org login vtolstov password ${{ secrets.TOKEN_GITEA }}" >> /root/.netrc
        echo "machine github.com login vtolstov password ${{ secrets.TOKEN_GITHUB }}" >> /root/.netrc
    - name: check master
      id: check_master
      run: |
        src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/master | cut -f1)
        dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/master | cut -f1)
        echo "src_hash=$src_hash"
        echo "dst_hash=$dst_hash"
        if [ "$src_hash" != "$dst_hash" -a "$src_hash" != "" -a "" != "$dst_hash" ]; then
          echo "sync_needed=true" >> $GITHUB_OUTPUT
        else
          echo "sync_needed=false" >> $GITHUB_OUTPUT
        fi
    - name: sync master
      if: steps.check_master.outputs.sync_needed == 'true'
      run: |
        git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
        cd repo
        git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY}
        git pull --rebase upstream master
        git push upstream master --progress
        git push origin master --progress
        cd ../
        rm -rf repo
    - name: check v3
      id: check_v3
      run: |
        src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/v3 | cut -f1)
        dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/v3 | cut -f1)
        echo "src_hash=$src_hash"
        echo "dst_hash=$dst_hash"
        if [ "$src_hash" != "$dst_hash" ]; then
          echo "sync_needed=true" >> $GITHUB_OUTPUT
        else
          echo "sync_needed=false" >> $GITHUB_OUTPUT
        fi
    - name: sync v3
      if: steps.check_v3.outputs.sync_needed == 'true'
      run: |
        git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
        cd repo
        git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
        git pull --rebase upstream v3
        git push upstream v3 --progress
        git push origin v3 --progress
        cd ../
        rm -rf repo
    - name: check v4
      id: check_v4
      run: |
        src_hash=$(git ls-remote https://github.com/${GITHUB_REPOSITORY} refs/heads/v4 | cut -f1)
        dst_hash=$(git ls-remote ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} refs/heads/v4 | cut -f1)
        echo "src_hash=$src_hash"
        echo "dst_hash=$dst_hash"
        if [ "$src_hash" != "$dst_hash" ]; then
          echo "sync_needed=true" >> $GITHUB_OUTPUT
        else
          echo "sync_needed=false" >> $GITHUB_OUTPUT
        fi
    - name: sync v4
      if: steps.check_v4.outputs.sync_needed == 'true'
      run: |
        git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
        cd repo
        git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
        git pull --rebase upstream v4
        git push upstream v4 --progress
        git push origin v4 --progress
        cd ../
        rm -rf repo
--- a/README.md
+++ b/README.md
@@ -1,2 +1,9 @@
-# micro-broker-kgo
+# broker-kgo
-![Coverage](https://img.shields.io/badge/Coverage-64.8%25-yellow)
+
 TODO:
 1) экспортируем текущий оффсет для каждой партиции в группе
 2) экспортируем лаг для группы
 3) мониторим
   1) если есть лаг больше нуля
   2) если дельта оффсета за нужное нам время не 
--- 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/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,27 +1,32 @@
-module go.unistack.org/micro-broker-kgo/v4
+module go.unistack.org/micro-broker-kgo/v3
 go 1.24.0
 toolchain go1.24.3
 require (
 	github.com/google/uuid v1.6.0
 	github.com/stretchr/testify v1.11.1
-	github.com/twmb/franz-go v1.20.2
+	github.com/twmb/franz-go v1.19.5
-	github.com/twmb/franz-go/pkg/kadm v1.17.1
+	github.com/twmb/franz-go/pkg/kadm v1.16.1
-	github.com/twmb/franz-go/pkg/kfake v0.0.0-20250508175730-72e1646135e3
+	github.com/twmb/franz-go/pkg/kmsg v1.11.2
 	github.com/twmb/franz-go/pkg/kmsg v1.12.0
 	go.opentelemetry.io/otel v1.38.0
-	go.unistack.org/micro/v4 v4.1.24
+	go.unistack.org/micro/v3 v3.11.45
 )
 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/klauspost/compress v1.18.1 // 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/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/spf13/cast v1.10.0 // indirect
+	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
 	go.unistack.org/micro-proto/v4 v4.1.0 // indirect
 	golang.org/x/crypto v0.43.0 // indirect
 	golang.org/x/sys v0.37.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff // indirect
 	google.golang.org/grpc v1.76.0 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,15 +1,18 @@
 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/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
 github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -18,38 +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.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
 github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 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 v1.20.2 h1:CiwhyKZHW6vqSHJkh+RTxFAJkio0jBjM/JQhx/HZ72A=
 github.com/twmb/franz-go v1.20.2/go.mod h1:YCnepDd4gl6vdzG03I5Wa57RnCTIC6DVEyMpDX/J8UA=
 github.com/twmb/franz-go/pkg/kadm v1.16.1 h1:IEkrhTljgLHJ0/hT/InhXGjPdmWfFvxp7o/MR7vJ8cw=
 github.com/twmb/franz-go/pkg/kadm v1.16.1/go.mod h1:Ue/ye1cc9ipsQFg7udFbbGiFNzQMqiH73fGC2y0rwyc=
 github.com/twmb/franz-go/pkg/kadm v1.17.1 h1:Bt02Y/RLgnFO2NP2HVP1kd2TFtGRiJZx+fSArjZDtpw=
 github.com/twmb/franz-go/pkg/kadm v1.17.1/go.mod h1:s4duQmrDbloVW9QTMXhs6mViTepze7JLG43xwPcAeTg=
 github.com/twmb/franz-go/pkg/kfake v0.0.0-20250508175730-72e1646135e3 h1:p24opKWPySAy8xSl8NqRgOv7Q+bX7kdrQirBVRJzQfo=
 github.com/twmb/franz-go/pkg/kfake v0.0.0-20250508175730-72e1646135e3/go.mod h1:7uQs3Ae6HkWT1Y9elMbqtAcNFCI0y6+iS+Phw49L49U=
 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=
 github.com/twmb/franz-go/pkg/kmsg v1.12.0 h1:CbatD7ers1KzDNgJqPbKOq0Bz/WLBdsTH75wgzeVaPc=
 github.com/twmb/franz-go/pkg/kmsg v1.12.0/go.mod h1:+DPt4NC8RmI6hqb8G09+3giKObE6uD2Eya6CfqBpeJY=
 go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
 go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
-go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk=
+go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
-go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
+go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
-go.unistack.org/micro/v4 v4.1.21 h1:F9PrbI1BhXSDS0FopwcO5wWrT2Xh38w9VhVZZBHjfg8=
+go.unistack.org/micro/v3 v3.11.45 h1:fjTLZYWgsVf9FIMZBxOg8ios2/tmyimnjZrsrxEUeXU=
-go.unistack.org/micro/v4 v4.1.21/go.mod h1:nlBXTbx0rQrSZX4HPp2m57PHmpuGPWUd0O+jpUIiPto=
+go.unistack.org/micro/v3 v3.11.45/go.mod h1:fDQ8Mu9wubaFP0L8hNQlpzHiEnWN0wbOlawN9HYo0N4=
 go.unistack.org/micro/v4 v4.1.24 h1:PbkSWJS3ssB5A0y0tOdOw6u9e2Mk4yombF4yR0Jshvo=
 go.unistack.org/micro/v4 v4.1.24/go.mod h1:nlBXTbx0rQrSZX4HPp2m57PHmpuGPWUd0O+jpUIiPto=
 golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
 golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
 golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
 golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
 golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
 golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
 golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff h1:A90eA31Wq6HOMIQlLfzFwzqGKBTuaVztYu/g8sn+8Zc=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
 google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
 google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
 google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 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 (
@@ -30,14 +30,7 @@ func (m *hookEvent) OnGroupManageError(err error) {
 	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
 		return
 	default:
-		ctx := context.TODO()
+		m.log.Error(context.TODO(), "kgo.OnGroupManageError", err)
 		logMsg := "kgo.OnGroupManageError"
 		if m.fatalOnError {
 			m.log.Fatal(ctx, logMsg, err)
 		} else {
 			m.log.Error(ctx, logMsg, err)
 		}
 	}
 }
@@ -46,14 +39,7 @@ func (m *hookEvent) OnBrokerConnect(_ kgo.BrokerMetadata, _ time.Duration, _ net
 	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
 		return
 	default:
-		ctx := context.TODO()
+		m.log.Error(context.TODO(), "kgo.OnBrokerConnect", err)
 		logMsg := "kgo.OnBrokerConnect"
 		if m.fatalOnError {
 			m.log.Fatal(ctx, logMsg, err)
 		} else {
 			m.log.Error(ctx, logMsg, err)
 		}
 	}
 }
@@ -64,14 +50,7 @@ func (m *hookEvent) OnBrokerWrite(_ kgo.BrokerMetadata, _ int16, _ int, _ time.D
 	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
 		return
 	default:
-		ctx := context.TODO()
+		m.log.Error(context.TODO(), "kgo.OnBrokerWrite", err)
 		logMsg := "kgo.OnBrokerWrite"
 		if m.fatalOnError {
 			m.log.Fatal(ctx, logMsg, err)
 		} else {
 			m.log.Error(ctx, logMsg, err)
 		}
 	}
 }
@@ -80,14 +59,7 @@ func (m *hookEvent) OnBrokerRead(_ kgo.BrokerMetadata, _ int16, _ int, _ time.Du
 	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
 		return
 	default:
-		ctx := context.TODO()
+		m.log.Error(context.TODO(), "kgo.OnBrokerRead", err)
 		logMsg := "kgo.OnBrokerRead"
 		if m.fatalOnError {
 			m.log.Fatal(ctx, logMsg, err)
 		} else {
 			m.log.Error(ctx, logMsg, err)
 		}
 	}
 }
@@ -96,13 +68,6 @@ func (m *hookEvent) OnProduceRecordUnbuffered(_ *kgo.Record, err error) {
 	case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
 		return
 	default:
-		ctx := context.TODO()
+		m.log.Error(context.TODO(), "kgo.OnProduceRecordUnbuffered", err)
 		logMsg := "kgo.OnProduceRecordUnbuffered"
 		if m.fatalOnError {
 			m.log.Fatal(ctx, logMsg, err)
 		} else {
 			m.log.Error(ctx, logMsg, err)
 		}
 	}
 }
--- a/hook_event_test.go
+++ b/hook_event_test.go
@@ -10,82 +10,61 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/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)",
+			name:                  "some error",
 			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 := &hookEvent{log: log}
 			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)
 		})
 	}
 }
@@ -94,75 +73,54 @@ 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)",
+			name:                  "some error",
 			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 := &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)
 			require.Equal(t, tt.expectedFatalIsCalled, log.fatalIsCalled)
 			require.Equal(t, tt.expectedFatalMsg, log.fatalMsg)
 		})
 	}
 }
@@ -171,75 +129,54 @@ 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)",
+			name:                  "some error",
 			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 := &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)
 			require.Equal(t, tt.expectedFatalIsCalled, log.fatalIsCalled)
 			require.Equal(t, tt.expectedFatalMsg, log.fatalMsg)
 		})
 	}
 }
@@ -248,75 +185,54 @@ 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)",
+			name:                  "some error",
 			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 := &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)
 			require.Equal(t, tt.expectedFatalIsCalled, log.fatalIsCalled)
 			require.Equal(t, tt.expectedFatalMsg, log.fatalMsg)
 		})
 	}
 }
@@ -325,75 +241,54 @@ 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)",
+			name:                  "some error",
 			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 := &hookEvent{log: log}
 			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)
 		})
 	}
 }
@@ -403,9 +298,6 @@ func TestHookEvent_OnProduceRecordUnbuffered(t *testing.T) {
 type mockLogger struct {
 	errorIsCalled bool
 	errorMsg      string
 	fatalIsCalled bool
 	fatalMsg      string
 }
 func (m *mockLogger) Init(...logger.Option) error {
@@ -453,9 +345,8 @@ func (m *mockLogger) Error(ctx context.Context, msg string, args ...interface{})
 	m.errorMsg = msg
 }
-func (m *mockLogger) Fatal(ctx context.Context, msg string, args ...interface{}) {
+func (m *mockLogger) Fatal(context.Context, string, ...interface{}) {
-	m.fatalIsCalled = true
+	panic("implement me")
 	m.fatalMsg = msg
 }
 func (m *mockLogger) Log(context.Context, logger.Level, string, ...interface{}) {
--- a/kgo.go
+++ b/kgo.go
@@ -12,28 +12,21 @@ import (
 	"sync/atomic"
 	"time"
 	"github.com/google/uuid"
 	"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/v3/broker"
-	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v3/semconv"
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v3/tracer"
-	"go.unistack.org/micro/v4/semconv"
+	mjitter "go.unistack.org/micro/v3/util/jitter"
-	"go.unistack.org/micro/v4/tracer"
+	mrand "go.unistack.org/micro/v3/util/rand"
 	"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 {
@@ -66,17 +59,17 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
 }()
 type Broker struct {
-	funcPublish   broker.FuncPublish
+	c         *kgo.Client
-	funcSubscribe broker.FuncSubscribe
+	connected *atomic.Uint32
-	c             *kgo.Client
+
-	connected     *atomic.Uint32
+	done chan struct{}
 	kopts []kgo.Opt
 	subs  []*Subscriber
 	opts broker.Options
 	mu   sync.RWMutex
 	init bool
 }
@@ -104,74 +97,6 @@ func (k *Broker) Client() *kgo.Client {
 	return k.c
 }
 type kgoMessage struct {
 	c     codec.Codec
 	topic string
 	ctx   context.Context
 	body  []byte
 	hdr   metadata.Metadata
 	opts  broker.MessageOptions
 	ack   bool
 }
 func (m *kgoMessage) Ack() error {
 	m.ack = true
 	return nil
 }
 func (m *kgoMessage) Body() []byte {
 	return m.body
 }
 func (m *kgoMessage) Header() metadata.Metadata {
 	return m.hdr
 }
 func (m *kgoMessage) Context() context.Context {
 	return m.ctx
 }
 func (m *kgoMessage) Topic() string {
 	return ""
 }
 func (m *kgoMessage) Unmarshal(dst interface{}, opts ...codec.Option) error {
 	return m.c.Unmarshal(m.body, dst)
 }
 func (b *Broker) newCodec(ct string) (codec.Codec, error) {
 	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
 		ct = ct[:idx]
 	}
 	b.mu.RLock()
 	c, ok := b.opts.Codecs[ct]
 	b.mu.RUnlock()
 	if ok {
 		return c, nil
 	}
 	return nil, codec.ErrUnknownContentType
 }
 func (b *Broker) NewMessage(ctx context.Context, hdr metadata.Metadata, body interface{}, opts ...broker.MessageOption) (broker.Message, error) {
 	options := broker.NewMessageOptions(opts...)
 	if options.ContentType == "" {
 		options.ContentType = b.opts.ContentType
 	}
 	m := &kgoMessage{ctx: ctx, hdr: hdr.Copy(), opts: options}
 	c, err := b.newCodec(m.opts.ContentType)
 	if err == nil {
 		m.body, err = c.Marshal(body)
 	}
 	if err != nil {
 		return nil, err
 	}
 	m.hdr.Set(metadata.HeaderContentType, m.opts.ContentType)
 	return m, nil
 }
 func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *hookTracer, error) {
 	var c *kgo.Client
 	var err error
@@ -223,6 +148,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
 	}
 }
@@ -346,6 +290,7 @@ func (k *Broker) Disconnect(ctx context.Context) error {
 	}
 	k.connected.Store(0)
 	close(k.done)
 	return nil
 }
@@ -380,18 +325,6 @@ func (k *Broker) Init(opts ...broker.Option) error {
 		}
 	}
 	k.funcPublish = k.fnPublish
 	k.funcSubscribe = k.fnSubscribe
 	k.opts.Hooks.EachPrev(func(hook options.Hook) {
 		switch h := hook.(type) {
 		case broker.HookPublish:
 			k.funcPublish = h(k.funcPublish)
 		case broker.HookSubscribe:
 			k.funcSubscribe = h(k.funcSubscribe)
 		}
 	})
 	k.init = true
 	return nil
@@ -401,92 +334,88 @@ func (k *Broker) Options() broker.Options {
 	return k.opts
 }
-func (b *Broker) Publish(ctx context.Context, topic string, messages ...broker.Message) error {
+func (k *Broker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
-	return b.funcPublish(ctx, topic, messages...)
+	return k.publish(ctx, msgs, opts...)
 }
-func (b *Broker) fnPublish(ctx context.Context, topic string, messages ...broker.Message) error {
+func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
-	return b.publish(ctx, topic, messages...)
+	msg.Header.Set(metadata.HeaderTopic, topic)
 	return k.publish(ctx, []*broker.Message{msg}, opts...)
 }
-func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.Message) error {
+func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
-	var records []*kgo.Record
+	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 {
-		rec := &kgo.Record{
+			key = k
 			Context: msg.Context(),
 			Topic:   topic,
 			Value:   msg.Body(),
 		}
-
+		if p, ok := options.Context.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
-		var promise func(*kgo.Record, error)
+			promise = p
 		if rec.Context != nil {
 			if k, ok := rec.Context.Value(messageKey{}).([]byte); ok && k != nil {
 				rec.Key = k
 			}
 			if p, ok := rec.Context.Value(messagePromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
 				promise = p
 			}
 		}
 		kmsg, ok := msg.(*kgoMessage)
 		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
 			}
 		}
 		setHeaders(rec, msg.Header())
 		if promise != nil {
 			ts := time.Now()
 			b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
 			b.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())
 				if err != nil {
 					b.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()
 				}
 				promise(r, err)
 			})
 			continue
 		} else {
 			records = append(records, rec)
 		}
 	}
-	if len(records) > 0 {
+	for _, msg := range msgs {
-		var errs []string
+		rec := &kgo.Record{Context: ctx, Key: key}
-		ts := time.Now()
+
-		b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", topic, "topic", topic).Set(uint64(len(records)))
+		rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
-		results := b.c.ProduceSync(ctx, records...)
+		msg.Header.Del(metadata.HeaderTopic)
-		te := time.Since(ts)
+
-		for _, result := range results {
+		k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
-			b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
+		if options.BodyOnly || k.opts.Codec.String() == "noop" {
-			b.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
+			rec.Value = msg.Body
-			b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
+			setHeaders(rec, msg.Header)
-			if result.Err != nil {
+		} else {
-				b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
+			rec.Value, err = k.opts.Codec.Marshal(msg)
-				errs = append(errs, result.Err.Error())
+			if err != nil {
-			} else {
+				return err
 				b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "success").Inc()
 			}
 		}
 		records = append(records, rec)
 	}
-		if len(errs) > 0 {
+	if promise != nil {
-			return fmt.Errorf("publish error: %s", strings.Join(errs, "\n"))
+		ts := time.Now()
 		for _, rec := range records {
 			k.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
 				te := time.Since(ts)
 				k.opts.Meter.Counter(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 {
 					k.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()
 				}
 				promise(r, err)
 			})
 		}
 		return nil
 	}
 	ts := time.Now()
 	results := k.c.ProduceSync(ctx, records...)
 	te := time.Since(ts)
 	for _, result := range results {
 		k.opts.Meter.Summary(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 {
 			k.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()
 		}
 	}
 	if len(errs) > 0 {
 		return fmt.Errorf("publish error: %s", strings.Join(errs, "\n"))
 	}
 	return nil
@@ -508,54 +437,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) {
+func (k *Broker) BatchSubscribe(_ context.Context, _ string, _ broker.BatchHandler, _ ...broker.SubscribeOption) (broker.Subscriber, error) {
-	return b.funcSubscribe(ctx, topic, handler, opts...)
+	return nil, nil
 }
-func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Handler, 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 := id.New()
+		uid, err := uuid.NewRandom()
 		if err != nil {
 			return nil, err
 		}
-		options.Group = uid
+		options.Group = uid.String()
 	}
 	commitInterval := DefaultCommitInterval
-	if b.opts.Context != nil {
+	if k.opts.Context != nil {
-		if v, ok := b.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
+		if v, ok := k.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
 			commitInterval = v
 		}
 	}
 	var messagePool bool
 	var fatalOnError bool
-	if b.opts.Context != nil {
+	if k.opts.Context != nil {
-		if v, ok := b.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
+		if v, ok := k.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
 			fatalOnError = v
 		}
 		if v, ok := b.opts.Context.Value(subscribeMessagePoolKey{}).(bool); ok && v {
 			messagePool = v
 		}
 	}
 	if options.Context != nil {
 		if v, ok := options.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
 			fatalOnError = v
 		}
 	}
@@ -564,15 +470,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,
 		messagePool:  messagePool,
 	}
-	kopts := append(b.kopts,
+	kopts := append(k.kopts,
 		kgo.ConsumerGroup(options.Group),
 		kgo.ConsumeTopics(topic),
 		kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
@@ -592,7 +497,7 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
 		}
 	}
-	c, htracer, err := b.connect(ctx, kopts...)
+	c, htracer, err := k.connect(ctx, kopts...)
 	if err != nil {
 		return nil, err
 	}
@@ -614,10 +519,9 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
 	go sub.poll(ctx)
-	b.mu.Lock()
+	k.mu.Lock()
-	b.subs = append(b.subs, sub)
+	k.subs = append(k.subs, sub)
-	b.mu.Unlock()
+	k.mu.Unlock()
 	return sub, nil
 }
@@ -657,5 +561,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
@@ -2,51 +2,54 @@ 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/v4"
+	kgo "go.unistack.org/micro-broker-kgo/v3"
-	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger/slog"
-	"go.unistack.org/micro/v4/logger/slog"
+	"go.unistack.org/micro/v3/metadata"
 	"go.unistack.org/micro/v4/metadata"
 )
 var (
 	msgcnt   = int64(1200)
 	group    = "38"
 	prefill  = true
-	loglevel = logger.ErrorLevel
+	loglevel = logger.DebugLevel
 	cluster  *kfake.Cluster
 )
-func TestMain(m *testing.M) {
+var bm = &broker.Message{
-	cluster = kfake.MustCluster(
+	Header: map[string]string{"hkey": "hval", metadata.HeaderTopic: "test"},
-		kfake.AllowAutoTopicCreation(),
+	Body:   []byte(`"body"`),
 	)
 	defer cluster.Close()
 	m.Run()
 }
 func TestFail(t *testing.T) {
 	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.ContentType("application/octet-stream"),
+		broker.Addrs(addrs...),
 		broker.Codec("application/octet-stream", codec.NewCodec()),
 		broker.Addrs(cluster.ListenAddrs()...),
 		kgo.CommitInterval(5*time.Second),
-		kgo.Options(
+		kgo.Options(kg.ClientID("test"), kg.FetchMaxBytes(10*1024*1024),
 			kg.ClientID("test"),
 			kg.FetchMaxBytes(10*1024*1024),
 			kg.AllowAutoTopicCreation(),
 		),
 	)
@@ -69,41 +72,34 @@ 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, err := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
+		msgs = append(msgs, bm)
 		if err != nil {
 			t.Fatal(err)
 		}
 		msgs = append(msgs, m)
 	}
-	go func() {
+	for _, msg := range msgs {
-		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.Fatal(err)
 			}
 		}
-	}()
+	}
 	//	t.Skip()
 	idx := int64(0)
-	fn := func(msg broker.Message) error {
+	fn := func(msg broker.Event) error {
 		atomic.AddInt64(&idx, 1)
-		time.Sleep(100 * time.Millisecond)
+		time.Sleep(500 * time.Millisecond)
-		// t.Logf("ack")
+		t.Logf("ack")
 		return msg.Ack()
 	}
-	sub, err := b.Subscribe(ctx, "test.fail", fn,
+	sub, err := b.Subscribe(ctx, "test", 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)
@@ -116,26 +112,21 @@ func TestFail(t *testing.T) {
 			t.Logf("health works")
 			break
 		}
-		t.Logf("health sleep")
+		time.Sleep(1 * time.Second)
 		time.Sleep(100 * time.Millisecond)
 		if err := b.Disconnect(ctx); err != nil {
 			t.Fatal(err)
 		}
 	}
 }
 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(
-		broker.ContentType("application/octet-stream"),
+		broker.Addrs(addrs...),
 		broker.Codec("application/octet-stream", codec.NewCodec()),
 		broker.Addrs(cluster.ListenAddrs()...),
 		kgo.CommitInterval(5*time.Second),
-		kgo.Options(
+		kgo.Options(kg.ClientID("test"), kg.FetchMaxBytes(10*1024*1024)),
 			kg.ClientID("test"),
 			kg.FetchMaxBytes(10*1024*1024),
 			kg.AllowAutoTopicCreation(),
 		),
 	)
 	if err := b.Init(); err != nil {
 		t.Fatal(err)
@@ -147,21 +138,26 @@ 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.ContentType("application/octet-stream"),
+		broker.Addrs(addrs...),
 		broker.Codec("application/octet-stream", codec.NewCodec()),
 		broker.Addrs(cluster.ListenAddrs()...),
 		kgo.CommitInterval(5*time.Second),
-		kgo.Options(
+		kgo.Options(kg.ClientID("test"), kg.FetchMaxBytes(10*1024*1024)),
 			kg.ClientID("test"),
 			kg.FetchMaxBytes(10*1024*1024),
 			kg.AllowAutoTopicCreation(),
 		),
 	)
 	if err := b.Init(); err != nil {
@@ -178,26 +174,25 @@ func TestPubSub(t *testing.T) {
 		}
 	}()
 	if prefill {
-		msgs := make([]broker.Message, 0, msgcnt)
+		msgs := make([]*broker.Message, 0, msgcnt)
 		for i := int64(0); i < msgcnt; i++ {
-			m, _ := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
+			msgs = append(msgs, bm)
 			msgs = append(msgs, m)
 		}
-		if err := b.Publish(ctx, "test.pubsub", msgs...); err != nil {
+		if err := b.BatchPublish(ctx, msgs); err != nil {
 			t.Fatal(err)
 		}
 		//	t.Skip()
 	}
 	done := make(chan bool, 1)
 	idx := int64(0)
-	fn := func(msg broker.Message) error {
+	fn := func(msg broker.Event) error {
 		atomic.AddInt64(&idx, 1)
 		// time.Sleep(200 * time.Millisecond)
 		return msg.Ack()
 	}
-	sub, err := b.Subscribe(ctx, "test.pubsub", fn,
+	sub, err := b.Subscribe(ctx, "test", fn,
 		broker.SubscribeAutoAck(true),
 		broker.SubscribeGroup(group),
 		broker.SubscribeBodyOnly(true))
@@ -222,7 +217,7 @@ func TestPubSub(t *testing.T) {
 				if prc := atomic.LoadInt64(&idx); prc == msgcnt {
 					close(done)
 				} else {
-					t.Logf("processed %v of %v\n", prc, msgcnt)
+					t.Logf("processed %v\n", prc)
 				}
 			case <-ticker.C:
 				close(done)
--- 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 (
@@ -27,11 +28,16 @@ func SubscribeContext(ctx context.Context) broker.SubscribeOption {
 	return broker.SetSubscribeOption(subscribeContextKey{}, ctx)
 }
-type messageKey struct{}
+type publishKey struct{}
-// MessageKey set the kafka message key (broker option)
+// PublishKey set the kafka message key (broker option)
-func MessageKey(key []byte) broker.MessageOption {
+func PublishKey(key []byte) broker.PublishOption {
-	return broker.SetMessageOption(messageKey{}, key)
+	return broker.SetPublishOption(publishKey{}, key)
 }
 // ClientPublishKey set the kafka message key (client option)
 func ClientPublishKey(key []byte) client.PublishOption {
 	return client.SetPublishOption(publishKey{}, key)
 }
 type optionsKey struct{}
@@ -103,18 +109,16 @@ func SubscribeFatalOnError(b bool) broker.SubscribeOption {
 	return broker.SetSubscribeOption(fatalOnErrorKey{}, b)
 }
-type messagePromiseKey struct{}
+type publishPromiseKey struct{}
-// MessagePromise set the kafka promise func for Produce
+// PublishPromise set the kafka promise func for Produce
-func MessagePromise(fn func(*kgo.Record, error)) broker.MessageOption {
+func PublishPromise(fn func(*kgo.Record, error)) broker.PublishOption {
-	return broker.SetMessageOption(messagePromiseKey{}, fn)
+	return broker.SetPublishOption(publishPromiseKey{}, fn)
 }
-type subscribeMessagePoolKey struct{}
+// ClientPublishKey set the kafka message key (client option)
-
+func ClientPublishPromise(fn func(*kgo.Record, error)) client.PublishOption {
-// SubscribeMessagePool optionaly enabled/disable message pool
+	return client.SetPublishOption(publishPromiseKey{}, fn)
 func SubscribeMessagePool(b bool) broker.SubscribeOption {
 	return broker.SetSubscribeOption(subscribeMessagePoolKey{}, b)
 }
 type exposeLagKey struct{}
--- a/subscriber.go
+++ b/subscriber.go
@@ -3,18 +3,17 @@ package kgo
 import (
 	"context"
 	"fmt"
 	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
 	"github.com/twmb/franz-go/pkg/kgo"
 	"github.com/twmb/franz-go/pkg/kmsg"
-	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v4/semconv"
+	"go.unistack.org/micro/v3/semconv"
-	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v3/tracer"
 )
 type tp struct {
@@ -23,34 +22,44 @@ type tp struct {
 }
 type consumer struct {
-	topic       string
+	topic string
-	c           *kgo.Client
+
-	htracer     *hookTracer
+	c         *kgo.Client
-	quit        chan struct{}
+	htracer   *hookTracer
-	done        chan struct{}
+	connected *atomic.Uint32
-	recs        chan kgo.FetchTopicPartition
+
-	kopts       broker.Options
+	quit chan struct{}
-	partition   int32
+	done chan struct{}
-	opts        broker.SubscribeOptions
+	recs chan kgo.FetchTopicPartition
-	handler     interface{}
+
-	connected   *atomic.Uint32
+	handler broker.Handler
-	messagePool bool
+
 	kopts broker.Options
 	opts  broker.SubscribeOptions
 	partition int32
 }
 type Subscriber struct {
-	consumers    map[tp]*consumer
+	topic string
-	c            *kgo.Client
+
-	htracer      *hookTracer
+	consumers map[tp]*consumer
-	topic        string
+
-	messagePool  bool
+	c         *kgo.Client
-	handler      interface{}
+	htracer   *hookTracer
-	done         chan struct{}
+	connected *atomic.Uint32
-	kopts        broker.Options
+
-	opts         broker.SubscribeOptions
+	handler broker.Handler
-	connected    *atomic.Uint32
+
-	mu           sync.RWMutex
+	done chan struct{}
 	kopts broker.Options
 	opts  broker.SubscribeOptions
 	closed       bool
 	fatalOnError bool
 	sync.RWMutex
 }
 func (s *Subscriber) Client() *kgo.Client {
@@ -116,12 +125,7 @@ func (s *Subscriber) poll(ctx context.Context) {
 			fetches.EachPartition(func(p kgo.FetchTopicPartition) {
 				tps := tp{p.Topic, p.Partition}
-				s.mu.Lock()
+				s.consumers[tps].recs <- p
 				c := s.consumers[tps]
 				s.mu.Unlock()
 				if c != nil {
 					c.recs <- p
 				}
 			})
 			s.c.AllowRebalance()
 		}
@@ -135,15 +139,11 @@ func (s *Subscriber) killConsumers(ctx context.Context, lost map[string][]int32)
 	for topic, partitions := range lost {
 		for _, partition := range partitions {
 			tps := tp{topic, partition}
 			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))
@@ -186,37 +186,37 @@ func (s *Subscriber) assigned(_ context.Context, c *kgo.Client, assigned map[str
 	for topic, partitions := range assigned {
 		for _, partition := range partitions {
 			pc := &consumer{
-				c:           c,
+				c:         c,
-				topic:       topic,
+				topic:     topic,
-				partition:   partition,
+				partition: partition,
-				htracer:     s.htracer,
+				htracer:   s.htracer,
-				quit:        make(chan struct{}),
+				quit:      make(chan struct{}),
-				done:        make(chan struct{}),
+				done:      make(chan struct{}),
-				recs:        make(chan kgo.FetchTopicPartition, 100),
+				recs:      make(chan kgo.FetchTopicPartition, 100),
-				handler:     s.handler,
+				handler:   s.handler,
-				messagePool: s.messagePool,
+				kopts:     s.kopts,
-				kopts:       s.kopts,
+				opts:      s.opts,
-				opts:        s.opts,
+				connected: s.connected,
 				connected:   s.connected,
 			}
-			s.mu.Lock()
+			s.Lock()
 			s.consumers[tp{topic, partition}] = pc
-			s.mu.Unlock()
+			s.Unlock()
 			go pc.consume()
 		}
 	}
 }
 func (pc *consumer) consume() {
 	var err error
 	defer close(pc.done)
 	if pc.kopts.Logger.V(logger.DebugLevel) {
 		pc.kopts.Logger.Debug(pc.kopts.Context, fmt.Sprintf("starting, topic %s partition %d", pc.topic, pc.partition))
 		defer pc.kopts.Logger.Debug(pc.kopts.Context, fmt.Sprintf("killing, topic %s partition %d", pc.topic, pc.partition))
 	}
-	var pm *kgoMessage
+	eh := pc.kopts.ErrorHandler
 	if pc.opts.ErrorHandler != nil {
 		eh = pc.opts.ErrorHandler
 	}
 	for {
 		select {
@@ -227,58 +227,116 @@ func (pc *consumer) consume() {
 				ctx, sp := pc.htracer.WithProcessSpan(record)
 				ts := time.Now()
 				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Inc()
-
+				p := eventPool.Get().(*event)
-				if pc.messagePool {
+				p.msg.Header = nil
-					pm = messagePool.Get().(*kgoMessage)
+				p.msg.Body = nil
-				} else {
+				p.topic = record.Topic
-					pm = &kgoMessage{}
+				p.err = nil
-				}
+				p.ack = false
-				pm.body = record.Value
+				p.msg.Header = metadata.New(len(record.Headers))
-				pm.topic = record.Topic
+				p.ctx = ctx
 				pm.ack = false
 				pm.hdr = metadata.New(len(record.Headers))
 				pm.ctx = ctx
 				for _, hdr := range record.Headers {
-					pm.hdr.Set(hdr.Key, string(hdr.Value))
+					p.msg.Header.Set(hdr.Key, string(hdr.Value))
 				}
-				pm.hdr.Set("Micro-Offset", strconv.FormatInt(record.Offset, 10))
+				if pc.kopts.Codec.String() == "noop" {
-				pm.hdr.Set("Micro-Partition", strconv.FormatInt(int64(record.Partition), 10))
+					p.msg.Body = record.Value
-				pm.hdr.Set("Micro-Topic", record.Topic)
+				} else if pc.opts.BodyOnly {
-				pm.hdr.Set("Micro-Key", string(record.Key))
+					p.msg.Body = record.Value
-				pm.hdr.Set("Micro-Timestamp", strconv.FormatInt(record.Timestamp.Unix(), 10))
+				} else {
-				switch h := pc.handler.(type) {
+					if sp != nil {
-				case func(broker.Message) error:
+						sp.AddEvent("codec unmarshal start")
-					err = h(pm)
+					}
-				case func([]broker.Message) error:
+					err := pc.kopts.Codec.Unmarshal(record.Value, p.msg)
-					err = h([]broker.Message{pm})
+					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
 					}
 				}
-
+				if sp != nil {
-				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
+					sp.AddEvent("handler start")
-				if err != nil {
+				}
 				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 {
 					pm.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())
-
+				if p.ack {
-				ack := pm.ack
+					eventPool.Put(p)
 				if pc.messagePool {
 					messagePool.Put(p)
 				}
 				if ack {
 					pc.c.MarkCommitRecords(record)
 				} else {
 					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()
 					}
 					//					pc.connected.Store(0)
 					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] message not commited")
 					return
 				}
 				if sp != nil {
--- 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/v3/metadata"
-	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v3/tracer"
 )
 type hookTracer struct {
Author	SHA1	Message	Date
Vasiliy Tolstov	581fecd8f1	add ExposeLag option, to be able to disable lag exporting Some checks failed coverage / build (push) Failing after 1m35s Details test / test (push) Failing after 15m18s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2025-10-09 23:37:07 +03:00
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