Merge pull request 'meter: write metrics inside broker implementation' (#123) from improve into master

Reviewed-on: #123

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Maintain dependencies for Golang
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"

.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

@@ -0,0 +1,47 @@
+name: build
+on:
+ push:
+    branches:
+    - master
+    - v3
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: cache
+      uses: actions/cache@v3
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-go-
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: lint
+        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.
+          version: v1.30
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,78 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "codeql"
+
+on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+  push:
+    branches: [ master, v3 ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master, v3 ]
+  schedule:
+    - cron: '34 1 * * 0'
+
+jobs:
+  analyze:
+    name: analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    # Initializes the CodeQL tools for scanning.
+    - name: init
+      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.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # 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@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: analyze
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,27 @@
+name: "dependabot-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 == 'dependabot[bot]'
+    steps:
+      - name: metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.6
+        with:
+          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:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/job_coverage.yml

@@ -1,54 +0,0 @@
-name: coverage
-
-on:
-  push:
-    branches: [ main, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
-  pull_request:
-    branches: [ main, v3, v4 ]
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable' 
-
-    - name: test coverage
-      run: |
-        go test -v -cover ./... -covermode=count -coverprofile coverage.out -coverpkg ./...
-        go tool cover -func coverage.out -o coverage.out
-
-    - name: coverage badge
-      uses: tj-actions/coverage-badge-go@v2
-      with:
-        green: 80
-        filename: coverage.out
-
-    - uses: stefanzweifel/git-auto-commit-action@v4
-      name: autocommit
-      with:
-        commit_message: Apply Code Coverage Badge
-        skip_fetch: true
-        skip_checkout: true
-        file_pattern: ./README.md
-
-    - name: push
-      if: steps.auto-commit-action.outputs.changes_detected == 'true'
-      uses: ad-m/github-push-action@master
-      with:
-        github_token: ${{ github.token }}
-        branch: ${{ github.ref }}

.github/workflows/job_lint.yml

@@ -1,29 +0,0 @@
-name: lint
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable' 
-    - name: setup deps
-      run: go get -v ./...
-    - name: run lint
-      uses: https://github.com/golangci/golangci-lint-action@v6
-      with:
-        version: 'latest'

.github/workflows/job_sync.yml

@@ -1,52 +0,0 @@
-name: sync
-
-on:
-  schedule:
-    - cron: '*/5 * * * *'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-jobs:
-  sync:
-    if: github.server_url == 'zhttps://github.com'
-    runs-on: ubuntu-latest
-    steps:
-    - name: init
-      run: |
-        git config --global user.email "vtolstov <vtolstov@users.noreply.github.com>"
-        git config --global user.name "github-actions[bot]"
-        echo "machine git.unistack.org login vtolstov password ${{ secrets.TOKEN_GITEA }}" >> /root/.netrc
-        echo "machine github.com login vtolstov password ${{ secrets.TOKEN_GITHUB }}" >> /root/.netrc
-
-    - name: sync master
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY}
-        git merge upstream/master
-        git push upstream master --progress
-        git push origin master --progress
-        cd ../
-        rm -rf repo
-
-    - name: sync v3
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY}
-        git merge upstream/v3
-        git push upstream v3 --progress
-        git push origin v3 --progress
-        cd ../
-        rm -rf repo
-
-    - name: sync v4
-      run: |
-        git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo
-        cd repo
-        git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY}
-        git merge upstream/v4
-        git push upstream v4 --progress
-        git push origin v4 --progress
-        cd ../
-        rm -rf repo

.github/workflows/job_test.yml

@@ -1,31 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
-  push:
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup deps
-      run: go get -v ./...
-    - name: run test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...

.github/workflows/job_tests.yml

@@ -1,50 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches: [ master, v3, v4 ]
-  push:
-    branches: [ master, v3, v4 ]
-    paths-ignore:
-      - '.github/**'
-      - '.gitea/**'
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: checkout tests
-      uses: actions/checkout@v4
-      with:
-        ref: master
-        filter: 'blob:none'
-        repository: unistack-org/micro-tests
-        path: micro-tests
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup go work
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        go work init
-        go work use .
-        go work use micro-tests
-    - name: setup deps
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: go get -v ./...
-    - name: run tests
-      env:
-        INTEGRATION_TESTS: yes
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        cd micro-tests
-        go test -mod readonly -v ./... || true

.github/workflows/pr.yml

@@ -0,0 +1,47 @@
+name: prbuild
+on:
+  pull_request:
+    branches:
+    - master
+    - v3
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: cache
+      uses: actions/cache@v3
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-go-
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: lint
+        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.
+          version: v1.30
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.gitignore

@@ -13,9 +13,3 @@
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
-
-# General
-.DS_Store
-.idea
-.vscode
-bin/

.golangci.yml

@@ -1,5 +0,0 @@
-run:
-  concurrency: 8
-  timeout: 5m
-  issues-exit-code: 1
-  tests: true

README.md

@@ -1,9 +1,9 @@
-# broker-kgo
+# micro-broker-kgo
+yet another micro kafka broker alternative
 
 TODO:
-
-1) экспортируем текущий оффсет для каждой партиции в группе
-2) экспортируем лаг для группы
-3) мониторим
-   1) если есть лаг больше нуля
-   2) если дельта оффсета за нужное нам время не 
+* 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)

broker.go

@@ -1,69 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"net"
-	"sync/atomic"
-	"time"
-
-	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/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,93 +0,0 @@
-package kgo
-
-import (
-	"net/http"
-	"slices"
-	"strings"
-
-	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v4/metadata"
-)
-
-// 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
-}
-
-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 strings.EqualFold(r.Headers[i].Key, k) {
-				// Key exist, update the value.
-				r.Headers[i].Value = []byte(strings.Join(v, ","))
-				continue loop
-			}
-		}
-
-		// 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

