update to v4

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

.golangci.yml

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

broker.go

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

carrier.go

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

event.go

@@ -1,48 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"sync"
-
-	"go.unistack.org/micro/v3/broker"
-)
-
-type event struct {
-	ctx   context.Context
-	topic string
-	err   error
-	sync.RWMutex
-	msg *broker.Message
-	ack bool
-}
-
-func (p *event) Context() context.Context {
-	return p.ctx
-}
-
-func (p *event) Topic() string {
-	return p.topic
-}
-
-func (p *event) Message() *broker.Message {
-	return p.msg
-}
-
-func (p *event) Ack() error {
-	p.ack = true
-	return nil
-}
-
-func (p *event) Error() error {
-	return p.err
-}
-
-func (p *event) SetError(err error) {
-	p.err = err
-}
-
-var eventPool = sync.Pool{
-	New: func() interface{} {
-		return &event{msg: &broker.Message{}}
-	},
-}

go.mod

@@ -1,28 +1,24 @@
-module go.unistack.org/micro-broker-kgo/v3
+module go.unistack.org/micro-broker-kgo/v4
 
-go 1.22.7
+go 1.23.0
-
-toolchain go1.23.3
 
 require (
-	github.com/google/uuid v1.6.0
+	github.com/twmb/franz-go v1.18.1
-	github.com/twmb/franz-go v1.18.0
+	github.com/twmb/franz-go/pkg/kadm v1.15.0
-	github.com/twmb/franz-go/pkg/kadm v1.14.0
 	github.com/twmb/franz-go/pkg/kmsg v1.9.0
-	go.opentelemetry.io/otel v1.33.0
+	go.opentelemetry.io/otel v1.34.0
-	go.unistack.org/micro/v3 v3.11.22
+	go.unistack.org/micro/v4 v4.1.4
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/ash3in/uuidv8 v1.2.0 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/klauspost/compress v1.18.0 // 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.7.1 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
+	go.unistack.org/micro-proto/v4 v4.1.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/net v0.32.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
-	google.golang.org/grpc v1.69.2 // indirect
-	google.golang.org/protobuf v1.36.0 // indirect
 )

go.sum

@@ -1,48 +1,51 @@
+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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
-github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIct4=
+github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
 github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
 github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/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/twmb/franz-go v1.18.0 h1:25FjMZfdozBywVX+5xrWC2W+W76i0xykKjTdEeD2ejw=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/twmb/franz-go v1.18.0/go.mod h1:zXCGy74M0p5FbXsLeASdyvfLFsBvTubVqctIaa5wQ+I=
+github.com/twmb/franz-go v1.18.1 h1:D75xxCDyvTqBSiImFx2lkPduE39jz1vaD7+FNc+vMkc=
-github.com/twmb/franz-go/pkg/kadm v1.14.0 h1:nAn1co1lXzJQocpzyIyOFOjUBf4WHWs5/fTprXy2IZs=
+github.com/twmb/franz-go v1.18.1/go.mod h1:Uzo77TarcLTUZeLuGq+9lNpSkfZI+JErv7YJhlDjs9M=
-github.com/twmb/franz-go/pkg/kadm v1.14.0/go.mod h1:XjOPz6ZaXXjrW2jVCfLuucP8H1w2TvD6y3PT2M+aAM4=
+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=
-go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
-go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
-go.unistack.org/micro/v3 v3.11.0 h1:usQ+8wQuOWpQd4+DGhFXSgZ+e+wOBjuT3W5GJZ02bSs=
+go.unistack.org/micro/v4 v4.1.4 h1:gyjVPP9g7UAFZlhEbla9Ih/BeKJfBLAbN/NvAhJCpKU=
-go.unistack.org/micro/v3 v3.11.0/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro/v4 v4.1.4/go.mod h1:lr3oYED8Ay1vjK68QqRw30QOtdk/ffpZqMFDasOUhKw=
-go.unistack.org/micro/v3 v3.11.22 h1:VPtp/+rp/baKlNb6WVlx4ZzufYuwHrfABoftnDi1uek=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-go.unistack.org/micro/v3 v3.11.22/go.mod h1:TjF2+KJ2RG+IB4d0wnXtaF5KgqwAqy/AMh+w9gDpRHg=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 h1:Z7FRVJPSMaHQxD0uXU8WdgFh8PseLM8Q8NzhnpMrBhQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
-google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
-google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
-google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

