#133 fix race. (#134)

Co-authored-by: Gorbunov Kirill Andreevich <kgorbunov@mtsbank.ru>
Reviewed-on: #134
Co-authored-by: Кирилл Горбунов <kirya_gorbunov_2015@mail.ru>
Co-committed-by: Кирилл Горбунов <kirya_gorbunov_2015@mail.ru>

.github/workflows/autoapprove.yml

@@ -0,0 +1,20 @@
+name: "autoapprove"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  autoapprove:
+    runs-on: ubuntu-latest
+    steps:
+      - name: approve
+        uses: hmarr/auto-approve-action@v3
+        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
+        id: approve
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -0,0 +1,21 @@
+name: "automerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'vtolstov'
+    steps:
+      - name: merge
+        id: merge
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/build.yml

@@ -3,19 +3,20 @@ on:
  push:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.4.0
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

.github/workflows/codeql-analysis.yml

@@ -43,14 +43,14 @@ jobs:
 
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     # Initializes the CodeQL tools for scanning.
     - name: init
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +61,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -75,4 +75,4 @@ jobs:
     #   make release
 
     - name: analyze
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -1,4 +1,4 @@
-name: "prautomerge"
+name: "dependabot-automerge"
 
 on:
   pull_request_target:
@@ -9,21 +9,17 @@ permissions:
   contents: write
 
 jobs:
-  dependabot:
+  automerge:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
+    if: github.actor == 'dependabot[bot]'
     steps:
       - name: metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.1.1
+        uses: dependabot/fetch-metadata@v1.3.6
         with:
           github-token: "${{ secrets.TOKEN }}"
-      - name: approve
-        run: gh pr review --approve "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}
       - name: merge
+        id: merge
         if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
         run: gh pr merge --auto --merge "$PR_URL"
         env:

.github/workflows/pr.yml

@@ -3,19 +3,20 @@ on:
   pull_request:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.4.0
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

README.md

@@ -1,9 +1,2 @@
-# micro-broker-kgo
-yet another micro kafka broker alternative
+# broker-kgo
 
-TODO:
-* dont always append options from context on Init and New
-* add SubscriberOptions(...kgo.Opt)
-* add ServerSubscribeOptions(...kgo.Opt)
-* check PublisherOptions(...kgo.Opt)
-* check ClientPublisherOptions(...kgo.Opt)

carrier.go

@@ -0,0 +1,53 @@
+package kgo
+
+import (
+	"github.com/twmb/franz-go/pkg/kgo"
+)
+
+// RecordCarrier injects and extracts traces from a kgo.Record.
+//
+// This type exists to satisfy the otel/propagation.TextMapCarrier interface.
+type RecordCarrier struct {
+	record *kgo.Record
+}
+
+// NewRecordCarrier creates a new RecordCarrier.
+func NewRecordCarrier(record *kgo.Record) RecordCarrier {
+	return RecordCarrier{record: record}
+}
+
+// Get retrieves a single value for a given key if it exists.
+func (c RecordCarrier) Get(key string) string {
+	for _, h := range c.record.Headers {
+		if h.Key == key {
+			return string(h.Value)
+		}
+	}
+	return ""
+}
+
+// Set sets a header.
+func (c RecordCarrier) Set(key, val string) {
+	// Check if key already exists.
+	for i, h := range c.record.Headers {
+		if h.Key == key {
+			// Key exist, update the value.
+			c.record.Headers[i].Value = []byte(val)
+			return
+		}
+	}
+	// Key does not exist, append new header.
+	c.record.Headers = append(c.record.Headers, kgo.RecordHeader{
+		Key:   key,
+		Value: []byte(val),
+	})
+}
+
+// Keys returns a slice of all key identifiers in the carrier.
+func (c RecordCarrier) Keys() []string {
+	out := make([]string, len(c.record.Headers))
+	for i, h := range c.record.Headers {
+		out[i] = h.Key
+	}
+	return out
+}

event.go

@@ -0,0 +1,42 @@
+package kgo
+
+import (
+	"sync"
+
+	"go.unistack.org/micro/v3/broker"
+)
+
+type event struct {
+	topic string
+	err   error
+	sync.RWMutex
+	msg *broker.Message
+	ack bool
+}
+
+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,10 +1,24 @@
 module go.unistack.org/micro-broker-kgo/v3
 
-go 1.16
+go 1.21
+
+toolchain go1.22.1
 
 require (
-	github.com/pierrec/lz4/v4 v4.1.12 // indirect
-	github.com/twmb/franz-go v1.2.6
-	github.com/twmb/franz-go/pkg/kmsg v0.0.0-20211207071611-6a03ca9e400b
-	go.unistack.org/micro/v3 v3.8.12
+	github.com/google/uuid v1.6.0
+	github.com/twmb/franz-go v1.16.1
+	github.com/twmb/franz-go/pkg/kadm v1.11.0
+	github.com/twmb/franz-go/pkg/kmsg v1.7.0
+	go.opentelemetry.io/otel v1.25.0
+	go.unistack.org/micro/v3 v3.10.59
+)
+
+require (
+	github.com/klauspost/compress v1.17.8 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240412170617-26222e5d3d56 // indirect
+	google.golang.org/grpc v1.63.2 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 )

go.sum

@@ -1,67 +1,40 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
-github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
-github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
-github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
-github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc=
-github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
-github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pierrec/lz4/v4 v4.1.11/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.12 h1:44l88ehTZAUGW4VlO1QC4zkilL99M6Y9MXNwEs0uzP8=
-github.com/pierrec/lz4/v4 v4.1.12/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+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.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
+github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
+github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/twmb/franz-go v1.2.6 h1:WVub2Sml7LqER9VU0WxsiOTom4LBK7YMj+7jbqadE3U=
-github.com/twmb/franz-go v1.2.6/go.mod h1:P+i2DnBaec1o0z9EI8CyAM/WAjG99CHI3oCAhZDoy48=
-github.com/twmb/franz-go/pkg/kmsg v0.0.0-20211127185622-3b34db0c6d1e/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
-github.com/twmb/franz-go/pkg/kmsg v0.0.0-20211207071611-6a03ca9e400b h1:rCe006NN/89GvtdXqRbgsqtL/nVTj83/dQ9ok8DJFcM=
-github.com/twmb/franz-go/pkg/kmsg v0.0.0-20211207071611-6a03ca9e400b/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
-github.com/twmb/go-rbtree v1.0.0 h1:KxN7dXJ8XaZ4cvmHV1qqXTshxX3EBvX/toG5+UR49Mg=
-github.com/twmb/go-rbtree v1.0.0/go.mod h1:UlIAI8gu3KRPkXSobZnmJfVwCJgEhD/liWzT5ppzIyc=
-go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA=
-go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8=
-go.unistack.org/micro/v3 v3.8.12 h1:ACaHE8ZIHFXqEGPSRvXzND4hcqCSQf04WkzOFY6Y1gQ=
-go.unistack.org/micro/v3 v3.8.12/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/twmb/franz-go v1.16.1 h1:rpWc7fB9jd7TgmCyfxzenBI+QbgS8ZfJOUQE+tzPtbE=
+github.com/twmb/franz-go v1.16.1/go.mod h1:/pER254UPPGp/4WfGqRi+SIRGE50RSQzVubQp6+N4FA=
+github.com/twmb/franz-go/pkg/kadm v1.11.0 h1:FfeWJ0qadntFpAcQt8JzNXW4dijjytZNLrzJuzzzuxA=
+github.com/twmb/franz-go/pkg/kadm v1.11.0/go.mod h1:qrhkdH+SWS3ivmbqOgHbpgVHamhaKcjH0UM+uOp0M1A=
+github.com/twmb/franz-go/pkg/kmsg v1.7.0 h1:a457IbvezYfA5UkiBvyV3zj0Is3y1i8EJgqjJYoij2E=
+github.com/twmb/franz-go/pkg/kmsg v1.7.0/go.mod h1:se9Mjdt0Nwzc9lnjJ0HyDtLyBnaBDAd7pCje47OhSyw=
+go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k=
+go.opentelemetry.io/otel v1.25.0/go.mod h1:Wa2ds5NOXEMkCmUou1WA7ZBfLTHWIsp034OVD7AO+Vg=
+go.unistack.org/micro/v3 v3.10.59 h1:eneYXJLgyu5MZpSvyI0K17CeXvgOoUCN5dWZaPV5lI4=
+go.unistack.org/micro/v3 v3.10.59/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240412170617-26222e5d3d56 h1:zviK8GX4VlMstrK3JkexM5UHjH1VOkRebH9y3jhSBGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240412170617-26222e5d3d56/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
+google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
+google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+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

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