@@ -0,0 +1,42 @@
+package kgo
+
+import (
+	"sync"
+
+	"go.unistack.org/micro/v4/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,24 +1,14 @@
 module go.unistack.org/micro-broker-kgo/v4
 
-go 1.23.0
+go 1.19
 
 require (
-	github.com/twmb/franz-go v1.18.1
-	github.com/twmb/franz-go/pkg/kadm v1.16.0
-	github.com/twmb/franz-go/pkg/kmsg v1.11.2
-	go.opentelemetry.io/otel v1.35.0
-	go.unistack.org/micro/v4 v4.1.7
+	github.com/twmb/franz-go v1.11.5
+	go.unistack.org/micro/v4 v4.0.1
 )
 
 require (
-	github.com/ash3in/uuidv8 v1.2.0 // 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/spf13/cast v1.7.1 // indirect
-	go.unistack.org/micro-proto/v4 v4.1.0 // indirect
-	golang.org/x/crypto v0.37.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/klauspost/compress v1.15.9 // indirect
+	github.com/pierrec/lz4/v4 v4.1.15 // indirect
+	github.com/twmb/franz-go/pkg/kmsg v1.3.0 // indirect
 )

go.sum

@@ -1,51 +1,18 @@
-github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
-github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
-github.com/ash3in/uuidv8 v1.2.0 h1:2oogGdtCPwaVtyvPPGin4TfZLtOGE5F+W++E880G6SI=
-github.com/ash3in/uuidv8 v1.2.0/go.mod h1:BnU0wJBxnzdEKmVg4xckBkD+VZuecTFTUP3M0dWgyY4=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
-github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
-github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-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/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/twmb/franz-go v1.18.1 h1:D75xxCDyvTqBSiImFx2lkPduE39jz1vaD7+FNc+vMkc=
-github.com/twmb/franz-go v1.18.1/go.mod h1:Uzo77TarcLTUZeLuGq+9lNpSkfZI+JErv7YJhlDjs9M=
-github.com/twmb/franz-go/pkg/kadm v1.16.0 h1:STMs1t5lYR5mR974PSiwNzE5TvsosByTp+rKXLOhAjE=
-github.com/twmb/franz-go/pkg/kadm v1.16.0/go.mod h1:MUdcUtnf9ph4SFBLLA/XxE29rvLhWYLM9Ygb8dfSCvw=
-github.com/twmb/franz-go/pkg/kmsg v1.11.2 h1:hIw75FpwcAjgeyfIGFqivAvwC5uNIOWRGvQgZhH4mhg=
-github.com/twmb/franz-go/pkg/kmsg v1.11.2/go.mod h1:CFfkkLysDNmukPYhGzuUcDtf46gQSqCZHMW1T4Z+wDE=
-go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
-go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
-go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk=
-go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
-go.unistack.org/micro/v4 v4.1.7 h1:4/dSEMTqxYoHimn/8wKDohfTXi2zDy6eWXYBCnBaZdc=
-go.unistack.org/micro/v4 v4.1.7/go.mod h1:lr3oYED8Ay1vjK68QqRw30QOtdk/ffpZqMFDasOUhKw=
-golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
+github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
+github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/twmb/franz-go v1.11.5 h1:TTv5lVJd+87XkmP9dWN9Jgpf7IUUr7a7jee+byR8LBE=
+github.com/twmb/franz-go v1.11.5/go.mod h1:FvaHNlpT6woVYIl6LAuIeL7yHol1Fp6Gv2Dn21AvH78=
+github.com/twmb/franz-go/pkg/kmsg v1.3.0 h1:ouBETB7nTqRxiO5E8/pySoFZtVEW2VWw55z3/bsUzTw=
+github.com/twmb/franz-go/pkg/kmsg v1.3.0/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
+golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

kgo.go

@@ -1,41 +1,29 @@
 // Package kgo provides a kafka broker using kgo
-package kgo
+package kgo // import "go.unistack.org/micro-broker-kgo/v4"
 
 import (
 	"context"
 	"errors"
 	"fmt"
-	"math/rand/v2"
+	"math/rand"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/twmb/franz-go/pkg/kgo"
-	"github.com/twmb/franz-go/pkg/kmsg"
 	"go.unistack.org/micro/v4/broker"
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v4/semconv"
-	"go.unistack.org/micro/v4/tracer"
-	"go.unistack.org/micro/v4/util/id"
+	id "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 _ broker.Broker = &Broker{}
 
 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
@@ -51,7 +39,7 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
 		backoff := min * time.Duration(1<<(fails-1))
 
 		rngMu.Lock()
-		jitter := 0.8 + 0.4*rand.Float64()
+		jitter := 0.8 + 0.4*rng.Float64()
 		rngMu.Unlock()
 
 		backoff = time.Duration(float64(backoff) * jitter)
@@ -64,30 +52,12 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
 }()
 
 type Broker struct {
-	funcPublish   broker.FuncPublish
-	funcSubscribe broker.FuncSubscribe
-	c             *kgo.Client
-	connected     *atomic.Uint32
-
-	kopts []kgo.Opt
-	subs  []*Subscriber
-
-	opts broker.Options
-
+	c         *kgo.Client
+	kopts     []kgo.Opt
+	connected bool
 	sync.RWMutex
-	init bool
-}
-
-func (r *Broker) Live() bool {
-	return r.connected.Load() == 1
-}
-
-func (r *Broker) Ready() bool {
-	return r.connected.Load() == 1
-}
-
-func (r *Broker) Health() bool {
-	return r.connected.Load() == 1
+	opts broker.Options
+	subs []*subscriber
 }
 
 func (k *Broker) Address() string {
@@ -98,162 +68,63 @@ func (k *Broker) Name() string {
 	return k.opts.Name
 }
 
-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) {
+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
-		}
-	}
-
-	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 {
 	case <-ctx.Done():
-		if ctx.Err() != nil {
-			if sp != nil {
-				sp.SetStatus(tracer.SpanStatusError, ctx.Err().Error())
-			}
-		}
-		return nil, nil, ctx.Err()
+		return nil, ctx.Err()
 	default:
 		c, err = kgo.NewClient(opts...)
 		if err == nil {
 			err = c.Ping(ctx) // check connectivity to cluster
 		}
 		if err != nil {
-			if sp != nil {
-				sp.SetStatus(tracer.SpanStatusError, err.Error())
-			}
-			return nil, nil, err
+			return nil, err
 		}
-		k.connected.Store(1)
-		return c, htracer, nil
 	}