kadmtest.go

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

kgo.go

@@ -5,31 +5,37 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
-	"net/http"
 	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/twmb/franz-go/pkg/kgo"
 	"github.com/twmb/franz-go/pkg/kmsg"
-	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v4/broker"
-	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v3/semconv"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/options"
-	mrand "go.unistack.org/micro/v3/util/rand"
+	"go.unistack.org/micro/v4/semconv"
+	"go.unistack.org/micro/v4/tracer"
+	"go.unistack.org/micro/v4/util/id"
+	mrand "go.unistack.org/micro/v4/util/rand"
 )
 
 var _ broker.Broker = (*Broker)(nil)
 
+var messagePool = sync.Pool{
+	New: func() interface{} {
+		return &kgoMessage{}
+	},
+}
+
 var ErrLostMessage = errors.New("message not marked for offsets commit and will be lost in next iteration")
 
 var DefaultRetryBackoffFn = func() func(int) time.Duration {
 	var rngMu sync.Mutex
-	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
 	return func(fails int) time.Duration {
 		const (
 			min = 100 * time.Millisecond
@@ -45,7 +51,7 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
 		backoff := min * time.Duration(1<<(fails-1))
 
 		rngMu.Lock()
-		jitter := 0.8 + 0.4*rng.Float64()
+		jitter := 0.8 + 0.4*rand.Float64()
 		rngMu.Unlock()
 
 		backoff = time.Duration(float64(backoff) * jitter)
@@ -58,13 +64,18 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
 }()
 
 type Broker struct {
-	init      bool
+	funcPublish   broker.FuncPublish
-	c         *kgo.Client
+	funcSubscribe broker.FuncSubscribe
-	kopts     []kgo.Opt
+	c             *kgo.Client
-	connected *atomic.Uint32
+	connected     *atomic.Uint32
-	sync.RWMutex
+
+	kopts []kgo.Opt
+	subs  []*Subscriber
+
 	opts broker.Options
-	subs []*Subscriber
+
+	sync.RWMutex
+	init bool
 }
 
 func (r *Broker) Live() bool {
@@ -91,6 +102,68 @@ 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
@@ -108,10 +181,18 @@ func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *ho
 		}
 	}
 
+	var fatalOnError bool
+	if k.opts.Context != nil {
+		if v, ok := k.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
+			fatalOnError = v
+		}
+	}
+
 	htracer := &hookTracer{group: group, clientID: clientID, tracer: k.opts.Tracer}
 	opts = append(opts,
 		kgo.WithHooks(&hookMeter{meter: k.opts.Meter}),
 		kgo.WithHooks(htracer),
+		kgo.WithHooks(&hookEvent{log: k.opts.Logger, fatalOnError: fatalOnError, connected: k.connected}),
 	)
 
 	select {
@@ -133,8 +214,9 @@ func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *ho
 			}
 			return nil, nil, err
 		}
+		k.connected.Store(1)
+		return c, htracer, nil
 	}
-	return c, htracer, nil
 }
 
 func (k *Broker) Connect(ctx context.Context) error {
@@ -228,6 +310,18 @@ func (k *Broker) Init(opts ...broker.Option) error {
 		}
 	}
 
+	k.funcPublish = k.fnPublish
+	k.funcSubscribe = k.fnSubscribe
+
+	k.opts.Hooks.EachPrev(func(hook options.Hook) {
+		switch h := hook.(type) {
+		case broker.HookPublish:
+			k.funcPublish = h(k.funcPublish)
+		case broker.HookSubscribe:
+			k.funcSubscribe = h(k.funcSubscribe)
+		}
+	})
+
 	k.init = true
 
 	return nil
@@ -237,93 +331,88 @@ func (k *Broker) Options() broker.Options {
 	return k.opts
 }
 