kgo.go

@@ -1,109 +1,120 @@
 // Package kgo provides a kafka broker using kgo
-package kgo // import "go.unistack.org/micro-broker-kgo/v3"
+package kgo
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"math/rand"
 	"strings"
 	"sync"
 	"time"
 
-	"github.com/twmb/franz-go/pkg/kerr"
-	kgo "github.com/twmb/franz-go/pkg/kgo"
+	"github.com/google/uuid"
+	"github.com/twmb/franz-go/pkg/kgo"
 	"github.com/twmb/franz-go/pkg/kmsg"
-	"github.com/twmb/franz-go/pkg/kversion"
 	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/util/id"
+	"go.unistack.org/micro/v3/semconv"
+	"go.unistack.org/micro/v3/tracer"
 	mrand "go.unistack.org/micro/v3/util/rand"
 )
 
-var _ broker.Broker = &kBroker{}
+var _ broker.Broker = (*Broker)(nil)
 
-type kBroker struct {
-	writer    *kgo.Client // used only to push messages
+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
+			max = time.Second
+		)
+		if fails <= 0 {
+			return min
+		}
+		if fails > 10 {
+			return max
+		}
+
+		backoff := min * time.Duration(1<<(fails-1))
+
+		rngMu.Lock()
+		jitter := 0.8 + 0.4*rng.Float64()
+		rngMu.Unlock()
+
+		backoff = time.Duration(float64(backoff) * jitter)
+
+		if backoff > max {
+			return max
+		}
+		return backoff
+	}
+}()
+
+type Broker struct {
+	init      bool
+	c         *kgo.Client
 	kopts     []kgo.Opt
 	connected bool
-	init      bool
 	sync.RWMutex
 	opts broker.Options
 	subs []*subscriber
 }
 