+	return c, nil
 }
 
 func (k *Broker) Connect(ctx context.Context) error {
-	if k.connected.Load() == 1 {
+	k.RLock()
+	if k.connected {
+		k.RUnlock()
 		return nil
 	}
+	k.RUnlock()
 
 	nctx := k.opts.Context
 	if ctx != nil {
 		nctx = ctx
 	}
 
-	c, _, err := k.connect(nctx, k.kopts...)
+	c, err := k.connect(nctx, k.kopts...)
 	if err != nil {
 		return err
 	}
 
 	k.Lock()
 	k.c = c
-	k.connected.Store(1)
+	k.connected = true
 	k.Unlock()
 
 	return nil
 }
 
 func (k *Broker) Disconnect(ctx context.Context) error {
-	if k.connected.Load() == 0 {
+	k.RLock()
+	if !k.connected {
+		k.RUnlock()
 		return nil
 	}
+	k.RUnlock()
 
 	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()
@@ -262,9 +133,6 @@ func (k *Broker) Disconnect(ctx context.Context) error {
 		return nctx.Err()
 	default:
 		for _, sub := range k.subs {
-			if sub.closed {
-				continue
-			}
 			if err := sub.Unsubscribe(ctx); err != nil {
 				return err
 			}
@@ -275,7 +143,7 @@ func (k *Broker) Disconnect(ctx context.Context) error {
 		}
 	}
 
-	k.connected.Store(0)
+	k.connected = false
 	return nil
 }
 
@@ -283,10 +151,6 @@ 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)
 	}
@@ -310,20 +174,6 @@ func (k *Broker) Init(opts ...broker.Option) error {
 		}
 	}
 
-	k.funcPublish = k.fnPublish
-	k.funcSubscribe = k.fnSubscribe
-
-	k.opts.Hooks.EachPrev(func(hook options.Hook) {
-		switch h := hook.(type) {
-		case broker.HookPublish:
-			k.funcPublish = h(k.funcPublish)
-		case broker.HookSubscribe:
-			k.funcSubscribe = h(k.funcSubscribe)
-		}
-	})
-
-	k.init = true
-
 	return nil
 }
 
@@ -331,88 +181,97 @@ func (k *Broker) Options() broker.Options {
 	return k.opts
 }
 
-func (b *Broker) Publish(ctx context.Context, topic string, messages ...broker.Message) error {
-	return b.funcPublish(ctx, topic, messages...)
+func (k *Broker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+	return k.publish(ctx, msgs, opts...)
 }
 
-func (b *Broker) fnPublish(ctx context.Context, topic string, messages ...broker.Message) error {
-	return b.publish(ctx, topic, messages...)
+func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
+	msg.Header.Set(metadata.HeaderTopic, topic)
+	return k.publish(ctx, []*broker.Message{msg}, opts...)
 }
 
-func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.Message) error {
-	if b.connected.Load() == 0 {
-		c, _, err := b.connect(ctx, b.kopts...)
+func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+	k.RLock()
+	if !k.connected {
+		k.RUnlock()
+		k.Lock()
+		c, err := k.connect(ctx, k.kopts...)
 		if err != nil {
+			k.Unlock()
 			return err
 		}
-		b.Lock()
-		b.c = c
-		b.Unlock()
+		k.c = c
+		k.connected = true
+		k.Unlock()
 	}
+	k.RUnlock()
 
-	records := make([]*kgo.Record, 0, len(messages))
+	options := broker.NewPublishOptions(opts...)
+	records := make([]*kgo.Record, 0, len(msgs))
 	var errs []string
+	var err error
 	var key []byte
 	var promise func(*kgo.Record, error)
 
-	for _, msg := range messages {
+	if options.Context != nil {
+		if k, ok := options.Context.Value(publishKey{}).([]byte); ok && k != nil {
+			key = k
+		}
+		if p, ok := options.Context.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
+			promise = p
+		}
+	}
 
-		if mctx := msg.Context(); mctx != nil {
-			if k, ok := mctx.Value(publishKey{}).([]byte); ok && k != nil {
-				key = k
+	for _, msg := range msgs {
+		rec := &kgo.Record{Context: ctx, Key: key}
+		rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
+		k.opts.Meter.Counter(broker.PublishMessageInflight, "endpoint", rec.Topic).Inc()
+		if options.BodyOnly {
+			rec.Value = msg.Body
+		} else if 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)})
 			}
-			if p, ok := mctx.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
-				promise = p
+		} else {
+			rec.Value, err = k.opts.Codec.Marshal(msg)
+			if err != nil {
+				return err
 			}
 		}
-
-		rec := &kgo.Record{
-			Context: ctx,
-			Key:     key,
-			Topic:   topic,
-			Value:   msg.Body(),
-		}
-
-		b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
-
-		setHeaders(rec, msg.Header())
-
 		records = append(records, rec)
 	}
 