-func (k *Broker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (b *Broker) Publish(ctx context.Context, topic string, messages ...broker.Message) error {
-	return k.publish(ctx, msgs, opts...)
+	return b.funcPublish(ctx, topic, messages...)
 }
 
-func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
+func (b *Broker) fnPublish(ctx context.Context, topic string, messages ...broker.Message) error {
-	msg.Header.Set(metadata.HeaderTopic, topic)
+	return b.publish(ctx, topic, messages...)
-	return k.publish(ctx, []*broker.Message{msg}, opts...)
 }
 
-func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.Message) error {
-	k.Lock()
+	if b.connected.Load() == 0 {
-	if k.connected.Load() == 0 {
+		c, _, err := b.connect(ctx, b.kopts...)
-		c, _, err := k.connect(ctx, k.kopts...)
 		if err != nil {
-			k.Unlock()
 			return err
 		}
-		k.c = c
+		b.Lock()
-		k.connected.Store(1)
+		b.c = c
+		b.Unlock()
 	}
-	k.Unlock()
 
-	options := broker.NewPublishOptions(opts...)
+	records := make([]*kgo.Record, 0, len(messages))
-	records := make([]*kgo.Record, 0, len(msgs))
 	var errs []string
-	var err error
 	var key []byte
 	var promise func(*kgo.Record, error)
 
-	if options.Context != nil {
+	for _, msg := range messages {
-		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
-		}
-	}
 
-	for _, msg := range msgs {
+		if mctx := msg.Context(); mctx != nil {
-		rec := &kgo.Record{Context: ctx, Key: key}
+			if k, ok := mctx.Value(publishKey{}).([]byte); ok && k != nil {
-		rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
+				key = k
-		msg.Header.Del(metadata.HeaderTopic)
-		k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
-		if options.BodyOnly || k.opts.Codec.String() == "noop" {
-			rec.Value = msg.Body
-			for k, v := range msg.Header {
-				rec.Headers = append(rec.Headers, kgo.RecordHeader{Key: http.CanonicalHeaderKey(k), Value: []byte(v)})
 			}
-		} else {
+			if p, ok := mctx.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
-			rec.Value, err = k.opts.Codec.Marshal(msg)
+				promise = p
-			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 {
-			k.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
+			b.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
 				te := time.Since(ts)
-				k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Dec()
+				b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Dec()
-				k.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
+				b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
-				k.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
+				b.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
 				if err != nil {
-					k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "failure").Inc()
+					b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "failure").Inc()
 				} else {
-					k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "success").Inc()
+					b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "success").Inc()
 				}
 				promise(r, err)
 			})
 		}
 		return nil
 	}
-	ts := time.Now()
+
-	results := k.c.ProduceSync(ctx, records...)
+	results := b.c.ProduceSync(ctx, records...)
+
 	te := time.Since(ts)
 	for _, result := range results {
-		k.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
+		b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
-		k.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
+		b.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
-		k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
+		b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
 		if result.Err != nil {
-			k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
+			b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
 			errs = append(errs, result.Err.Error())
 		} else {
-			k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "success").Inc()
+			b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "success").Inc()
 		}
 	}
 
@@ -350,38 +439,66 @@ func (k *Broker) TopicExists(ctx context.Context, topic string) error {
 	return nil
 }
 