-type subscriber struct {
-	reader       *kgo.Client // used only to pull messages
-	topic        string
-	opts         broker.SubscribeOptions
-	kopts        broker.Options
-	handler      broker.Handler
-	batchhandler broker.BatchHandler
-	closed       bool
-	done         chan struct{}
-	consumers    map[string]map[int32]worker
-	sync.RWMutex
-}
-
-type publication struct {
-	topic string
-	err   error
-	sync.RWMutex
-	msg *broker.Message
-	ack bool
-}
-
-func (p *publication) Topic() string {
-	return p.topic
-}
-
-func (p *publication) Message() *broker.Message {
-	return p.msg
-}
-
-func (p *publication) Ack() error {
-	p.ack = true
-	return nil
-}
-
-func (p *publication) Error() error {
-	return p.err
-}
-
-func (p *publication) SetError(err error) {
-	p.err = err
-}
-
-func (s *subscriber) Options() broker.SubscribeOptions {
-	return s.opts
-}
-
-func (s *subscriber) Topic() string {
-	return s.topic
-}
-
-func (s *subscriber) Unsubscribe(ctx context.Context) error {
-	if s.closed {
-		return nil
-	}
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	default:
-		close(s.done)
-		s.closed = true
-	}
-	return nil
-}
-
-func (k *kBroker) Address() string {
+func (k *Broker) Address() string {
 	return strings.Join(k.opts.Addrs, ",")
 }
 
-func (k *kBroker) Name() string {
+func (k *Broker) Name() string {
 	return k.opts.Name
 }
 
-func (k *kBroker) Connect(ctx context.Context) error {
+func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, error) {
+	var c *kgo.Client
+	var err error
+
+	sp, _ := tracer.SpanFromContext(ctx)
+
+	clientID := "kgo"
+	group := ""
+	if k.opts.Context != nil {
+		if id, ok := k.opts.Context.Value(clientIDKey{}).(string); ok {
+			clientID = id
+		}
+		if id, ok := k.opts.Context.Value(groupKey{}).(string); ok {
+			group = id
+		}
+	}
+
+	opts = append(opts,
+		kgo.WithHooks(&hookMeter{meter: k.opts.Meter}),
+		kgo.WithHooks(&hookTracer{group: group, clientID: clientID, tracer: k.opts.Tracer}),
+	)
+
+	select {
+	case <-ctx.Done():
+		if ctx.Err() != nil {
+			sp.SetStatus(tracer.SpanStatusError, ctx.Err().Error())
+		}
+		return nil, ctx.Err()
+	default:
+		c, err = kgo.NewClient(opts...)
+		if err == nil {
+			err = c.Ping(ctx) // check connectivity to cluster
+		}
+		if err != nil {
+			sp.SetStatus(tracer.SpanStatusError, err.Error())
+			return nil, err
+		}
+	}
+	return c, nil
+}
+
+func (k *Broker) Connect(ctx context.Context) error {
 	k.RLock()
 	if k.connected {
 		k.RUnlock()
@@ -116,51 +127,20 @@ func (k *kBroker) Connect(ctx context.Context) error {
 		nctx = ctx
 	}
 
-	kaddrs := k.opts.Addrs
-
-	// shuffle addrs
-	var rng mrand.Rand
-	rng.Shuffle(len(kaddrs), func(i, j int) {
-		kaddrs[i], kaddrs[j] = kaddrs[j], kaddrs[i]
-	})
-
-	kopts := append(k.kopts, kgo.SeedBrokers(kaddrs...))
-
-	select {
-	case <-nctx.Done():
-		return nctx.Err()
-	default:
-		c, err := kgo.NewClient(kopts...)
+	c, err := k.connect(nctx, k.kopts...)
 	if err != nil {
 		return err
 	}
 
-		// Request versions in order to guess Kafka Cluster version
-		versionsReq := kmsg.NewApiVersionsRequest()
-		versionsRes, err := versionsReq.RequestWith(ctx, c)
-		if err != nil {
-			return fmt.Errorf("failed to request api versions: %w", err)
-		}
-		err = kerr.ErrorForCode(versionsRes.ErrorCode)
-		if err != nil {
-			return fmt.Errorf("failed to request api versions. Inner kafka error: %w", err)
-		}
-		versions := kversion.FromApiVersionsResponse(versionsRes)
-
-		if k.opts.Logger.V(logger.InfoLevel) {
-			logger.Infof(ctx, "[kgo] connected to to kafka cluster version %v", versions.VersionGuess())
-		}
-
 	k.Lock()
+	k.c = c
 	k.connected = true
-		k.writer = c
 	k.Unlock()
-	}
 
 	return nil
 }
 
-func (k *kBroker) Disconnect(ctx context.Context) error {
+func (k *Broker) Disconnect(ctx context.Context) error {
 	k.RLock()
 	if !k.connected {
 		k.RUnlock()
@@ -168,37 +148,46 @@ func (k *kBroker) Disconnect(ctx context.Context) error {
 	}
 	k.RUnlock()
 
-	k.Lock()
-	defer k.Unlock()
-
 	nctx := k.opts.Context
 	if ctx != nil {
 		nctx = ctx
 	}
+	var span tracer.Span
+	ctx, span = k.opts.Tracer.Start(ctx, "Disconnect")
+	defer span.Finish()
 
+	k.Lock()
+	defer k.Unlock()
 	select {
 	case <-nctx.Done():
 		return nctx.Err()
 	default:
 		for _, sub := range k.subs {
+			if sub.closed {
+				continue
+			}
 			if err := sub.Unsubscribe(ctx); err != nil {
 				return err
 			}
 		}
-		k.writer.Close()
+		if k.c != nil {
+			k.c.CloseAllowingRebalance()
+			// k.c.Close()
+		}
 	}
 
 	k.connected = false
 	return nil
 }
 
-func (k *kBroker) Init(opts ...broker.Option) error {
+func (k *Broker) Init(opts ...broker.Option) error {
 	k.Lock()
 	defer k.Unlock()
 
 	if len(opts) == 0 && k.init {
 		return nil
 	}
+
 	for _, o := range opts {
 		o(&k.opts)
 	}
@@ -222,51 +211,63 @@ func (k *kBroker) Init(opts ...broker.Option) error {
 		}
 	}
 
-	//	kgo.RecordPartitioner(),
-
 	k.init = true
 
 	return nil
 }
 
-func (k *kBroker) Options() broker.Options {
+func (k *Broker) Options() broker.Options {
 	return k.opts
 }
 
-func (k *kBroker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+func (k *Broker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
 	return k.publish(ctx, msgs, opts...)
 }
 
-func (k *kBroker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
+func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
 	msg.Header.Set(metadata.HeaderTopic, topic)
 	return k.publish(ctx, []*broker.Message{msg}, opts...)
 }
 
-func (k *kBroker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
-	k.RLock()
+func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+	var span tracer.Span
+	ctx, span = k.opts.Tracer.Start(ctx, "Publish")
+	defer span.Finish()
+
+	k.Lock()
 	if !k.connected {
-		k.RUnlock()
-		return broker.ErrNotConnected
+		c, err := k.connect(ctx, k.kopts...)
+		if err != nil {
+			k.Unlock()
+			return err
 		}
-	k.RUnlock()
+		k.c = c
+		k.connected = true
+	}
+	k.Unlock()
+
 	options := broker.NewPublishOptions(opts...)
 	records := make([]*kgo.Record, 0, len(msgs))
 	var errs []string
 	var err error
 	var key []byte
+	var promise func(*kgo.Record, error)
 
 	if options.Context != nil {
 		if k, ok := options.Context.Value(publishKey{}).([]byte); ok && k != nil {
 			key = k
 		}
+		if p, ok := options.Context.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
+			promise = p
+		}
 	}
 
 	for _, msg := range msgs {
-		rec := &kgo.Record{Key: key}
+		rec := &kgo.Record{Context: ctx, Key: key}
 		rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
-		if options.BodyOnly {
-			rec.Value = msg.Body
-		} else if k.opts.Codec.String() == "noop" {
+		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: k, Value: []byte(v)})
@@ -280,10 +281,36 @@ func (k *kBroker) publish(ctx context.Context, msgs []*broker.Message, opts ...b
 		records = append(records, rec)
 	}
 
-	results := k.writer.ProduceSync(ctx, records...)
+	if promise != nil {
+		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()
 		}
 	}
 
@@ -294,111 +321,75 @@ func (k *kBroker) publish(ctx context.Context, msgs []*broker.Message, opts ...b
 	return nil
 }
 
-type mlogger struct {
-	l   logger.Logger
-	ctx context.Context
-}
-
-func (l *mlogger) Log(lvl kgo.LogLevel, msg string, args ...interface{}) {
-	var mlvl logger.Level
-	switch lvl {
-	case kgo.LogLevelNone:
-		return
-	case kgo.LogLevelError:
-		mlvl = logger.ErrorLevel
-	case kgo.LogLevelWarn:
-		mlvl = logger.WarnLevel
-	case kgo.LogLevelInfo:
-		mlvl = logger.InfoLevel
-	case kgo.LogLevelDebug:
-		mlvl = logger.DebugLevel
-	default:
-		return
-	}
-	fields := make(map[string]interface{}, int(len(args)/2))
-	for i := 0; i < len(args)/2; i += 2 {
-		fields[fmt.Sprintf("%v", args[i])] = args[i+1]
-	}
-	l.l.Fields(fields).Log(l.ctx, mlvl, msg)
-}
-
-func (l *mlogger) Level() kgo.LogLevel {
-	switch l.l.Options().Level {
-	case logger.ErrorLevel:
-		return kgo.LogLevelError
-	case logger.WarnLevel:
-		return kgo.LogLevelWarn
-	case logger.InfoLevel:
-		return kgo.LogLevelInfo
-	case logger.DebugLevel, logger.TraceLevel:
-		return kgo.LogLevelDebug
-	}
-	return kgo.LogLevelNone
-}
-
-func (k *kBroker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (k *Broker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
 	return nil, nil
 }
 
-func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
 	options := broker.NewSubscribeOptions(opts...)
 
 	if options.Group == "" {
-		uid, err := id.New()
+		uid, err := uuid.NewRandom()
 		if err != nil {
 			return nil, err
 		}
-		options.Group = uid
+		options.Group = uid.String()
 	}
 
-	kaddrs := k.opts.Addrs
-
-	// shuffle addrs
-	var rng mrand.Rand
-	rng.Shuffle(len(kaddrs), func(i, j int) {
-		kaddrs[i], kaddrs[j] = kaddrs[j], kaddrs[i]
-	})
-
-	td := DefaultCommitInterval
+	commitInterval := DefaultCommitInterval
 	if k.opts.Context != nil {
 		if v, ok := k.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
-			td = v
+			commitInterval = v
 		}
 	}
 
 	sub := &subscriber{
 		topic:     topic,
-		done:      make(chan struct{}),
 		opts:      options,
 		handler:   handler,
 		kopts:     k.opts,
-		consumers: make(map[string]map[int32]worker),
+		consumers: make(map[tp]*consumer),
+		done:      make(chan struct{}),
 	}
 
 	kopts := append(k.kopts,
-		kgo.SeedBrokers(kaddrs...),
 		kgo.ConsumerGroup(options.Group),
 		kgo.ConsumeTopics(topic),
 		kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
 		kgo.FetchMaxWait(1*time.Second),
-		// kgo.KeepControlRecords(),
-		kgo.Balancers(kgo.CooperativeStickyBalancer(), kgo.StickyBalancer()),
-		kgo.FetchIsolationLevel(kgo.ReadUncommitted()),
-		kgo.WithHooks(&metrics{meter: k.opts.Meter}),
-		kgo.AutoCommitMarks(),
-		kgo.AutoCommitInterval(td),
+		kgo.AutoCommitInterval(commitInterval),
 		kgo.OnPartitionsAssigned(sub.assigned),
 		kgo.OnPartitionsRevoked(sub.revoked),
-		kgo.OnPartitionsLost(sub.revoked),
+		kgo.OnPartitionsLost(sub.lost),
+		kgo.AutoCommitMarks(),
 	)
 
-	reader, err := kgo.NewClient(kopts...)
+	if options.Context != nil {
+		if v, ok := options.Context.Value(optionsKey{}).([]kgo.Opt); ok && len(v) > 0 {
+			kopts = append(kopts, v...)
+		}
+	}
+
+	c, err := k.connect(ctx, kopts...)
 	if err != nil {
 		return nil, err
 	}
 
-	sub.reader = reader
-	go sub.run(ctx)
+	mdreq := kmsg.NewMetadataRequest()
+	mdreq.Topics = []kmsg.MetadataRequestTopic{
+		{Topic: &topic},
+	}
+
+	mdrsp, err := mdreq.RequestWith(ctx, c)
+	if err != nil {
+		return nil, err
+	} else if mdrsp.Topics[0].ErrorCode != 0 {
+		return nil, fmt.Errorf("topic %s not exists or permission error", topic)
+	}
+
+	sub.c = c
+
+	go sub.poll(ctx)
 
 	k.Lock()
 	k.subs = append(k.subs, sub)
@@ -406,45 +397,29 @@ func (k *kBroker) Subscribe(ctx context.Context, topic string, handler broker.Ha
 	return sub, nil
 }
 
-func (k *kBroker) String() string {
+func (k *Broker) String() string {
 	return "kgo"
 }
 
-func NewBroker(opts ...broker.Option) *kBroker {
+func NewBroker(opts ...broker.Option) *Broker {
 	options := broker.NewOptions(opts...)
-	if options.Codec.String() != "noop" {
-		options.Logger.Infof(options.Context, "broker codec not noop, disable plain kafka headers usage")
-	}
+
+	kaddrs := options.Addrs
+	// shuffle addrs
+	var rng mrand.Rand
+	rng.Shuffle(len(kaddrs), func(i, j int) {
+		kaddrs[i], kaddrs[j] = kaddrs[j], kaddrs[i]
+	})
 	kopts := []kgo.Opt{
+		kgo.DialTimeout(3 * time.Second),
 		kgo.DisableIdempotentWrite(),
 		kgo.ProducerBatchCompression(kgo.NoCompression()),
-		kgo.WithLogger(&mlogger{l: options.Logger, ctx: options.Context}),
-		kgo.RetryBackoffFn(
-			func() func(int) time.Duration {
-				var rng mrand.Rand
-				return func(fails int) time.Duration {
-					const (
-						min = 250 * time.Millisecond
-						max = 2 * time.Second
-					)
-					if fails <= 0 {
-						return min
-					}
-					if fails > 10 {
-						return max
-					}
-
-					backoff := min * time.Duration(1<<(fails-1))
-					jitter := 0.8 + 0.4*rng.Float64()
-					backoff = time.Duration(float64(backoff) * jitter)
-
-					if backoff > max {
-						return max
-					}
-					return backoff
-				}
-			}(),
-		),
+		kgo.WithLogger(&mlogger{l: options.Logger.Clone(logger.WithCallerSkipCount(options.Logger.Options().CallerSkipCount + 2)), ctx: options.Context}),
+		kgo.SeedBrokers(kaddrs...),
+		kgo.RetryBackoffFn(DefaultRetryBackoffFn),
+		kgo.BlockRebalanceOnPoll(),
+		kgo.Balancers(kgo.CooperativeStickyBalancer()),
+		kgo.FetchIsolationLevel(kgo.ReadUncommitted()),
 	}
 
 	if options.Context != nil {
@@ -453,7 +428,7 @@ func NewBroker(opts ...broker.Option) *kBroker {
 		}
 	}
 
-	return &kBroker{
+	return &Broker{
 		opts:  options,
 		kopts: kopts,
 	}

kgo_test.go

@@ -28,6 +28,23 @@ var bm = &broker.Message{
 	Body:   []byte(`"body"`),
 }
 
+func TestConnect(t *testing.T) {
+	var addrs []string
+	ctx := context.TODO()
+	b := kgo.NewBroker(
+		broker.Addrs(addrs...),
+		kgo.CommitInterval(5*time.Second),
+		kgo.Options(kg.ClientID("test"), kg.FetchMaxBytes(10*1024*1024)),
+	)
+	if err := b.Init(); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := b.Connect(ctx); err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestPubSub(t *testing.T) {
 	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
 		t.Skip()

logger.go

@@ -0,0 +1,50 @@
+package kgo
+
+import (
+	"context"
+
+	"github.com/twmb/franz-go/pkg/kgo"
+	"go.unistack.org/micro/v3/logger"
+)
+
+type mlogger struct {
+	l   logger.Logger
+	ctx context.Context
+}
+
+func (l *mlogger) Log(lvl kgo.LogLevel, msg string, args ...interface{}) {
+	var mlvl logger.Level
+	switch lvl {
+	case kgo.LogLevelNone:
+		return
+	case kgo.LogLevelError:
+		mlvl = logger.ErrorLevel
+	case kgo.LogLevelWarn:
+		mlvl = logger.WarnLevel
+	case kgo.LogLevelInfo:
+		mlvl = logger.InfoLevel
+	case kgo.LogLevelDebug:
+		mlvl = logger.DebugLevel
+	default:
+		return
+	}
+	if len(args) > 0 {
+		l.l.Log(l.ctx, mlvl, append([]interface{}{msg}, args...)...)
+	} else {
+		l.l.Log(l.ctx, mlvl, msg)
+	}
+}
+
+func (l *mlogger) Level() kgo.LogLevel {
+	switch l.l.Options().Level {
+	case logger.ErrorLevel:
+		return kgo.LogLevelError
+	case logger.WarnLevel:
+		return kgo.LogLevelWarn
+	case logger.InfoLevel:
+		return kgo.LogLevelInfo
+	case logger.DebugLevel, logger.TraceLevel:
+		return kgo.LogLevelDebug
+	}
+	return kgo.LogLevelNone
+}

meter.go

@@ -9,19 +9,26 @@ import (
 	"go.unistack.org/micro/v3/meter"
 )
 
-type metrics struct {
+type hookMeter struct {
 	meter meter.Meter
 }
 
 var (
-	_ kgo.HookBrokerConnect       = &metrics{}
-	_ kgo.HookBrokerDisconnect    = &metrics{}
-	_ kgo.HookBrokerRead          = &metrics{}
-	_ kgo.HookBrokerThrottle      = &metrics{}
-	_ kgo.HookBrokerWrite         = &metrics{}
-	_ kgo.HookFetchBatchRead      = &metrics{}
-	_ kgo.HookProduceBatchWritten = &metrics{}
-	_ kgo.HookGroupManageError    = &metrics{}
+	_ kgo.HookBrokerConnect    = &hookMeter{}
+	_ kgo.HookBrokerDisconnect = &hookMeter{}
+	// HookBrokerE2E
+	_ kgo.HookBrokerRead     = &hookMeter{}
+	_ kgo.HookBrokerThrottle = &hookMeter{}
+	_ kgo.HookBrokerWrite    = &hookMeter{}
+	_ kgo.HookFetchBatchRead = &hookMeter{}
+	// HookFetchRecordBuffered
+	// HookFetchRecordUnbuffered
+	_ kgo.HookGroupManageError = &hookMeter{}
+	// HookNewClient
+	_ kgo.HookProduceBatchWritten = &hookMeter{}
+	// HookProduceRecordBuffered
+	// HookProduceRecordPartitioned
+	// HookProduceRecordUnbuffered
 )
 
 const (
@@ -54,11 +61,11 @@ const (
 	labelTopic   = "topic"
 )
 
-func (m *metrics) OnGroupManageError(err error) {
+func (m *hookMeter) OnGroupManageError(err error) {
 	m.meter.Counter(metricBrokerGroupErrors).Inc()
 }
 
-func (m *metrics) OnBrokerConnect(meta kgo.BrokerMetadata, _ time.Duration, _ net.Conn, err error) {
+func (m *hookMeter) OnBrokerConnect(meta kgo.BrokerMetadata, _ time.Duration, _ net.Conn, err error) {
 	node := strconv.Itoa(int(meta.NodeID))
 	if err != nil {
 		m.meter.Counter(metricBrokerConnects, labelNode, node, labelStatus, labelFaulure).Inc()
@@ -67,12 +74,12 @@ func (m *metrics) OnBrokerConnect(meta kgo.BrokerMetadata, _ time.Duration, _ ne
 	m.meter.Counter(metricBrokerConnects, labelNode, node, labelStatus, labelSuccess).Inc()
 }
 
-func (m *metrics) OnBrokerDisconnect(meta kgo.BrokerMetadata, _ net.Conn) {
+func (m *hookMeter) OnBrokerDisconnect(meta kgo.BrokerMetadata, _ net.Conn) {
 	node := strconv.Itoa(int(meta.NodeID))
 	m.meter.Counter(metricBrokerDisconnects, labelNode, node).Inc()
 }
 
-func (m *metrics) OnBrokerWrite(meta kgo.BrokerMetadata, _ int16, bytesWritten int, writeWait, timeToWrite time.Duration, err error) {
+func (m *hookMeter) OnBrokerWrite(meta kgo.BrokerMetadata, _ int16, bytesWritten int, writeWait, timeToWrite time.Duration, err error) {
 	node := strconv.Itoa(int(meta.NodeID))
 	if err != nil {
 		m.meter.Counter(metricBrokerWriteErrors, labelNode, node).Inc()
@@ -83,7 +90,7 @@ func (m *metrics) OnBrokerWrite(meta kgo.BrokerMetadata, _ int16, bytesWritten i
 	m.meter.Histogram(metricBrokerWriteLatencies, labelNode, node).Update(timeToWrite.Seconds())
 }
 
-func (m *metrics) OnBrokerRead(meta kgo.BrokerMetadata, _ int16, bytesRead int, readWait, timeToRead time.Duration, err error) {
+func (m *hookMeter) OnBrokerRead(meta kgo.BrokerMetadata, _ int16, bytesRead int, readWait, timeToRead time.Duration, err error) {
 	node := strconv.Itoa(int(meta.NodeID))
 	if err != nil {
 		m.meter.Counter(metricBrokerReadErrors, labelNode, node).Inc()
@@ -95,18 +102,18 @@ func (m *metrics) OnBrokerRead(meta kgo.BrokerMetadata, _ int16, bytesRead int,
 	m.meter.Histogram(metricBrokerReadLatencies, labelNode, node).Update(timeToRead.Seconds())
 }
 
-func (m *metrics) OnBrokerThrottle(meta kgo.BrokerMetadata, throttleInterval time.Duration, _ bool) {
+func (m *hookMeter) OnBrokerThrottle(meta kgo.BrokerMetadata, throttleInterval time.Duration, _ bool) {
 	node := strconv.Itoa(int(meta.NodeID))
 	m.meter.Histogram(metricBrokerThrottleLatencies, labelNode, node).Update(throttleInterval.Seconds())
 }
 
-func (m *metrics) OnProduceBatchWritten(meta kgo.BrokerMetadata, topic string, _ int32, kmetrics kgo.ProduceBatchMetrics) {
+func (m *hookMeter) OnProduceBatchWritten(meta kgo.BrokerMetadata, topic string, _ int32, kmetrics kgo.ProduceBatchMetrics) {
 	node := strconv.Itoa(int(meta.NodeID))
 	m.meter.Counter(metricBrokerProduceBytesUncompressed, labelNode, node, labelTopic, topic).Add(kmetrics.UncompressedBytes)
 	m.meter.Counter(metricBrokerProduceBytesCompressed, labelNode, node, labelTopic, topic).Add(kmetrics.CompressedBytes)
 }
 
-func (m *metrics) OnFetchBatchRead(meta kgo.BrokerMetadata, topic string, _ int32, kmetrics kgo.FetchBatchMetrics) {
+func (m *hookMeter) OnFetchBatchRead(meta kgo.BrokerMetadata, topic string, _ int32, kmetrics kgo.FetchBatchMetrics) {
 	node := strconv.Itoa(int(meta.NodeID))
 	m.meter.Counter(metricBrokerFetchBytesUncompressed, labelNode, node, labelTopic, topic).Add(kmetrics.UncompressedBytes)
 	m.meter.Counter(metricBrokerFetchBytesCompressed, labelNode, node, labelTopic, topic).Add(kmetrics.CompressedBytes)

options.go

@@ -4,14 +4,22 @@ import (
 	"context"
 	"time"
 
-	kgo "github.com/twmb/franz-go/pkg/kgo"
+	"github.com/twmb/franz-go/pkg/kgo"
 	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/server"
 )
 
+var (
+
 	// DefaultCommitInterval specifies how fast send commit offsets to kafka
-var DefaultCommitInterval = 5 * time.Second
+	DefaultCommitInterval = 5 * time.Second
+
+	// DefaultStatsInterval specifies how fast check consumer lag
+	DefaultStatsInterval = 5 * time.Second
+
+	// DefaultSubscribeMaxInflight specifies how much messages keep inflight
+	DefaultSubscribeMaxInflight = 100
+)
 
 type subscribeContextKey struct{}
 
@@ -49,7 +57,7 @@ func Options(opts ...kgo.Opt) broker.Option {
 	}
 }
 
-// SubscribeOptions pass additional options to broker
+// SubscribeOptions pass additional options to broker in Subscribe
 func SubscribeOptions(opts ...kgo.Opt) broker.SubscribeOption {
 	return func(o *broker.SubscribeOptions) {
 		if o.Context == nil {
@@ -64,19 +72,16 @@ func SubscribeOptions(opts ...kgo.Opt) broker.SubscribeOption {
 	}
 }
 
-// SubscriberOptions pass additional options to broker
-func SubscriberOptions(opts ...kgo.Opt) server.SubscriberOption {
-	return func(o *server.SubscriberOptions) {
-		if o.Context == nil {
-			o.Context = context.Background()
-		}
-		options, ok := o.Context.Value(optionsKey{}).([]kgo.Opt)
-		if !ok {
-			options = make([]kgo.Opt, 0, len(opts))
-		}
-		options = append(options, opts...)
-		o.Context = context.WithValue(o.Context, optionsKey{}, options)
+type clientIDKey struct{}
+
+func ClientID(id string) broker.Option {
+	return broker.SetOption(clientIDKey{}, id)
 }
+
+type groupKey struct{}
+
+func Group(id string) broker.Option {
+	return broker.SetOption(groupKey{}, id)
 }
 
 type commitIntervalKey struct{}
@@ -86,11 +91,21 @@ func CommitInterval(td time.Duration) broker.Option {
 	return broker.SetOption(commitIntervalKey{}, td)
 }
 
-var DefaultSubscribeMaxInflight = 1000
-
 type subscribeMaxInflightKey struct{}
 
 // SubscribeMaxInFlight max queued messages
 func SubscribeMaxInFlight(n int) broker.SubscribeOption {
 	return broker.SetSubscribeOption(subscribeMaxInflightKey{}, n)
 }
+
+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

@@ -0,0 +1,298 @@
+package kgo
+
+import (
+	"context"
+	"strconv"
+	"sync"
+	"time"
+
+	"github.com/twmb/franz-go/pkg/kadm"
+	"github.com/twmb/franz-go/pkg/kgo"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/semconv"
+)
+
+type tp struct {
+	t string
+	p int32
+}
+
+type consumer struct {
+	c         *kgo.Client
+	topic     string
+	partition int32
+	opts      broker.SubscribeOptions
+	kopts     broker.Options
+	handler   broker.Handler
+	quit      chan struct{}
+	done      chan struct{}
+	recs      chan kgo.FetchTopicPartition
+}
+
+type subscriber struct {
+	c         *kgo.Client
+	topic     string
+	opts      broker.SubscribeOptions
+	kopts     broker.Options
+	handler   broker.Handler
+	closed    bool
+	done      chan struct{}
+	consumers map[tp]*consumer
+	sync.RWMutex
+}
+
+func (s *subscriber) Options() broker.SubscribeOptions {
+	return s.opts
+}
+
+func (s *subscriber) Topic() string {
+	return s.topic
+}
+
+func (s *subscriber) Unsubscribe(ctx context.Context) error {
+	if s.closed {
+		return nil
+	}
+	select {
+	// case <-ctx.Done():
+	//	return ctx.Err()
+	default:
+		s.c.PauseFetchTopics(s.topic)
+		s.c.CloseAllowingRebalance()
+		kc := make(map[string][]int32)
+		for ctp := range s.consumers {
+			kc[ctp.t] = append(kc[ctp.t], ctp.p)
+		}
+		s.killConsumers(ctx, kc)
+		close(s.done)
+		s.closed = true
+		s.c.ResumeFetchTopics(s.topic)
+	}
+	return nil
+}
+
+func (s *subscriber) poll(ctx context.Context) {
+	maxInflight := DefaultSubscribeMaxInflight
+	if s.opts.Context != nil {
+		if n, ok := s.opts.Context.Value(subscribeMaxInflightKey{}).(int); n > 0 && ok {
+			maxInflight = n
+		}
+	}
+
+	go func() {
+		ac := kadm.NewClient(s.c)
+		ticker := time.NewTicker(DefaultStatsInterval)
+
+		for {
+			select {
+			case <-ctx.Done():
+				ticker.Stop()
+				return
+			case <-ticker.C:
+				dgls, err := ac.Lag(ctx, s.opts.Group)
+				if err != nil || !dgls.Ok() {
+					continue
+				}
+
+				dgl, ok := dgls[s.opts.Group]
+				if !ok {
+					continue
+				}
+				lmap, ok := dgl.Lag[s.topic]
+				if !ok {
+					continue
+				}
+
+				s.Lock()
+				for tp := range s.consumers {
+					if v, ok := lmap[tp.p]; ok {
+						s.kopts.Meter.Counter(semconv.BrokerGroupLag, "topic", s.topic, "group", s.opts.Group, "partition", strconv.Itoa(int(tp.p)), "lag", strconv.Itoa(int(v.Lag)))
+					}
+				}
+				s.Unlock()
+
+			}
+		}
+	}()
+
+	for {
+		select {
+		case <-ctx.Done():
+			s.c.CloseAllowingRebalance()
+			return
+		case <-s.done:
+			return
+		default:
+			fetches := s.c.PollRecords(ctx, maxInflight)
+			if !s.closed && fetches.IsClientClosed() {
+				s.closed = true
+				return
+			}
+			fetches.EachError(func(t string, p int32, err error) {
+				s.kopts.Logger.Fatalf(ctx, "[kgo] fetch topic %s partition %d err: %v", t, p, err)
+			})
+
+			fetches.EachPartition(func(p kgo.FetchTopicPartition) {
+				tp := tp{p.Topic, p.Partition}
+				s.consumers[tp].recs <- p
+			})
+			s.c.AllowRebalance()
+		}
+	}
+}
+
+func (s *subscriber) killConsumers(ctx context.Context, lost map[string][]int32) {
+	var wg sync.WaitGroup
+	defer wg.Wait()
+
+	for topic, partitions := range lost {
+		for _, partition := range partitions {
+			tp := tp{topic, partition}
+			pc := s.consumers[tp]
+			delete(s.consumers, tp)
+			close(pc.quit)
+			s.kopts.Logger.Debugf(ctx, "[kgo] waiting for work to finish topic %s partition %d", topic, partition)
+			wg.Add(1)
+			go func() { <-pc.done; wg.Done() }()
+		}
+	}
+}
+
+func (s *subscriber) lost(ctx context.Context, _ *kgo.Client, lost map[string][]int32) {
+	s.kopts.Logger.Debugf(ctx, "[kgo] lost %#+v", lost)
+	s.killConsumers(ctx, lost)
+}
+
+func (s *subscriber) revoked(ctx context.Context, c *kgo.Client, revoked map[string][]int32) {
+	s.kopts.Logger.Debugf(ctx, "[kgo] revoked %#+v", revoked)
+	s.killConsumers(ctx, revoked)
+	if err := c.CommitMarkedOffsets(ctx); err != nil {
+		s.kopts.Logger.Errorf(ctx, "[kgo] revoked CommitMarkedOffsets err: %v", err)
+	}
+}
+
+func (s *subscriber) assigned(_ context.Context, c *kgo.Client, assigned map[string][]int32) {
+	for topic, partitions := range assigned {
+		for _, partition := range partitions {
+			pc := &consumer{
+				c:         c,
+				topic:     topic,
+				partition: partition,
+
+				quit:    make(chan struct{}),
+				done:    make(chan struct{}),
+				recs:    make(chan kgo.FetchTopicPartition, 100),
+				handler: s.handler,
+				kopts:   s.kopts,
+				opts:    s.opts,
+			}
+			s.Lock()
+			s.consumers[tp{topic, partition}] = pc
+			s.Unlock()
+			go pc.consume()
+		}
+	}
+}
+
+func (pc *consumer) consume() {
+	defer close(pc.done)
+	pc.kopts.Logger.Debugf(pc.kopts.Context, "starting, topic %s partition %d", pc.topic, pc.partition)
+	defer pc.kopts.Logger.Debugf(pc.kopts.Context, "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:
+			return
+		case p := <-pc.recs:
+			for _, record := range p.Records {
+				ts := time.Now()
+				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Inc()
+				p := eventPool.Get().(*event)
+				p.msg.Header = nil
+				p.msg.Body = nil
+				p.topic = record.Topic
+				p.err = nil
+				p.ack = false
+				p.msg.Header = metadata.New(len(record.Headers))
+				for _, hdr := range record.Headers {
+					p.msg.Header.Set(hdr.Key, string(hdr.Value))
+				}
+				if pc.kopts.Codec.String() == "noop" {
+					p.msg.Body = record.Value
+				} else if pc.opts.BodyOnly {
+					p.msg.Body = record.Value
+				} else {
+					if err := pc.kopts.Codec.Unmarshal(record.Value, p.msg); err != nil {
+						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.Fatalf(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 {
+							if pc.kopts.Logger.V(logger.ErrorLevel) {
+								pc.kopts.Logger.Errorf(pc.kopts.Context, "[kgo]: failed to unmarshal: %v", 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.Fatalf(pc.kopts.Context, "[kgo] Unmarshal err not handled wtf?")
+						return
+					}
+				}
+				err := pc.handler(p)
+				if err == nil {
+					pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "success").Inc()
+				} else {
+					pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc()
+				}
+				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
+				if err == nil && pc.opts.AutoAck {
+					p.ack = true
+				} else if err != nil {
+					p.err = err
+					if eh != nil {
+						_ = eh(p)
+					} else {
+						if pc.kopts.Logger.V(logger.ErrorLevel) {
+							pc.kopts.Logger.Errorf(pc.kopts.Context, "[kgo]: subscriber error: %v", err)
+						}
+					}
+				}
+				te := time.Since(ts)
+				pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
+				pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
+				if p.ack {
+					eventPool.Put(p)
+					pc.c.MarkCommitRecords(record)
+				} else {
+					eventPool.Put(p)
+					pc.kopts.Logger.Fatalf(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
+					return
+				}
+			}
+		}
+	}
+}

tracer.go

@@ -0,0 +1,199 @@
+package kgo
+
+import (
+	"context"
+	"net"
+	"time"
+	"unicode/utf8"
+
+	"github.com/twmb/franz-go/pkg/kgo"
+	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
+	"go.unistack.org/micro/v3/tracer"
+)
+
+type hookTracer struct {
+	clientID string
+	group    string
+	tracer   tracer.Tracer
+}
+
+var (
+	_ kgo.HookBrokerConnect       = &hookTracer{}
+	_ kgo.HookBrokerDisconnect    = &hookTracer{}
+	_ kgo.HookBrokerRead          = &hookTracer{}
+	_ kgo.HookBrokerThrottle      = &hookTracer{}
+	_ kgo.HookBrokerWrite         = &hookTracer{}
+	_ kgo.HookFetchBatchRead      = &hookTracer{}
+	_ kgo.HookProduceBatchWritten = &hookTracer{}
+	_ kgo.HookGroupManageError    = &hookTracer{}
+)
+
+func (m *hookTracer) OnGroupManageError(err error) {
+}
+
+func (m *hookTracer) OnBrokerConnect(meta kgo.BrokerMetadata, _ time.Duration, _ net.Conn, err error) {
+}
+
+func (m *hookTracer) OnBrokerDisconnect(meta kgo.BrokerMetadata, _ net.Conn) {
+}
+
+func (m *hookTracer) OnBrokerWrite(meta kgo.BrokerMetadata, _ int16, bytesWritten int, writeWait, timeToWrite time.Duration, err error) {
+}
+
+func (m *hookTracer) OnBrokerRead(meta kgo.BrokerMetadata, _ int16, bytesRead int, readWait, timeToRead time.Duration, err error) {
+}
+
+func (m *hookTracer) OnBrokerThrottle(meta kgo.BrokerMetadata, throttleInterval time.Duration, _ bool) {
+}
+
+func (m *hookTracer) OnProduceBatchWritten(meta kgo.BrokerMetadata, topic string, _ int32, kmetrics kgo.ProduceBatchMetrics) {
+}
+
+func (m *hookTracer) OnFetchBatchRead(meta kgo.BrokerMetadata, topic string, _ int32, kmetrics kgo.FetchBatchMetrics) {
+}
+
+// OnProduceRecordBuffered starts a new span for the "publish" operation on a
+// buffered record.
+//
+// It sets span options and injects the span context into record and updates
+// the record's context, so it can be ended in the OnProduceRecordUnbuffered
+// hook.
+func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
+	// Set up span options.
+	attrs := []interface{}{
+		semconv.MessagingSystemKey.String("kafka"),
+		semconv.MessagingDestinationKindTopic,
+		semconv.MessagingDestinationName(r.Topic),
+		semconv.MessagingOperationPublish,
+	}
+	attrs = maybeKeyAttr(attrs, r)
+	if m.clientID != "" {
+		attrs = append(attrs, semconv.MessagingKafkaClientIDKey.String(m.clientID))
+	}
+	opts := []tracer.SpanOption{
+		tracer.WithSpanLabels(attrs...),
+		tracer.WithSpanKind(tracer.SpanKindProducer),
+	}
+	// Start the "publish" span.
+	ctx, _ := m.tracer.Start(r.Context, r.Topic+" publish", opts...)
+	// Inject the span context into the record.
+	// t.propagators.Inject(ctx, NewRecordCarrier(r))
+	// Update the record context.
+	r.Context = ctx
+}
+
+// OnProduceRecordUnbuffered continues and ends the "publish" span for an
+// unbuffered record.
+//
+// It sets attributes with values unset when producing and records any error
+// that occurred during the publish operation.
+func (m *hookTracer) OnProduceRecordUnbuffered(r *kgo.Record, err error) {
+	span, ok := tracer.SpanFromContext(r.Context)
+	if !ok {
+		return
+	}
+	defer span.Finish()
+	span.AddLabels(
+		semconv.MessagingKafkaDestinationPartition(int(r.Partition)),
+	)
+	if err != nil {
+		span.SetStatus(tracer.SpanStatusError, err.Error())
+	}
+}
+
+// OnFetchRecordBuffered starts a new span for the "receive" operation on a
+// buffered record.
+//
+// It sets the span options and extracts the span context from the record,
+// updates the record's context to ensure it can be ended in the
+// OnFetchRecordUnbuffered hook and can be used in downstream consumer
+// processing.
+func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
+	// Set up the span options.
+	attrs := []interface{}{
+		semconv.MessagingSystemKey.String("kafka"),
+		semconv.MessagingSourceKindTopic,
+		semconv.MessagingSourceName(r.Topic),
+		semconv.MessagingOperationReceive,
+		semconv.MessagingKafkaSourcePartition(int(r.Partition)),
+	}
+	attrs = maybeKeyAttr(attrs, r)
+	if m.clientID != "" {
+		attrs = append(attrs, semconv.MessagingKafkaClientIDKey.String(m.clientID))
+	}
+	if m.group != "" {
+		attrs = append(attrs, semconv.MessagingKafkaConsumerGroupKey.String(m.group))
+	}
+	opts := []tracer.SpanOption{
+		tracer.WithSpanLabels(attrs...),
+		tracer.WithSpanKind(tracer.SpanKindConsumer),
+	}
+
+	if r.Context == nil {
+		r.Context = context.Background()
+	}
+	// Extract the span context from the record.
+	// ctx := t.propagators.Extract(r.Context, NewRecordCarrier(r))
+	// Start the "receive" span.
+	newCtx, _ := m.tracer.Start(r.Context, r.Topic+" receive", opts...)
+	// Update the record context.
+	r.Context = newCtx
+}
+
+// OnFetchRecordUnbuffered continues and ends the "receive" span for an
+// unbuffered record.
+func (m *hookTracer) OnFetchRecordUnbuffered(r *kgo.Record, _ bool) {
+	if span, ok := tracer.SpanFromContext(r.Context); ok {
+		defer span.Finish()
+	}
+}
+
+// WithProcessSpan starts a new span for the "process" operation on a consumer
+// record.
+//
+// It sets up the span options. The user's application code is responsible for
+// ending the span.
+//
+// This should only ever be called within a polling loop of a consumed record and
+// not a record which has been created for producing, so call this at the start of each
+// iteration of your processing for the record.
+func (m *hookTracer) WithProcessSpan(r *kgo.Record) (context.Context, tracer.Span) {
+	// Set up the span options.
+	attrs := []interface{}{
+		semconv.MessagingSystemKey.String("kafka"),
+		semconv.MessagingSourceKindTopic,
+		semconv.MessagingSourceName(r.Topic),
+		semconv.MessagingOperationProcess,
+		semconv.MessagingKafkaSourcePartition(int(r.Partition)),
+		semconv.MessagingKafkaMessageOffset(int(r.Offset)),
+	}
+	attrs = maybeKeyAttr(attrs, r)
+	if m.clientID != "" {
+		attrs = append(attrs, semconv.MessagingKafkaClientIDKey.String(m.clientID))
+	}
+	if m.group != "" {
+		attrs = append(attrs, semconv.MessagingKafkaConsumerGroupKey.String(m.group))
+	}
+	opts := []tracer.SpanOption{
+		tracer.WithSpanLabels(attrs...),
+		tracer.WithSpanKind(tracer.SpanKindConsumer),
+	}
+
+	if r.Context == nil {
+		r.Context = context.Background()
+	}
+	// Start a new span using the provided context and options.
+	return m.tracer.Start(r.Context, r.Topic+" process", opts...)
+}
+
+func maybeKeyAttr(attrs []interface{}, r *kgo.Record) []interface{} {
+	if r.Key == nil {
+		return attrs
+	}
+	var keykey string
+	if !utf8.Valid(r.Key) {
+		return attrs
+	}
+	keykey = string(r.Key)
+	return append(attrs, semconv.MessagingKafkaMessageKeyKey.String(keykey))
+}

util.go

@@ -1,244 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"errors"
-	"sync"
-
-	kgo "github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/broker"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/metadata"
-)
-
-var ErrLostMessage = errors.New("message not marked for offsets commit and will be lost in next iteration")
-
-var pPool = sync.Pool{
-	New: func() interface{} {
-		return &publication{msg: broker.NewMessage("")}
-	},
-}
-
-type worker struct {
-	done         chan struct{}
-	recs         chan []*kgo.Record
-	cherr        chan error
-	handler      broker.Handler
-	batchHandler broker.BatchHandler
-	opts         broker.SubscribeOptions
-	kopts        broker.Options
-	tpmap        map[string][]int32
-	maxInflight  int
-	reader       *kgo.Client
-	ctx          context.Context
-}
-
-func (s *subscriber) run(ctx context.Context) {
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-s.kopts.Context.Done():
-			return
-		default:
-			fetches := s.reader.PollFetches(ctx)
-			if fetches.IsClientClosed() {
-				// TODO: fatal ?
-				return
-			}
-			if len(fetches.Errors()) > 0 {
-				for _, err := range fetches.Errors() {
-					s.kopts.Logger.Fatalf(ctx, "fetch err topic %s partition %d: %v", err.Topic, err.Partition, err.Err)
-				}
-				// TODO: fatal ?
-				return
-			}
-
-			fetches.EachPartition(func(p kgo.FetchTopicPartition) {
-				s.Lock()
-				consumers := s.consumers[p.Topic]
-				s.Unlock()
-				if consumers == nil {
-					return
-				}
-				w, ok := consumers[p.Partition]
-				if !ok {
-					return
-				}
-				select {
-				case err := <-w.cherr:
-					s.kopts.Logger.Fatalf(ctx, "handle err: %v", err)
-					return
-				case w.recs <- p.Records:
-				case <-w.done:
-				}
-			})
-		}
-	}
-}
-
-func (s *subscriber) assigned(ctx context.Context, _ *kgo.Client, assigned map[string][]int32) {
-	maxInflight := DefaultSubscribeMaxInflight
-
-	if s.opts.Context != nil {
-		if n, ok := s.opts.Context.Value(subscribeMaxInflightKey{}).(int); n > 0 && ok {
-			maxInflight = n
-		}
-	}
-
-	s.Lock()
-	for topic, partitions := range assigned {
-		if s.consumers[topic] == nil {
-			s.consumers[topic] = make(map[int32]worker)
-		}
-		for _, partition := range partitions {
-			w := worker{
-				done:         make(chan struct{}),
-				recs:         make(chan []*kgo.Record),
-				cherr:        make(chan error),
-				kopts:        s.kopts,
-				opts:         s.opts,
-				ctx:          ctx,
-				tpmap:        map[string][]int32{topic: []int32{partition}},
-				reader:       s.reader,
-				handler:      s.handler,
-				batchHandler: s.batchhandler,
-				maxInflight:  maxInflight,
-			}
-			s.consumers[topic][partition] = w
-			go w.handle()
-		}
-	}
-	s.Unlock()
-}
-
-func (s *subscriber) revoked(_ context.Context, _ *kgo.Client, revoked map[string][]int32) {
-	s.Lock()
-	for topic, partitions := range revoked {
-		ptopics := s.consumers[topic]
-		for _, partition := range partitions {
-			w := ptopics[partition]
-			delete(ptopics, partition)
-			if len(ptopics) == 0 {
-				delete(s.consumers, topic)
-			}
-			close(w.done)
-		}
-	}
-	s.Unlock()
-}
-
-func (w *worker) handle() {
-	var err error
-
-	eh := w.kopts.ErrorHandler
-	if w.opts.ErrorHandler != nil {
-		eh = w.opts.ErrorHandler
-	}
-
-	paused := false
-	for {
-		select {
-		case <-w.ctx.Done():
-			w.cherr <- w.ctx.Err()
-			return
-		case <-w.done:
-			return
-		case recs := <-w.recs:
-			if len(recs) >= w.maxInflight {
-				paused = true
-				w.reader.PauseFetchPartitions(w.tpmap)
-			}
-			for _, record := range recs {
-				p := pPool.Get().(*publication)
-				p.msg.Header = nil
-				p.msg.Body = nil
-				p.topic = record.Topic
-				p.err = nil
-				p.ack = false
-				if w.opts.BodyOnly {
-					p.msg.Body = record.Value
-					if l := len(record.Headers); l > 0 {
-						if p.msg.Header == nil {
-							p.msg.Header = metadata.New(l)
-						}
-						for _, h := range record.Headers {
-							p.msg.Header.Set(h.Key, string(h.Value))
-						}
-					}
-				} else if w.kopts.Codec.String() == "noop" {
-					p.msg.Body = record.Value
-					p.msg.Header = metadata.New(len(record.Headers))
-					for _, h := range record.Headers {
-						p.msg.Header.Set(h.Key, string(h.Value))
-					}
-				} else {
-					if err := w.kopts.Codec.Unmarshal(record.Value, p.msg); err != nil {
-						p.err = err
-						p.msg.Body = record.Value
-						if l := len(record.Headers); l > 0 {
-							if p.msg.Header == nil {
-								p.msg.Header = metadata.New(l)
-							}
-							for _, h := range record.Headers {
-								p.msg.Header.Set(h.Key, string(h.Value))
-							}
-						}
-						if eh != nil {
-							_ = eh(p)
-							if p.ack {
-								w.reader.MarkCommitRecords(record)
-							} else {
-								w.cherr <- ErrLostMessage
-								pPool.Put(p)
-								return
-							}
-							pPool.Put(p)
-							continue
-						} else {
-							if w.kopts.Logger.V(logger.ErrorLevel) {
-								w.kopts.Logger.Errorf(w.kopts.Context, "[kgo]: failed to unmarshal: %v", err)
-							}
-						}
-						pPool.Put(p)
-						w.cherr <- err
-						return
-					}
-					if l := len(record.Headers); l > 0 {
-						if p.msg.Header == nil {
-							p.msg.Header = metadata.New(l)
-						}
-						for _, h := range record.Headers {
-							p.msg.Header.Set(h.Key, string(h.Value))
-						}
-					}
-				}
-				err = w.handler(p)
-				if err == nil && w.opts.AutoAck {
-					p.ack = true
-				} else if err != nil {
-					p.err = err
-					if eh != nil {
-						_ = eh(p)
-					} else {
-						if w.kopts.Logger.V(logger.ErrorLevel) {
-							w.kopts.Logger.Errorf(w.kopts.Context, "[kgo]: subscriber error: %v", err)
-						}
-					}
-				}
-				if p.ack {
-					pPool.Put(p)
-					w.reader.MarkCommitRecords(record)
-				} else {
-					pPool.Put(p)
-					w.cherr <- ErrLostMessage
-					return
-				}
-			}
-			if paused {
-				paused = false
-				w.reader.ResumeFetchPartitions(w.tpmap)
-			}
-		}
-	}
-}