-	ts := time.Now()
-
 	if promise != nil {
-
+		ts := time.Now()
 		for _, rec := range records {
-			b.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
+			k.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
 				te := time.Since(ts)
-				b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Dec()
-				b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
-				b.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
+				k.opts.Meter.Counter(broker.PublishMessageInflight, "endpoint", rec.Topic).Dec()
+				k.opts.Meter.Summary(broker.PublishMessageLatencyMicroseconds, "endpoint", r.Topic).Update(te.Seconds())
+				k.opts.Meter.Histogram(broker.PublishMessageDurationSeconds, "endpoint", r.Topic).Update(te.Seconds())
 				if err != nil {
-					b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "failure").Inc()
+					k.opts.Meter.Counter(broker.PublishMessageTotal, "endpoint", r.Topic, "status", "failure").Inc()
 				} else {
-					b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "success").Inc()
+					k.opts.Meter.Counter(broker.PublishMessageTotal, "endpoint", r.Topic, "status", "success").Inc()
 				}
 				promise(r, err)
 			})
 		}
 		return nil
 	}
-
-	results := b.c.ProduceSync(ctx, records...)
-
+	ts := time.Now()
+	results := k.c.ProduceSync(ctx, records...)
 	te := time.Since(ts)
 	for _, result := range results {
-		b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
-		b.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
-		b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
+		k.opts.Meter.Summary(broker.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic).Update(te.Seconds())
+		k.opts.Meter.Histogram(broker.PublishMessageDurationSeconds, "endpoint", result.Record.Topic).Update(te.Seconds())
+		k.opts.Meter.Counter(broker.PublishMessageInflight, "endpoint", result.Record.Topic).Dec()
 		if result.Err != nil {
-			b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
+			k.opts.Meter.Counter(broker.PublishMessageTotal, "endpoint", result.Record.Topic, "status", "failure").Inc()
 			errs = append(errs, result.Err.Error())
 		} else {
-			b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "success").Inc()
+			k.opts.Meter.Counter(broker.PublishMessageTotal, "endpoint", result.Record.Topic, "status", "success").Inc()
 		}
 	}
 
@@ -423,42 +282,13 @@ func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.M
 	return nil
 }
 
-func (k *Broker) TopicExists(ctx context.Context, topic string) error {
-	mdreq := kmsg.NewMetadataRequest()
-	mdreq.Topics = []kmsg.MetadataRequestTopic{
-		{Topic: &topic},
-	}
-
-	mdrsp, err := mdreq.RequestWith(ctx, k.c)
-	if err != nil {
-		return err
-	} else if mdrsp.Topics[0].ErrorCode != 0 {
-		return fmt.Errorf("topic %s not exists or permission error", topic)
-	}
-
-	return nil
+func (k *Broker) BatchSubscribe(ctx context.Context, topic string, handler broker.BatchHandler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
+	return nil, nil
 }
 
-func (b *Broker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	return b.funcSubscribe(ctx, topic, handler, opts...)
-}
-
-func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
-	if err := broker.IsValidHandler(handler); err != nil {
-		return nil, err
-	}
-
+func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Handler, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
 	options := broker.NewSubscribeOptions(opts...)
 
-	switch handler.(type) {
-	default:
-		return nil, broker.ErrInvalidHandler
-	case func(broker.Message) error:
-		break
-	case func([]broker.Message) error:
-		break
-	}
-
 	if options.Group == "" {
 		uid, err := id.New()
 		if err != nil {
@@ -468,37 +298,22 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
 	}
 
 	commitInterval := DefaultCommitInterval
-	if b.opts.Context != nil {
-		if v, ok := b.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
+	if k.opts.Context != nil {
+		if v, ok := k.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
 			commitInterval = v
 		}
 	}
 
-	var fatalOnError bool
-	if b.opts.Context != nil {
-		if v, ok := b.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
-			fatalOnError = v
-		}
+	sub := &subscriber{
+		topic:     topic,
+		opts:      options,
+		handler:   handler,
+		kopts:     k.opts,
+		consumers: make(map[tp]*consumer),
+		done:      make(chan struct{}),
 	}
 
-	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,
+	kopts := append(k.kopts,
 		kgo.ConsumerGroup(options.Group),
 		kgo.ConsumeTopics(topic),
 		kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
@@ -506,9 +321,7 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
 		kgo.AutoCommitInterval(commitInterval),
 		kgo.OnPartitionsAssigned(sub.assigned),
 		kgo.OnPartitionsRevoked(sub.revoked),
-		kgo.StopProducerOnDataLossDetected(),
 		kgo.OnPartitionsLost(sub.lost),
-		kgo.AutoCommitCallback(sub.autocommit),
 		kgo.AutoCommitMarks(),
 	)
 
@@ -518,32 +331,17 @@ func (b *Broker) fnSubscribe(ctx context.Context, topic string, handler interfac
 		}
 	}
 
-	c, htracer, err := b.connect(ctx, kopts...)
+	c, err := k.connect(ctx, kopts...)
 	if err != nil {
 		return nil, err
 	}
 
-	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
-	sub.htracer = htracer
-
 	go sub.poll(ctx)
 
-	b.Lock()
-	b.subs = append(b.subs, sub)
-	b.Unlock()
-
+	k.Lock()
+	k.subs = append(k.subs, sub)
+	k.Unlock()
 	return sub, nil
 }
 
@@ -564,13 +362,14 @@ func NewBroker(opts ...broker.Option) *Broker {
 		kgo.DialTimeout(3 * time.Second),
 		kgo.DisableIdempotentWrite(),
 		kgo.ProducerBatchCompression(kgo.NoCompression()),
-		kgo.WithLogger(&mlogger{l: options.Logger.Clone(logger.WithAddCallerSkipCount(2)), ctx: options.Context}),
+		kgo.WithLogger(&mlogger{l: options.Logger, ctx: options.Context}),
+		// kgo.WithLogger(kgo.BasicLogger(os.Stderr, kgo.LogLevelDebug, func() string { return time.Now().Format(time.StampMilli) })),
+		kgo.WithHooks(&metrics{meter: options.Meter}),
 		kgo.SeedBrokers(kaddrs...),
 		kgo.RetryBackoffFn(DefaultRetryBackoffFn),
 		kgo.BlockRebalanceOnPoll(),
 		kgo.Balancers(kgo.CooperativeStickyBalancer()),
 		kgo.FetchIsolationLevel(kgo.ReadUncommitted()),
-		kgo.UnknownTopicRetries(1),
 	}
 
 	if options.Context != nil {
@@ -580,8 +379,7 @@ func NewBroker(opts ...broker.Option) *Broker {
 	}
 
 	return &Broker{
-		connected: &atomic.Uint32{},
-		opts:      options,
-		kopts:     kopts,
+		opts:  options,
+		kopts: kopts,
 	}
 }