-func (k *Broker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (b *Broker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	return nil, nil
+	return b.funcSubscribe(ctx, topic, handler, opts...)
 }
 
-func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+	if err := broker.IsValidHandler(handler); err != nil {
+		return nil, err
+	}
+
 	options := broker.NewSubscribeOptions(opts...)
 
+	switch handler.(type) {
+	default:
+		return nil, broker.ErrInvalidHandler
+	case func(broker.Message) error:
+		break
+	case func([]broker.Message) error:
+		break
+	}
+
 	if options.Group == "" {
-		uid, err := uuid.NewRandom()
+		uid, err := id.New()
 		if err != nil {
 			return nil, err
 		}
-		options.Group = uid.String()
+		options.Group = uid
 	}
 
 	commitInterval := DefaultCommitInterval
-	if k.opts.Context != nil {
+	if b.opts.Context != nil {
-		if v, ok := k.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
+		if v, ok := b.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
 			commitInterval = v
 		}
 	}
 
-	sub := &Subscriber{
+	var fatalOnError bool
-		topic:     topic,
+	if b.opts.Context != nil {
-		opts:      options,
+		if v, ok := b.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
-		handler:   handler,
+			fatalOnError = v
-		kopts:     k.opts,
+		}
-		consumers: make(map[tp]*consumer),
-		done:      make(chan struct{}),
 	}
 
-	kopts := append(k.kopts,
+	if options.Context != nil {
+		if v, ok := options.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
+			fatalOnError = v
+		}
+	}
+
+	sub := &Subscriber{
+		topic:        topic,
+		opts:         options,
+		handler:      handler,
+		kopts:        b.opts,
+		consumers:    make(map[tp]*consumer),
+		done:         make(chan struct{}),
+		fatalOnError: fatalOnError,
+		connected:    b.connected,
+	}
+
+	kopts := append(b.kopts,
 		kgo.ConsumerGroup(options.Group),
 		kgo.ConsumeTopics(topic),
 		kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
@@ -389,7 +506,9 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 		kgo.AutoCommitInterval(commitInterval),
 		kgo.OnPartitionsAssigned(sub.assigned),
 		kgo.OnPartitionsRevoked(sub.revoked),
+		kgo.StopProducerOnDataLossDetected(),
 		kgo.OnPartitionsLost(sub.lost),
+		kgo.AutoCommitCallback(sub.autocommit),
 		kgo.AutoCommitMarks(),
 	)
 
@@ -399,7 +518,7 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 		}
 	}
 
-	c, htracer, err := k.connect(ctx, kopts...)
+	c, htracer, err := b.connect(ctx, kopts...)
 	if err != nil {
 		return nil, err
 	}
@@ -421,9 +540,10 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 
 	go sub.poll(ctx)
 
-	k.Lock()
+	b.Lock()
-	k.subs = append(k.subs, sub)
+	b.subs = append(b.subs, sub)
-	k.Unlock()
+	b.Unlock()
+
 	return sub, nil
 }
 