kgo_test.go

@@ -2,6 +2,7 @@ package kgo_test
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"strings"
 	"sync/atomic"
@@ -12,104 +13,19 @@ import (
 	kgo "go.unistack.org/micro-broker-kgo/v4"
 	"go.unistack.org/micro/v4/broker"
 	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v4/logger/slog"
 	"go.unistack.org/micro/v4/metadata"
 )
 
 var (
-	msgcnt   = int64(1200)
+	msgcnt   = int64(12000000)
 	group    = "38"
-	prefill  = true
-	loglevel = logger.DebugLevel
+	prefill  = false
+	loglevel = logger.InfoLevel
 )
 
-func TestFail(t *testing.T) {
-	if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
-		t.Skip()
-	}
-
-	logger.DefaultLogger = slog.NewLogger()
-	if err := logger.DefaultLogger.Init(logger.WithLevel(loglevel)); err != nil {
-		t.Fatal(err)
-	}
-	ctx := context.Background()
-
-	var addrs []string
-	if addr := os.Getenv("BROKER_ADDRS"); len(addr) == 0 {
-		addrs = []string{"127.0.0.1:9092"}
-	} else {
-		addrs = strings.Split(addr, ",")
-	}
-
-	b := kgo.NewBroker(
-		broker.Addrs(addrs...),
-		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)
-	}
+var bm = &broker.Message{
+	Header: map[string]string{"hkey": "hval", metadata.HeaderTopic: "test"},
+	Body:   []byte(`"body"`),
 }
 
 func TestConnect(t *testing.T) {
@@ -134,7 +50,7 @@ func TestPubSub(t *testing.T) {
 		t.Skip()
 	}
 
-	if err := logger.DefaultLogger.Init(logger.WithLevel(loglevel)); err != nil {
+	if err := logger.DefaultLogger.Init(logger.WithLevel(loglevel), logger.WithCallerSkipCount(3)); err != nil {
 		t.Fatal(err)
 	}
 	ctx := context.Background()
@@ -151,7 +67,6 @@ 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)
 	}
@@ -166,20 +81,19 @@ func TestPubSub(t *testing.T) {
 		}
 	}()
 	if prefill {
-		msgs := make([]broker.Message, 0, msgcnt)
+		msgs := make([]*broker.Message, 0, msgcnt)
 		for i := int64(0); i < msgcnt; i++ {
-			m, _ := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
-			msgs = append(msgs, m)
+			msgs = append(msgs, bm)
 		}
 
-		if err := b.Publish(ctx, "test", msgs...); err != nil {
+		if err := b.BatchPublish(ctx, msgs); err != nil {
 			t.Fatal(err)
 		}
 		//	t.Skip()
 	}
 	done := make(chan bool, 1)
 	idx := int64(0)
-	fn := func(msg broker.Message) error {
+	fn := func(msg broker.Event) error {
 		atomic.AddInt64(&idx, 1)
 		// time.Sleep(200 * time.Millisecond)
 		return msg.Ack()
@@ -210,7 +124,7 @@ func TestPubSub(t *testing.T) {
 				if prc := atomic.LoadInt64(&idx); prc == msgcnt {
 					close(done)
 				} else {
-					t.Logf("processed %v\n", prc)
+					fmt.Printf("processed %v\n", prc)
 				}
 			case <-ticker.C:
 				close(done)

logger.go

@@ -2,6 +2,7 @@ package kgo
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/twmb/franz-go/pkg/kgo"
 	"go.unistack.org/micro/v4/logger"
@@ -28,8 +29,15 @@ func (l *mlogger) Log(lvl kgo.LogLevel, msg string, args ...interface{}) {
 	default:
 		return
 	}
-
-	l.l.Log(l.ctx, mlvl, msg, args...)
+	if len(args) > 0 {
+		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)
+	} else {
+		l.l.Log(l.ctx, mlvl, msg)
+	}
 }
 
 func (l *mlogger) Level() kgo.LogLevel {

metrics.go

@@ -9,26 +9,54 @@ import (
 	"go.unistack.org/micro/v4/meter"
 )
 
-type hookMeter struct {
+/*
+	func NewServerSubscriberWrapper(opts ...Option) server.SubscriberWrapper {
+		handler := &wrapper{
+			opts: NewOptions(opts...),
+		}
+		return handler.SubscriberFunc
+	}
+
+	func (w *wrapper) SubscriberFunc(fn server.SubscriberFunc) server.SubscriberFunc {
+		return func(ctx context.Context, msg server.Message) error {
+			endpoint := msg.Topic()
+
+			labels := make([]string, 0, 4)
+			labels = append(labels, labelEndpoint, endpoint)
+
+			w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Inc()
+			ts := time.Now()
+			err := fn(ctx, msg)
+			te := time.Since(ts)
+			w.opts.Meter.Counter(SubscribeMessageInflight, labels...).Dec()
+
+			w.opts.Meter.Summary(SubscribeMessageLatencyMicroseconds, labels...).Update(te.Seconds())
+			w.opts.Meter.Histogram(SubscribeMessageDurationSeconds, labels...).Update(te.Seconds())
+
+			if err == nil {
+				labels = append(labels, labelStatus, labelSuccess)
+			} else {
+				labels = append(labels, labelStatus, labelFailure)
+			}
+			w.opts.Meter.Counter(SubscribeMessageTotal, labels...).Inc()
+
+			return err
+		}
+	}
+*/
+type metrics struct {
 	meter meter.Meter
 }
 
 var (
-	_ 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
+	_ kgo.HookBrokerConnect       = &metrics{}
+	_ kgo.HookBrokerDisconnect    = &metrics{}
+	_ kgo.HookBrokerRead          = &metrics{}
+	_ kgo.HookBrokerThrottle      = &metrics{}
+	_ kgo.HookBrokerWrite         = &metrics{}
+	_ kgo.HookFetchBatchRead      = &metrics{}
+	_ kgo.HookProduceBatchWritten = &metrics{}
+	_ kgo.HookGroupManageError    = &metrics{}
 )
 
 const (
@@ -61,11 +89,11 @@ const (
 	labelTopic   = "topic"
 )
 
-func (m *hookMeter) OnGroupManageError(_ error) {
+func (m *metrics) OnGroupManageError(err error) {
 	m.meter.Counter(metricBrokerGroupErrors).Inc()
 }
 
-func (m *hookMeter) OnBrokerConnect(meta kgo.BrokerMetadata, _ time.Duration, _ net.Conn, err error) {
+func (m *metrics) 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()
@@ -74,12 +102,12 @@ func (m *hookMeter) OnBrokerConnect(meta kgo.BrokerMetadata, _ time.Duration, _
 	m.meter.Counter(metricBrokerConnects, labelNode, node, labelStatus, labelSuccess).Inc()
 }
 
-func (m *hookMeter) OnBrokerDisconnect(meta kgo.BrokerMetadata, _ net.Conn) {
+func (m *metrics) OnBrokerDisconnect(meta kgo.BrokerMetadata, _ net.Conn) {
 	node := strconv.Itoa(int(meta.NodeID))
 	m.meter.Counter(metricBrokerDisconnects, labelNode, node).Inc()
 }
 
-func (m *hookMeter) OnBrokerWrite(meta kgo.BrokerMetadata, _ int16, bytesWritten int, writeWait, timeToWrite time.Duration, err error) {
+func (m *metrics) 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()
@@ -90,7 +118,7 @@ func (m *hookMeter) OnBrokerWrite(meta kgo.BrokerMetadata, _ int16, bytesWritten
 	m.meter.Histogram(metricBrokerWriteLatencies, labelNode, node).Update(timeToWrite.Seconds())
 }
 
-func (m *hookMeter) OnBrokerRead(meta kgo.BrokerMetadata, _ int16, bytesRead int, readWait, timeToRead time.Duration, err error) {
+func (m *metrics) 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()
@@ -102,18 +130,18 @@ func (m *hookMeter) OnBrokerRead(meta kgo.BrokerMetadata, _ int16, bytesRead int
 	m.meter.Histogram(metricBrokerReadLatencies, labelNode, node).Update(timeToRead.Seconds())
 }
 
-func (m *hookMeter) OnBrokerThrottle(meta kgo.BrokerMetadata, throttleInterval time.Duration, _ bool) {
+func (m *metrics) 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 *hookMeter) OnProduceBatchWritten(meta kgo.BrokerMetadata, topic string, _ int32, kmetrics kgo.ProduceBatchMetrics) {
+func (m *metrics) 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 *hookMeter) OnFetchBatchRead(meta kgo.BrokerMetadata, topic string, _ int32, kmetrics kgo.FetchBatchMetrics) {
+func (m *metrics) 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

@@ -6,19 +6,11 @@ import (
 
 	"github.com/twmb/franz-go/pkg/kgo"
 	"go.unistack.org/micro/v4/broker"
+	"go.unistack.org/micro/v4/client"
 )
 
-var (
-
-	// DefaultCommitInterval specifies how fast send commit offsets to kafka
-	DefaultCommitInterval = 5 * time.Second
-
-	// DefaultStatsInterval specifies how fast check consumer lag
-	DefaultStatsInterval = 5 * time.Second
-
-	// DefaultSubscribeMaxInflight specifies how much messages keep inflight
-	DefaultSubscribeMaxInflight = 100
-)
+// DefaultCommitInterval specifies how fast send commit offsets to kafka
+var DefaultCommitInterval = 5 * time.Second
 
 type subscribeContextKey struct{}
 
@@ -34,6 +26,11 @@ func PublishKey(key []byte) broker.PublishOption {
 	return broker.SetPublishOption(publishKey{}, key)
 }
 
+// ClientPublishKey set the kafka message key (client option)
+func ClientPublishKey(key []byte) client.PublishOption {
+	return client.SetPublishOption(publishKey{}, key)
+}
+
 type optionsKey struct{}
 
 // Options pass additional options to broker
@@ -66,24 +63,6 @@ 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 {
-	return broker.SetOption(clientIDKey{}, id)
-}
-
-type groupKey struct{}
-
-func Group(id string) broker.Option {
-	return broker.SetOption(groupKey{}, id)
-}
-
 type commitIntervalKey struct{}
 
 // CommitInterval specifies interval to send commits
@@ -91,6 +70,8 @@ func CommitInterval(td time.Duration) broker.Option {
 	return broker.SetOption(commitIntervalKey{}, td)
 }
 
+var DefaultSubscribeMaxInflight = 10
+
 type subscribeMaxInflightKey struct{}
 
 // SubscribeMaxInFlight max queued messages
@@ -98,14 +79,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

@@ -2,20 +2,13 @@ package kgo
 
 import (
 	"context"
-	"fmt"
-	"strconv"
 	"sync"
-	"sync/atomic"
 	"time"
 
-	"github.com/twmb/franz-go/pkg/kadm"
 	"github.com/twmb/franz-go/pkg/kgo"
-	"github.com/twmb/franz-go/pkg/kmsg"
 	"go.unistack.org/micro/v4/broker"
 	"go.unistack.org/micro/v4/logger"
 	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/semconv"
-	"go.unistack.org/micro/v4/tracer"
 )
 
 type tp struct {
@@ -24,216 +17,145 @@ type tp struct {
 }
 
 type consumer struct {
-	topic     string
 	c         *kgo.Client
-	htracer   *hookTracer
+	topic     string
+	partition int32
+	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 {
-	consumers map[tp]*consumer
+type subscriber struct {
 	c         *kgo.Client
-	htracer   *hookTracer
 	topic     string
-
-	handler interface{}
-	done    chan struct{}
-	kopts   broker.Options
-	opts    broker.SubscribeOptions
-
-	connected *atomic.Uint32
+	opts      broker.SubscribeOptions
+	kopts     broker.Options
+	handler   broker.Handler
+	closed    bool
+	done      chan struct{}
+	consumers map[tp]*consumer
 	sync.RWMutex
-	closed       bool
-	fatalOnError bool
 }
 
-func (s *Subscriber) Client() *kgo.Client {
-	return s.c
-}
-
-func (s *Subscriber) Options() broker.SubscribeOptions {
+func (s *subscriber) Options() broker.SubscribeOptions {
 	return s.opts
 }
 
-func (s *Subscriber) Topic() string {
+func (s *subscriber) Topic() string {
 	return s.topic
 }
 
-func (s *Subscriber) Unsubscribe(ctx context.Context) error {
+func (s *subscriber) Unsubscribe(ctx context.Context) error {
 	if s.closed {
 		return nil
 	}
-
-	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)
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	default:
+		close(s.done)
+		s.closed = true
 	}
-	s.killConsumers(ctx, kc)
-	close(s.done)
-	s.closed = true
-	s.c.ResumeFetchTopics(s.topic)
-
 	return nil
 }
 
-func (s *Subscriber) poll(ctx context.Context) {
+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 p, l := range lmap {
-					s.kopts.Meter.Counter(semconv.BrokerGroupLag, "topic", s.topic, "group", s.opts.Group, "partition", strconv.Itoa(int(p))).Set(uint64(l.Lag))
-				}
-				s.Unlock()
-
-			}
-		}
-	}()
-
 	for {
 		select {
 		case <-ctx.Done():
-			s.c.CloseAllowingRebalance()
+			s.c.Close()
 			return
 		case <-s.done:
+			s.c.Close()
 			return
 		default:
 			fetches := s.c.PollRecords(ctx, maxInflight)
-			if !s.closed && fetches.IsClientClosed() {
+			if fetches.IsClientClosed() {
+				s.kopts.Logger.Errorf(ctx, "[kgo] client closed")
 				s.closed = true
 				return
 			}
 			fetches.EachError(func(t string, p int32, err error) {
-				s.kopts.Logger.Fatal(ctx, fmt.Sprintf("[kgo] fetch topic %s partition %d error", t, p), err)
+				s.kopts.Logger.Fatalf(ctx, "[kgo] fetch topic %s partition %d err: %v", t, p, err)
 			})
 
 			fetches.EachPartition(func(p kgo.FetchTopicPartition) {
-				tps := tp{p.Topic, p.Partition}
-				s.consumers[tps].recs <- p
+				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) {
+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 {
-			tps := tp{topic, partition}
-			pc, ok := s.consumers[tps]
-			if !ok {
-				continue
-			}
-			delete(s.consumers, tps)
+			tp := tp{topic, partition}
+			pc := s.consumers[tp]
+			delete(s.consumers, tp)
 			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))
-			}
+			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) 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.ErrorLevel) {
-		s.kopts.Logger.Error(ctx, fmt.Sprintf("[kgo] lost %#+v", lost))
-	}
+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)
-	// s.connected.Store(0)
 }
 
-func (s *Subscriber) revoked(ctx context.Context, c *kgo.Client, revoked map[string][]int32) {
-	if s.kopts.Logger.V(logger.DebugLevel) {
-		s.kopts.Logger.Debug(ctx, fmt.Sprintf("[kgo] revoked %#+v", revoked))
-	}
+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.Error(ctx, "[kgo] revoked CommitMarkedOffsets error", err)
-		// s.connected.Store(0)
+		s.kopts.Logger.Errorf(ctx, "[kgo] revoked CommitMarkedOffsets err: %v", err)
 	}
 }
 
-func (s *Subscriber) assigned(_ context.Context, c *kgo.Client, assigned map[string][]int32) {
+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,
-				htracer:   s.htracer,
-				quit:      make(chan struct{}),
-				done:      make(chan struct{}),
-				recs:      make(chan kgo.FetchTopicPartition, 100),
-				handler:   s.handler,
-				kopts:     s.kopts,
-				opts:      s.opts,
-				connected: s.connected,
+
+				quit:    make(chan struct{}),
+				done:    make(chan struct{}),
+				recs:    make(chan kgo.FetchTopicPartition, 4),
+				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() {
-	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))
+	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 {
@@ -242,52 +164,86 @@ func (pc *consumer) consume() {
 			return
 		case p := <-pc.recs:
 			for _, record := range p.Records {
-				ctx, sp := pc.htracer.WithProcessSpan(record)
 				ts := time.Now()
-				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Inc()
-				p := messagePool.Get().(*kgoMessage)
-
-				p.body = record.Value
+				pc.kopts.Meter.Counter(broker.SubscribeMessageInflight, "endpoint", 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.hdr = metadata.New(len(record.Headers))
-				p.ctx = ctx
-				for _, hdr := range record.Headers {
-					p.hdr.Set(hdr.Key, string(hdr.Value))
+				if pc.kopts.Codec.String() == "noop" {
+					p.msg.Header = metadata.New(len(record.Headers))
+					for _, hdr := range record.Headers {
+						p.msg.Header.Set(hdr.Key, string(hdr.Value))
+					}
+					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(broker.SubscribeMessageTotal, "endpoint", record.Topic, "status", "failure").Inc()
+						p.err = err
+						p.msg.Body = record.Value
+						if eh != nil {
+							_ = eh(p)
+							pc.kopts.Meter.Counter(broker.SubscribeMessageInflight, "endpoint", 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(broker.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic).Update(te.Seconds())
+							pc.kopts.Meter.Histogram(broker.SubscribeMessageDurationSeconds, "endpoint", 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(broker.SubscribeMessageInflight, "endpoint", record.Topic).Dec()
+						pc.kopts.Meter.Summary(broker.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic).Update(te.Seconds())
+						pc.kopts.Meter.Histogram(broker.SubscribeMessageDurationSeconds, "endpoint", record.Topic).Update(te.Seconds())
+						eventPool.Put(p)
+						pc.kopts.Logger.Fatalf(pc.kopts.Context, "[kgo] Unmarshal err not handled wtf?")
+						return
+					}
 				}
-
-				switch h := pc.handler.(type) {
-				case func(broker.Message) error:
-					err = h(p)
-				case func([]broker.Message) error:
-					err = h([]broker.Message{p})
+				err := pc.handler(p)
+				if err == nil {
+					pc.kopts.Meter.Counter(broker.SubscribeMessageTotal, "endpoint", record.Topic, "status", "success").Inc()
+				} else {
+					pc.kopts.Meter.Counter(broker.SubscribeMessageTotal, "endpoint", record.Topic, "status", "failure").Inc()
 				}
-
-				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
-				if err != nil {
-					sp.SetStatus(tracer.SpanStatusError, err.Error())
-					pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc()
-				} else if pc.opts.AutoAck {
+				pc.kopts.Meter.Counter(broker.SubscribeMessageInflight, "endpoint", 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())
-
-				ack := p.ack
-				messagePool.Put(p)
-
-				if ack {
+				pc.kopts.Meter.Summary(broker.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic).Update(te.Seconds())
+				pc.kopts.Meter.Histogram(broker.SubscribeMessageDurationSeconds, "endpoint", record.Topic).Update(te.Seconds())
+				if p.ack {
+					eventPool.Put(p)
 					pc.c.MarkCommitRecords(record)
 				} else {
-					sp.Finish()
-					//					pc.connected.Store(0)
-					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] message not commited")
+					eventPool.Put(p)
+					pc.kopts.Logger.Fatalf(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
 					return
 				}
-
-				sp.Finish()
 			}
 		}
 	}

tracer.go

@@ -1,204 +0,0 @@
-package kgo
-
-import (
-	"context"
-	"unicode/utf8"
-
-	"github.com/twmb/franz-go/pkg/kgo"
-	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
-	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v4/tracer"
-)
-
-type hookTracer struct {
-	tracer   tracer.Tracer
-	clientID string
-	group    string
-}
-
-var messagingSystem = semconv.MessagingSystemKey.String("kafka")
-
-var (
-	_ kgo.HookProduceRecordBuffered   = (*hookTracer)(nil)
-	_ kgo.HookProduceRecordUnbuffered = (*hookTracer)(nil)
-	_ kgo.HookFetchRecordBuffered     = (*hookTracer)(nil)
-	_ kgo.HookFetchRecordUnbuffered   = (*hookTracer)(nil)
-)
-
-// 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{}{
-		messagingSystem,
-		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),
-	}
-
-	if r.Context == nil {
-		r.Context = context.Background()
-	}
-
-	omd, ok := metadata.FromOutgoingContext(r.Context)
-	if !ok {
-		omd = metadata.New(len(r.Headers))
-	}
-
-	md := metadata.Copy(omd)
-	for _, h := range r.Headers {
-		md.Set(h.Key, string(h.Value))
-	}
-
-	if !ok {
-		r.Context, _ = m.tracer.Start(metadata.NewOutgoingContext(r.Context, md), "sdk.broker", opts...)
-	} else {
-		r.Context, _ = m.tracer.Start(r.Context, "sdk.broker", opts...)
-	}
-
-	setHeaders(r, omd, metadata.HeaderContentType)
-}
-
-// 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) {
-	if span, ok := tracer.SpanFromContext(r.Context); ok {
-		span.AddLabels(
-			semconv.MessagingKafkaDestinationPartition(int(r.Partition)),
-		)
-		if err != nil {
-			span.SetStatus(tracer.SpanStatusError, err.Error())
-		}
-		span.Finish()
-	}
-}
-
-// 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{}{
-		messagingSystem,
-		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()
-	}
-	omd, ok := metadata.FromIncomingContext(r.Context)
-	if !ok {
-		omd = metadata.New(len(r.Headers))
-	}
-
-	md := metadata.Copy(omd)
-	for _, h := range r.Headers {
-		md.Set(h.Key, string(h.Value))
-	}
-
-	if !ok {
-		r.Context, _ = m.tracer.Start(metadata.NewIncomingContext(r.Context, md), "sdk.broker", opts...)
-	} else {
-		r.Context, _ = m.tracer.Start(r.Context, "sdk.broker", opts...)
-	}
-
-	setHeaders(r, omd, metadata.HeaderContentType)
-}
-
-// OnFetchRecordUnbuffered continues and ends the "receive" span for an
-// unbuffered record.
-func (m *hookTracer) OnFetchRecordUnbuffered(r *kgo.Record, _ bool) {
-	span, _ := tracer.SpanFromContext(r.Context)
-	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{}{
-		messagingSystem,
-		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()
-	}
-	md, ok := metadata.FromIncomingContext(r.Context)
-	if !ok {
-		md = metadata.New(len(r.Headers))
-	}
-	for _, h := range r.Headers {
-		md.Set(h.Key, string(h.Value))
-	}
-
-	// Start a new span using the provided context and options.
-	return m.tracer.Start(r.Context, "sdk.broker", 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))
-}