@@ -450,7 +570,7 @@ func NewBroker(opts ...broker.Option) *Broker {
 		kgo.BlockRebalanceOnPoll(),
 		kgo.Balancers(kgo.CooperativeStickyBalancer()),
 		kgo.FetchIsolationLevel(kgo.ReadUncommitted()),
-		kgo.UnknownTopicRetries(0),
+		kgo.UnknownTopicRetries(1),
 	}
 
 	if options.Context != nil {

kgo_test.go

@@ -2,7 +2,6 @@ package kgo_test
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"strings"
 	"sync/atomic"
@@ -10,22 +9,107 @@ import (
 	"time"
 
 	kg "github.com/twmb/franz-go/pkg/kgo"
-	kgo "go.unistack.org/micro-broker-kgo/v3"
+	kgo "go.unistack.org/micro-broker-kgo/v4"
-	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v4/broker"
-	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/logger/slog"
+	"go.unistack.org/micro/v4/metadata"
 )
 
 var (
-	msgcnt   = int64(12000000)
+	msgcnt   = int64(1200)
 	group    = "38"
-	prefill  = false
+	prefill  = true
-	loglevel = logger.InfoLevel
+	loglevel = logger.DebugLevel
 )
 
-var bm = &broker.Message{
+func TestFail(t *testing.T) {
-	Header: map[string]string{"hkey": "hval", metadata.HeaderTopic: "test"},
+	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
-	Body:   []byte(`"body"`),
+		t.Skip()
+	}
+
+	logger.DefaultLogger = slog.NewLogger()
+	if err := logger.DefaultLogger.Init(logger.WithLevel(loglevel)); err != nil {
+		t.Fatal(err)
+	}
+	ctx := context.Background()
+
+	var addrs []string
+	if addr := os.Getenv("BROKER_ADDRS"); len(addr) == 0 {
+		addrs = []string{"127.0.0.1:9092"}
+	} else {
+		addrs = strings.Split(addr, ",")
+	}
+
+	b := kgo.NewBroker(
+		broker.Addrs(addrs...),
+		kgo.CommitInterval(5*time.Second),
+		kgo.Options(kg.ClientID("test"), kg.FetchMaxBytes(10*1024*1024),
+			kg.AllowAutoTopicCreation(),
+		),
+	)
+
+	t.Logf("broker init")
+	if err := b.Init(); err != nil {
+		t.Fatal(err)
+	}
+
+	t.Logf("broker connect")
+	if err := b.Connect(ctx); err != nil {
+		t.Fatal(err)
+	}
+
+	defer func() {
+		t.Logf("broker disconnect")
+		if err := b.Disconnect(ctx); err != nil {
+			t.Fatal(err)
+		}
+	}()
+
+	t.Logf("broker health %v", b.Health())
+	msgs := make([]broker.Message, 0, msgcnt)
+	for i := int64(0); i < msgcnt; i++ {
+		m, _ := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
+		msgs = append(msgs, m)
+	}
+
+	for _, msg := range msgs {
+		t.Logf("broker publish")
+		if err := b.Publish(ctx, "test", msg); err != nil {
+			t.Fatal(err)
+		}
+	}
+	//	t.Skip()
+
+	idx := int64(0)
+	fn := func(msg broker.Message) error {
+		atomic.AddInt64(&idx, 1)
+		time.Sleep(500 * time.Millisecond)
+		t.Logf("ack")
+		return msg.Ack()
+	}
+
+	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)
+		}
+	}()
+
+	for {
+		t.Logf("health check")
+		if !b.Health() {
+			t.Logf("health works")
+			break
+		}
+		time.Sleep(1 * time.Second)
+	}
 }
 
 func TestConnect(t *testing.T) {
@@ -67,6 +151,7 @@ func TestPubSub(t *testing.T) {
 		kgo.CommitInterval(5*time.Second),
 		kgo.Options(kg.ClientID("test"), kg.FetchMaxBytes(10*1024*1024)),
 	)
+
 	if err := b.Init(); err != nil {
 		t.Fatal(err)
 	}
@@ -81,19 +166,20 @@ func TestPubSub(t *testing.T) {
 		}
 	}()
 	if prefill {
-		msgs := make([]*broker.Message, 0, msgcnt)
+		msgs := make([]broker.Message, 0, msgcnt)
 		for i := int64(0); i < msgcnt; i++ {
-			msgs = append(msgs, bm)
+			m, _ := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
+			msgs = append(msgs, m)
 		}
 
-		if err := b.BatchPublish(ctx, msgs); err != nil {
+		if err := b.Publish(ctx, "test", msgs...); err != nil {
 			t.Fatal(err)
 		}
 		//	t.Skip()
 	}
 	done := make(chan bool, 1)
 	idx := int64(0)
-	fn := func(msg broker.Event) error {
+	fn := func(msg broker.Message) error {
 		atomic.AddInt64(&idx, 1)
 		// time.Sleep(200 * time.Millisecond)
 		return msg.Ack()
@@ -124,7 +210,7 @@ func TestPubSub(t *testing.T) {
 				if prc := atomic.LoadInt64(&idx); prc == msgcnt {
 					close(done)
 				} else {
-					fmt.Printf("processed %v\n", prc)
+					t.Logf("processed %v\n", prc)
 				}
 			case <-ticker.C:
 				close(done)

logger.go

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

meter.go

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

options.go

@@ -5,8 +5,7 @@ import (
 	"time"
 
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v4/broker"
-	"go.unistack.org/micro/v3/client"
 )
 
 var (
@@ -35,11 +34,6 @@ 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
@@ -72,6 +66,12 @@ func SubscribeOptions(opts ...kgo.Opt) broker.SubscribeOption {
 	}
 }
 
+type fatalOnErrorKey struct{}
+
+func FatalOnError(b bool) broker.Option {
+	return broker.SetOption(fatalOnErrorKey{}, b)
+}
+
 type clientIDKey struct{}
 
 func ClientID(id string) broker.Option {
@@ -98,14 +98,14 @@ func SubscribeMaxInFlight(n int) broker.SubscribeOption {
 	return broker.SetSubscribeOption(subscribeMaxInflightKey{}, n)
 }
 
+// SubscribeMaxInFlight max queued messages
+func SubscribeFatalOnError(b bool) broker.SubscribeOption {
+	return broker.SetSubscribeOption(fatalOnErrorKey{}, b)
+}
+
 type publishPromiseKey struct{}
 
 // PublishPromise set the kafka promise func for Produce
 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)
-}

subscriber.go

@@ -5,15 +5,17 @@ import (
 	"fmt"
 	"strconv"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/twmb/franz-go/pkg/kadm"
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/broker"
+	"github.com/twmb/franz-go/pkg/kmsg"
-	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v4/broker"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v3/semconv"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/semconv"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 type tp struct {
@@ -22,29 +24,34 @@ type tp struct {
 }
 
 type consumer struct {
-	c         *kgo.Client
 	topic     string
-	partition int32
+	c         *kgo.Client
 	htracer   *hookTracer
-	opts      broker.SubscribeOptions
-	kopts     broker.Options
-	handler   broker.Handler
 	quit      chan struct{}
 	done      chan struct{}
 	recs      chan kgo.FetchTopicPartition
+	kopts     broker.Options
+	partition int32
+	opts      broker.SubscribeOptions
+	handler   interface{}
+	connected *atomic.Uint32
 }
 
 type Subscriber struct {
-	c         *kgo.Client
-	topic     string
-	htracer   *hookTracer
-	opts      broker.SubscribeOptions
-	kopts     broker.Options
-	handler   broker.Handler
-	closed    bool
-	done      chan struct{}
 	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
+	closed       bool
+	fatalOnError bool
 }
 
 func (s *Subscriber) Client() *kgo.Client {
@@ -138,8 +145,8 @@ func (s *Subscriber) poll(ctx context.Context) {
 			})
 
 			fetches.EachPartition(func(p kgo.FetchTopicPartition) {
-				tp := tp{p.Topic, p.Partition}
+				tps := tp{p.Topic, p.Partition}
-				s.consumers[tp].recs <- p
+				s.consumers[tps].recs <- p
 			})
 			s.c.AllowRebalance()
 		}
@@ -152,9 +159,9 @@ func (s *Subscriber) killConsumers(ctx context.Context, lost map[string][]int32)
 
 	for topic, partitions := range lost {
 		for _, partition := range partitions {
-			tp := tp{topic, partition}
+			tps := tp{topic, partition}
-			pc := s.consumers[tp]
+			pc := s.consumers[tps]
-			delete(s.consumers, tp)
+			delete(s.consumers, tps)
 			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))
@@ -165,11 +172,21 @@ func (s *Subscriber) killConsumers(ctx context.Context, lost map[string][]int32)
 	}
 }
 
+func (s *Subscriber) autocommit(_ *kgo.Client, _ *kmsg.OffsetCommitRequest, _ *kmsg.OffsetCommitResponse, err error) {
+	if err != nil {
+		s.connected.Store(0)
+		if s.fatalOnError {
+			s.kopts.Logger.Fatal(context.TODO(), "kgo.AutoCommitCallback error", err)
+		}
+	}
+}
+
 func (s *Subscriber) lost(ctx context.Context, _ *kgo.Client, lost map[string][]int32) {
-	if s.kopts.Logger.V(logger.DebugLevel) {
+	if s.kopts.Logger.V(logger.ErrorLevel) {
-		s.kopts.Logger.Debug(ctx, fmt.Sprintf("[kgo] lost %#+v", lost))
+		s.kopts.Logger.Error(ctx, fmt.Sprintf("[kgo] lost %#+v", lost))
 	}
 	s.killConsumers(ctx, lost)
+	// s.connected.Store(0)
 }
 
 func (s *Subscriber) revoked(ctx context.Context, c *kgo.Client, revoked map[string][]int32) {
@@ -179,6 +196,7 @@ func (s *Subscriber) revoked(ctx context.Context, c *kgo.Client, revoked map[str
 	s.killConsumers(ctx, revoked)
 	if err := c.CommitMarkedOffsets(ctx); err != nil {
 		s.kopts.Logger.Error(ctx, "[kgo] revoked CommitMarkedOffsets error", err)
+		// s.connected.Store(0)
 	}
 }
 
@@ -196,6 +214,7 @@ func (s *Subscriber) assigned(_ context.Context, c *kgo.Client, assigned map[str
 				handler:   s.handler,
 				kopts:     s.kopts,
 				opts:      s.opts,
+				connected: s.connected,
 			}
 			s.Lock()
 			s.consumers[tp{topic, partition}] = pc
@@ -206,17 +225,14 @@ 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:
@@ -226,95 +242,48 @@ func (pc *consumer) consume() {
 				ctx, sp := pc.htracer.WithProcessSpan(record)
 				ts := time.Now()
 				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Inc()
-				p := eventPool.Get().(*event)
+				p := messagePool.Get().(*kgoMessage)
-				p.msg.Header = nil
+
-				p.msg.Body = nil
+				p.body = record.Value
 				p.topic = record.Topic
-				p.err = nil
 				p.ack = false
-				p.msg.Header = metadata.New(len(record.Headers))
+				p.hdr = metadata.New(len(record.Headers))
 				p.ctx = ctx
 				for _, hdr := range record.Headers {
-					p.msg.Header.Set(hdr.Key, string(hdr.Value))
+					p.hdr.Set(hdr.Key, string(hdr.Value))
 				}
-				if pc.kopts.Codec.String() == "noop" {
+
-					p.msg.Body = record.Value
+				switch h := pc.handler.(type) {
-				} else if pc.opts.BodyOnly {
+				case func(broker.Message) error:
-					p.msg.Body = record.Value
+					err = h(p)
-				} else {
+				case func([]broker.Message) error:
-					sp.AddEvent("codec unmarshal start")
+					err = h([]broker.Message{p})
-					err := pc.kopts.Codec.Unmarshal(record.Value, p.msg)
-					sp.AddEvent("codec unmarshal stop")
-					if err != 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.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.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] Unmarshal err not handled wtf?")
-						sp.Finish()
-						return
-					}
 				}
-				sp.AddEvent("handler start")
+
-				err := pc.handler(p)
+				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
-				sp.AddEvent("handler stop")
+				if err != nil {
-				if err == nil {
-					pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "success").Inc()
-				} else {
 					sp.SetStatus(tracer.SpanStatusError, err.Error())
 					pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc()
-				}
+				} else if pc.opts.AutoAck {
-				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
-				if err == nil && pc.opts.AutoAck {
 					p.ack = true
-				} else if err != nil {
-					p.err = err
-					if eh != nil {
-						sp.AddEvent("error handler start")
-						_ = eh(p)
-						sp.AddEvent("error handler stop")
-					} else {
-						if pc.kopts.Logger.V(logger.ErrorLevel) {
-							pc.kopts.Logger.Error(pc.kopts.Context, "[kgo]: subscriber error", err)
-						}
-					}
 				}
+
 				te := time.Since(ts)
 				pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
 				pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
-				if p.ack {
+
-					eventPool.Put(p)
+				ack := p.ack
+				messagePool.Put(p)
+
+				if ack {
 					pc.c.MarkCommitRecords(record)
 				} else {
-					eventPool.Put(p)
-					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
-					sp.SetStatus(tracer.SpanStatusError, "ErrLostMessage")
 					sp.Finish()
+					pc.connected.Store(0)
+					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] message not commited")
 					return
 				}
+
 				sp.Finish()
 			}
 		}

tracer.go

@@ -6,14 +6,14 @@ import (
 
 	"github.com/twmb/franz-go/pkg/kgo"
 	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 type hookTracer struct {
+	tracer   tracer.Tracer
 	clientID string
 	group    string
-	tracer   tracer.Tracer
 }
 
 var messagingSystem = semconv.MessagingSystemKey.String("kafka")
@@ -68,7 +68,7 @@ func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
 		r.Context, _ = m.tracer.Start(r.Context, "sdk.broker", opts...)
 	}
 
-	setHeaders(r, omd)
+	setHeaders(r, omd, metadata.HeaderContentType)
 }
 
 // OnProduceRecordUnbuffered continues and ends the "publish" span for an
@@ -135,7 +135,7 @@ func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
 		r.Context, _ = m.tracer.Start(r.Context, "sdk.broker", opts...)
 	}
 
-	setHeaders(r, omd)
+	setHeaders(r, omd, metadata.HeaderContentType)
 }
 
 // OnFetchRecordUnbuffered continues and ends the "receive" span for an