Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f73d9d7347 | |||
| 53f72f1246 | |||
| ac454693a6 |
@@ -3,10 +3,10 @@ name: lint
|
|||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
types: [opened, reopened, synchronize]
|
types: [opened, reopened, synchronize]
|
||||||
branches: [ master, v3, v4 ]
|
branches:
|
||||||
paths-ignore:
|
- master
|
||||||
- '.github/**'
|
- v3
|
||||||
- '.gitea/**'
|
- v4
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
@@ -24,6 +24,6 @@ jobs:
|
|||||||
- name: setup deps
|
- name: setup deps
|
||||||
run: go get -v ./...
|
run: go get -v ./...
|
||||||
- name: run lint
|
- name: run lint
|
||||||
uses: golangci/golangci-lint-action@v6
|
uses: https://github.com/golangci/golangci-lint-action@v6
|
||||||
with:
|
with:
|
||||||
version: 'latest'
|
version: 'latest'
|
||||||
@@ -3,12 +3,15 @@ name: test
|
|||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
types: [opened, reopened, synchronize]
|
types: [opened, reopened, synchronize]
|
||||||
branches: [ master, v3, v4 ]
|
branches:
|
||||||
|
- master
|
||||||
|
- v3
|
||||||
|
- v4
|
||||||
push:
|
push:
|
||||||
branches: [ master, v3, v4 ]
|
branches:
|
||||||
paths-ignore:
|
- master
|
||||||
- '.github/**'
|
- v3
|
||||||
- '.gitea/**'
|
- v4
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
@@ -3,12 +3,15 @@ name: test
|
|||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
types: [opened, reopened, synchronize]
|
types: [opened, reopened, synchronize]
|
||||||
branches: [ master, v3, v4 ]
|
branches:
|
||||||
|
- master
|
||||||
|
- v3
|
||||||
|
- v4
|
||||||
push:
|
push:
|
||||||
branches: [ master, v3, v4 ]
|
branches:
|
||||||
paths-ignore:
|
- master
|
||||||
- '.github/**'
|
- v3
|
||||||
- '.gitea/**'
|
- v4
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
@@ -32,19 +35,19 @@ jobs:
|
|||||||
go-version: 'stable'
|
go-version: 'stable'
|
||||||
- name: setup go work
|
- name: setup go work
|
||||||
env:
|
env:
|
||||||
GOWORK: ${{ github.workspace }}/go.work
|
GOWORK: /workspace/${{ github.repository_owner }}/go.work
|
||||||
run: |
|
run: |
|
||||||
go work init
|
go work init
|
||||||
go work use .
|
go work use .
|
||||||
go work use micro-tests
|
go work use micro-tests
|
||||||
- name: setup deps
|
- name: setup deps
|
||||||
env:
|
env:
|
||||||
GOWORK: ${{ github.workspace }}/go.work
|
GOWORK: /workspace/${{ github.repository_owner }}/go.work
|
||||||
run: go get -v ./...
|
run: go get -v ./...
|
||||||
- name: run tests
|
- name: run tests
|
||||||
env:
|
env:
|
||||||
INTEGRATION_TESTS: yes
|
INTEGRATION_TESTS: yes
|
||||||
GOWORK: ${{ github.workspace }}/go.work
|
GOWORK: /workspace/${{ github.repository_owner }}/go.work
|
||||||
run: |
|
run: |
|
||||||
cd micro-tests
|
cd micro-tests
|
||||||
go test -mod readonly -v ./... || true
|
go test -mod readonly -v ./... || true
|
||||||
53
.github/workflows/job_coverage.yml
vendored
53
.github/workflows/job_coverage.yml
vendored
@@ -1,53 +0,0 @@
|
|||||||
name: coverage
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ main, v3, v4 ]
|
|
||||||
paths-ignore:
|
|
||||||
- '.github/**'
|
|
||||||
- '.gitea/**'
|
|
||||||
pull_request:
|
|
||||||
branches: [ main, v3, v4 ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
|
|
||||||
build:
|
|
||||||
if: github.server_url != 'https://github.com'
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
filter: 'blob:none'
|
|
||||||
|
|
||||||
- name: setup go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
cache-dependency-path: "**/*.sum"
|
|
||||||
go-version: 'stable'
|
|
||||||
|
|
||||||
- name: test coverage
|
|
||||||
run: |
|
|
||||||
go test -v -cover ./... -covermode=count -coverprofile coverage.out -coverpkg ./...
|
|
||||||
go tool cover -func coverage.out -o coverage.out
|
|
||||||
|
|
||||||
- name: coverage badge
|
|
||||||
uses: tj-actions/coverage-badge-go@v2
|
|
||||||
with:
|
|
||||||
green: 80
|
|
||||||
filename: coverage.out
|
|
||||||
|
|
||||||
- uses: stefanzweifel/git-auto-commit-action@v4
|
|
||||||
name: autocommit
|
|
||||||
with:
|
|
||||||
commit_message: Apply Code Coverage Badge
|
|
||||||
skip_fetch: false
|
|
||||||
skip_checkout: false
|
|
||||||
file_pattern: ./README.md
|
|
||||||
|
|
||||||
- name: push
|
|
||||||
if: steps.auto-commit-action.outputs.changes_detected == 'true'
|
|
||||||
uses: ad-m/github-push-action@master
|
|
||||||
with:
|
|
||||||
github_token: ${{ github.token }}
|
|
||||||
branch: ${{ github.ref }}
|
|
||||||
@@ -1,5 +1,21 @@
|
|||||||
run:
|
run:
|
||||||
concurrency: 8
|
concurrency: 8
|
||||||
timeout: 5m
|
deadline: 5m
|
||||||
issues-exit-code: 1
|
issues-exit-code: 1
|
||||||
tests: true
|
tests: true
|
||||||
|
|
||||||
|
linters:
|
||||||
|
enable:
|
||||||
|
- staticcheck
|
||||||
|
- unused
|
||||||
|
- gosimple
|
||||||
|
- govet
|
||||||
|
- prealloc
|
||||||
|
- unconvert
|
||||||
|
- nakedret
|
||||||
|
|
||||||
|
linters-settings:
|
||||||
|
govet:
|
||||||
|
check-all: true
|
||||||
|
enable:
|
||||||
|
- fieldalignment
|
||||||
@@ -7,13 +7,13 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/twmb/franz-go/pkg/kgo"
|
"github.com/twmb/franz-go/pkg/kgo"
|
||||||
"go.unistack.org/micro/v3/logger"
|
"go.unistack.org/micro/v4/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
type hookEvent struct {
|
type hookEvent struct {
|
||||||
log logger.Logger
|
log logger.Logger
|
||||||
connected *atomic.Uint32
|
|
||||||
fatalOnError bool
|
fatalOnError bool
|
||||||
|
connected *atomic.Uint32
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -26,48 +26,44 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (m *hookEvent) OnGroupManageError(err error) {
|
func (m *hookEvent) OnGroupManageError(err error) {
|
||||||
switch {
|
if err != nil {
|
||||||
case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
|
m.connected.Store(0)
|
||||||
return
|
if m.fatalOnError {
|
||||||
default:
|
m.log.Fatal(context.TODO(), "kgo.OnGroupManageError", err)
|
||||||
m.log.Error(context.TODO(), "kgo.OnGroupManageError", err)
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *hookEvent) OnBrokerConnect(_ kgo.BrokerMetadata, _ time.Duration, _ net.Conn, err error) {
|
func (m *hookEvent) OnBrokerConnect(_ kgo.BrokerMetadata, _ time.Duration, _ net.Conn, err error) {
|
||||||
switch {
|
if err != nil {
|
||||||
case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
|
m.connected.Store(0)
|
||||||
return
|
if m.fatalOnError {
|
||||||
default:
|
m.log.Fatal(context.TODO(), "kgo.OnBrokerConnect", err)
|
||||||
m.log.Error(context.TODO(), "kgo.OnBrokerConnect", err)
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *hookEvent) OnBrokerDisconnect(_ kgo.BrokerMetadata, _ net.Conn) {}
|
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) {
|
func (m *hookEvent) OnBrokerWrite(_ kgo.BrokerMetadata, _ int16, _ int, _ time.Duration, _ time.Duration, err error) {
|
||||||
switch {
|
if err != nil {
|
||||||
case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
|
m.connected.Store(0)
|
||||||
return
|
if m.fatalOnError {
|
||||||
default:
|
m.log.Fatal(context.TODO(), "kgo.OnBrokerWrite", err)
|
||||||
m.log.Error(context.TODO(), "kgo.OnBrokerWrite", err)
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *hookEvent) OnBrokerRead(_ kgo.BrokerMetadata, _ int16, _ int, _ time.Duration, _ time.Duration, err error) {
|
func (m *hookEvent) OnBrokerRead(_ kgo.BrokerMetadata, _ int16, _ int, _ time.Duration, _ time.Duration, err error) {
|
||||||
switch {
|
if err != nil {
|
||||||
case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
|
m.connected.Store(0)
|
||||||
return
|
|
||||||
default:
|
|
||||||
m.log.Error(context.TODO(), "kgo.OnBrokerRead", err)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *hookEvent) OnProduceRecordUnbuffered(_ *kgo.Record, err error) {
|
func (m *hookEvent) OnProduceRecordUnbuffered(_ *kgo.Record, err error) {
|
||||||
switch {
|
if err != nil {
|
||||||
case err == nil || isContextError(err) || kgo.IsRetryableBrokerErr(err):
|
m.connected.Store(0)
|
||||||
return
|
|
||||||
default:
|
|
||||||
m.log.Error(context.TODO(), "kgo.OnProduceRecordUnbuffered", err)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/twmb/franz-go/pkg/kgo"
|
"github.com/twmb/franz-go/pkg/kgo"
|
||||||
"go.unistack.org/micro/v3/metadata"
|
"go.unistack.org/micro/v4/metadata"
|
||||||
)
|
)
|
||||||
|
|
||||||
// RecordCarrier injects and extracts traces from a kgo.Record.
|
// RecordCarrier injects and extracts traces from a kgo.Record.
|
||||||
@@ -77,7 +77,7 @@ loop:
|
|||||||
for i := 0; i < len(r.Headers); i++ {
|
for i := 0; i < len(r.Headers); i++ {
|
||||||
if strings.EqualFold(r.Headers[i].Key, k) {
|
if strings.EqualFold(r.Headers[i].Key, k) {
|
||||||
// Key exist, update the value.
|
// Key exist, update the value.
|
||||||
r.Headers[i].Value = []byte(v)
|
r.Headers[i].Value = []byte(strings.Join(v, ","))
|
||||||
continue loop
|
continue loop
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -85,7 +85,7 @@ loop:
|
|||||||
// Key does not exist, append new header.
|
// Key does not exist, append new header.
|
||||||
r.Headers = append(r.Headers, kgo.RecordHeader{
|
r.Headers = append(r.Headers, kgo.RecordHeader{
|
||||||
Key: k,
|
Key: k,
|
||||||
Value: []byte(v),
|
Value: []byte(strings.Join(v, ",")),
|
||||||
})
|
})
|
||||||
|
|
||||||
seen[k] = struct{}{}
|
seen[k] = struct{}{}
|
||||||
|
|||||||
10
errors.go
10
errors.go
@@ -1,10 +0,0 @@
|
|||||||
package kgo
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
func isContextError(err error) bool {
|
|
||||||
return errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)
|
|
||||||
}
|
|
||||||
50
event.go
50
event.go
@@ -1,50 +0,0 @@
|
|||||||
package kgo
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"go.unistack.org/micro/v3/broker"
|
|
||||||
)
|
|
||||||
|
|
||||||
type event struct {
|
|
||||||
msg *broker.Message
|
|
||||||
err error
|
|
||||||
ctx context.Context
|
|
||||||
|
|
||||||
topic string
|
|
||||||
|
|
||||||
sync.RWMutex
|
|
||||||
ack bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *event) Context() context.Context {
|
|
||||||
return p.ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *event) Topic() string {
|
|
||||||
return p.topic
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *event) Message() *broker.Message {
|
|
||||||
return p.msg
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *event) Ack() error {
|
|
||||||
p.ack = true
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *event) Error() error {
|
|
||||||
return p.err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *event) SetError(err error) {
|
|
||||||
p.err = err
|
|
||||||
}
|
|
||||||
|
|
||||||
var eventPool = sync.Pool{
|
|
||||||
New: func() interface{} {
|
|
||||||
return &event{msg: &broker.Message{}}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
28
go.mod
28
go.mod
@@ -1,32 +1,24 @@
|
|||||||
module go.unistack.org/micro-broker-kgo/v3
|
module go.unistack.org/micro-broker-kgo/v4
|
||||||
|
|
||||||
go 1.23.8
|
go 1.23.0
|
||||||
|
|
||||||
toolchain go1.24.3
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/google/uuid v1.6.0
|
github.com/twmb/franz-go v1.18.1
|
||||||
github.com/stretchr/testify v1.10.0
|
github.com/twmb/franz-go/pkg/kadm v1.15.0
|
||||||
github.com/twmb/franz-go v1.19.5
|
github.com/twmb/franz-go/pkg/kmsg v1.9.0
|
||||||
github.com/twmb/franz-go/pkg/kadm v1.16.0
|
|
||||||
github.com/twmb/franz-go/pkg/kmsg v1.11.2
|
|
||||||
go.opentelemetry.io/otel v1.34.0
|
go.opentelemetry.io/otel v1.34.0
|
||||||
go.unistack.org/micro/v3 v3.11.44
|
go.unistack.org/micro/v4 v4.1.4
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/ash3in/uuidv8 v1.2.0 // indirect
|
github.com/ash3in/uuidv8 v1.2.0 // indirect
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
github.com/klauspost/compress v1.18.0 // indirect
|
github.com/klauspost/compress v1.18.0 // indirect
|
||||||
github.com/kr/pretty v0.3.1 // indirect
|
|
||||||
github.com/matoous/go-nanoid v1.5.1 // indirect
|
github.com/matoous/go-nanoid v1.5.1 // indirect
|
||||||
github.com/pierrec/lz4/v4 v4.1.22 // indirect
|
github.com/pierrec/lz4/v4 v4.1.22 // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
|
github.com/spf13/cast v1.7.1 // indirect
|
||||||
go.unistack.org/micro-proto/v3 v3.4.1 // indirect
|
go.unistack.org/micro-proto/v4 v4.1.0 // indirect
|
||||||
golang.org/x/crypto v0.38.0 // indirect
|
golang.org/x/crypto v0.36.0 // indirect
|
||||||
golang.org/x/sys v0.33.0 // indirect
|
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 // indirect
|
|
||||||
google.golang.org/grpc v1.70.0 // indirect
|
|
||||||
google.golang.org/protobuf v1.36.5 // indirect
|
google.golang.org/protobuf v1.36.5 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
43
go.sum
43
go.sum
@@ -2,11 +2,10 @@ github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7Oputl
|
|||||||
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
|
github.com/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 h1:2oogGdtCPwaVtyvPPGin4TfZLtOGE5F+W++E880G6SI=
|
||||||
github.com/ash3in/uuidv8 v1.2.0/go.mod h1:BnU0wJBxnzdEKmVg4xckBkD+VZuecTFTUP3M0dWgyY4=
|
github.com/ash3in/uuidv8 v1.2.0/go.mod h1:BnU0wJBxnzdEKmVg4xckBkD+VZuecTFTUP3M0dWgyY4=
|
||||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
||||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
|
||||||
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
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 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
@@ -21,38 +20,28 @@ github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIc
|
|||||||
github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U=
|
github.com/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 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
|
||||||
github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
|
github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
|
||||||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
|
||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
|
||||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
|
||||||
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
|
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
|
||||||
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
|
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 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
github.com/twmb/franz-go v1.19.5 h1:W7+o8D0RsQsedqib71OVlLeZ0zI6CbFra7yTYhZTs5Y=
|
github.com/twmb/franz-go v1.18.1 h1:D75xxCDyvTqBSiImFx2lkPduE39jz1vaD7+FNc+vMkc=
|
||||||
github.com/twmb/franz-go v1.19.5/go.mod h1:4kFJ5tmbbl7asgwAGVuyG1ZMx0NNpYk7EqflvWfPCpM=
|
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.15.0 h1:Yo3NAPfcsx3Gg9/hdhq4vmwO77TqRRkvpUcGWzjworc=
|
||||||
github.com/twmb/franz-go/pkg/kadm v1.16.0/go.mod h1:MUdcUtnf9ph4SFBLLA/XxE29rvLhWYLM9Ygb8dfSCvw=
|
github.com/twmb/franz-go/pkg/kadm v1.15.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.9.0 h1:JojYUph2TKAau6SBtErXpXGC7E3gg4vGZMv9xFU/B6M=
|
||||||
github.com/twmb/franz-go/pkg/kmsg v1.11.2/go.mod h1:CFfkkLysDNmukPYhGzuUcDtf46gQSqCZHMW1T4Z+wDE=
|
github.com/twmb/franz-go/pkg/kmsg v1.9.0/go.mod h1:CMbfazviCyY6HM0SXuG5t9vOwYDHRCSrJJyBAe5paqg=
|
||||||
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
|
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
|
||||||
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
|
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
|
||||||
go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
|
go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk=
|
||||||
go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
|
go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec=
|
||||||
go.unistack.org/micro/v3 v3.11.44 h1:A+T8zVcL2vlL66kn/Y4rqhtBybLO829wFEYZJYorDOU=
|
go.unistack.org/micro/v4 v4.1.4 h1:gyjVPP9g7UAFZlhEbla9Ih/BeKJfBLAbN/NvAhJCpKU=
|
||||||
go.unistack.org/micro/v3 v3.11.44/go.mod h1:13EFW2ps3BN9mpYbp9K0oQu/VDjEN6LJ4wwdom7hcXQ=
|
go.unistack.org/micro/v4 v4.1.4/go.mod h1:lr3oYED8Ay1vjK68QqRw30QOtdk/ffpZqMFDasOUhKw=
|
||||||
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
|
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
|
||||||
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
|
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
|
||||||
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
|
|
||||||
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
|
|
||||||
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
|
||||||
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
|
||||||
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
|
|
||||||
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
|
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 h1:ZSlhAUqC4r8TPzqLXQ0m3upBNZeF+Y8jQ3c4CR3Ujms=
|
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
|
|
||||||
google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
|
|
||||||
google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
|
|
||||||
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
|
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
|
||||||
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
|
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
|||||||
@@ -1,362 +0,0 @@
|
|||||||
package kgo
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"io"
|
|
||||||
"net"
|
|
||||||
"os"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
"github.com/twmb/franz-go/pkg/kgo"
|
|
||||||
"go.unistack.org/micro/v3/logger"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestHookEvent_OnGroupManageError(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
inputErr error
|
|
||||||
expectedErrorIsCalled bool
|
|
||||||
expectedErrorMsg string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "error is nil",
|
|
||||||
inputErr: nil,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "context canceled",
|
|
||||||
inputErr: context.Canceled,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "context deadline exceeded",
|
|
||||||
inputErr: context.DeadlineExceeded,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: deadline exceeded (os package)",
|
|
||||||
inputErr: os.ErrDeadlineExceeded,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: EOF (io package)",
|
|
||||||
inputErr: io.EOF,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: closed network connection (net package)",
|
|
||||||
inputErr: net.ErrClosed,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "some error",
|
|
||||||
inputErr: errors.New("some error"),
|
|
||||||
expectedErrorIsCalled: true,
|
|
||||||
expectedErrorMsg: "kgo.OnGroupManageError",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
log := &mockLogger{}
|
|
||||||
he := &hookEvent{log: log}
|
|
||||||
he.OnGroupManageError(tt.inputErr)
|
|
||||||
require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
|
|
||||||
require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHookEvent_OnBrokerConnect(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
inputErr error
|
|
||||||
expectedErrorIsCalled bool
|
|
||||||
expectedErrorMsg string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "error is nil",
|
|
||||||
inputErr: nil,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "context canceled",
|
|
||||||
inputErr: context.Canceled,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "context deadline exceeded",
|
|
||||||
inputErr: context.DeadlineExceeded,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: deadline exceeded (os package)",
|
|
||||||
inputErr: os.ErrDeadlineExceeded,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: EOF (io package)",
|
|
||||||
inputErr: io.EOF,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: closed network connection (net package)",
|
|
||||||
inputErr: net.ErrClosed,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "some error",
|
|
||||||
inputErr: errors.New("some error"),
|
|
||||||
expectedErrorIsCalled: true,
|
|
||||||
expectedErrorMsg: "kgo.OnBrokerConnect",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
log := &mockLogger{}
|
|
||||||
he := &hookEvent{log: log}
|
|
||||||
he.OnBrokerConnect(kgo.BrokerMetadata{}, 0, nil, tt.inputErr)
|
|
||||||
require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
|
|
||||||
require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHookEvent_OnBrokerWrite(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
inputErr error
|
|
||||||
expectedErrorIsCalled bool
|
|
||||||
expectedErrorMsg string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "error is nil",
|
|
||||||
inputErr: nil,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "context canceled",
|
|
||||||
inputErr: context.Canceled,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "context deadline exceeded",
|
|
||||||
inputErr: context.DeadlineExceeded,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: deadline exceeded (os package)",
|
|
||||||
inputErr: os.ErrDeadlineExceeded,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: EOF (io package)",
|
|
||||||
inputErr: io.EOF,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: closed network connection (net package)",
|
|
||||||
inputErr: net.ErrClosed,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "some error",
|
|
||||||
inputErr: errors.New("some error"),
|
|
||||||
expectedErrorIsCalled: true,
|
|
||||||
expectedErrorMsg: "kgo.OnBrokerWrite",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
log := &mockLogger{}
|
|
||||||
he := &hookEvent{log: log}
|
|
||||||
he.OnBrokerWrite(kgo.BrokerMetadata{}, 0, 0, 0, 0, tt.inputErr)
|
|
||||||
require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
|
|
||||||
require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHookEvent_OnBrokerRead(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
inputErr error
|
|
||||||
expectedErrorIsCalled bool
|
|
||||||
expectedErrorMsg string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "error is nil",
|
|
||||||
inputErr: nil,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "context canceled",
|
|
||||||
inputErr: context.Canceled,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "context deadline exceeded",
|
|
||||||
inputErr: context.DeadlineExceeded,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: deadline exceeded (os package)",
|
|
||||||
inputErr: os.ErrDeadlineExceeded,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: EOF (io package)",
|
|
||||||
inputErr: io.EOF,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: closed network connection (net package)",
|
|
||||||
inputErr: net.ErrClosed,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "some error",
|
|
||||||
inputErr: errors.New("some error"),
|
|
||||||
expectedErrorIsCalled: true,
|
|
||||||
expectedErrorMsg: "kgo.OnBrokerRead",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
log := &mockLogger{}
|
|
||||||
he := &hookEvent{log: log}
|
|
||||||
he.OnBrokerRead(kgo.BrokerMetadata{}, 0, 0, 0, 0, tt.inputErr)
|
|
||||||
require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
|
|
||||||
require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHookEvent_OnProduceRecordUnbuffered(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
inputErr error
|
|
||||||
expectedErrorIsCalled bool
|
|
||||||
expectedErrorMsg string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "error is nil",
|
|
||||||
inputErr: nil,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "context canceled",
|
|
||||||
inputErr: context.Canceled,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "context deadline exceeded",
|
|
||||||
inputErr: context.DeadlineExceeded,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: deadline exceeded (os package)",
|
|
||||||
inputErr: os.ErrDeadlineExceeded,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: EOF (io package)",
|
|
||||||
inputErr: io.EOF,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "retryable error: closed network connection (net package)",
|
|
||||||
inputErr: net.ErrClosed,
|
|
||||||
expectedErrorIsCalled: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "some error",
|
|
||||||
inputErr: errors.New("some error"),
|
|
||||||
expectedErrorIsCalled: true,
|
|
||||||
expectedErrorMsg: "kgo.OnProduceRecordUnbuffered",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
log := &mockLogger{}
|
|
||||||
he := &hookEvent{log: log}
|
|
||||||
he.OnProduceRecordUnbuffered(&kgo.Record{}, tt.inputErr)
|
|
||||||
require.Equal(t, tt.expectedErrorIsCalled, log.errorIsCalled)
|
|
||||||
require.Equal(t, tt.expectedErrorMsg, log.errorMsg)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mocks
|
|
||||||
|
|
||||||
type mockLogger struct {
|
|
||||||
errorIsCalled bool
|
|
||||||
errorMsg string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Init(...logger.Option) error {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Clone(...logger.Option) logger.Logger {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) V(logger.Level) bool {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Level(logger.Level) {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Options() logger.Options {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Fields(...interface{}) logger.Logger {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Info(context.Context, string, ...interface{}) {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Trace(context.Context, string, ...interface{}) {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Debug(context.Context, string, ...interface{}) {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Warn(context.Context, string, ...interface{}) {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Error(ctx context.Context, msg string, args ...interface{}) {
|
|
||||||
m.errorIsCalled = true
|
|
||||||
m.errorMsg = msg
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Fatal(context.Context, string, ...interface{}) {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Log(context.Context, logger.Level, string, ...interface{}) {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) Name() string {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *mockLogger) String() string {
|
|
||||||
panic("implement me")
|
|
||||||
}
|
|
||||||
263
kgo.go
263
kgo.go
@@ -11,20 +11,27 @@ import (
|
|||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
"github.com/twmb/franz-go/pkg/kgo"
|
"github.com/twmb/franz-go/pkg/kgo"
|
||||||
"github.com/twmb/franz-go/pkg/kmsg"
|
"github.com/twmb/franz-go/pkg/kmsg"
|
||||||
"go.unistack.org/micro/v3/broker"
|
"go.unistack.org/micro/v4/broker"
|
||||||
"go.unistack.org/micro/v3/logger"
|
"go.unistack.org/micro/v4/codec"
|
||||||
"go.unistack.org/micro/v3/metadata"
|
"go.unistack.org/micro/v4/logger"
|
||||||
"go.unistack.org/micro/v3/semconv"
|
"go.unistack.org/micro/v4/metadata"
|
||||||
"go.unistack.org/micro/v3/tracer"
|
"go.unistack.org/micro/v4/options"
|
||||||
mjitter "go.unistack.org/micro/v3/util/jitter"
|
"go.unistack.org/micro/v4/semconv"
|
||||||
mrand "go.unistack.org/micro/v3/util/rand"
|
"go.unistack.org/micro/v4/tracer"
|
||||||
|
"go.unistack.org/micro/v4/util/id"
|
||||||
|
mrand "go.unistack.org/micro/v4/util/rand"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ broker.Broker = (*Broker)(nil)
|
var _ broker.Broker = (*Broker)(nil)
|
||||||
|
|
||||||
|
var messagePool = sync.Pool{
|
||||||
|
New: func() interface{} {
|
||||||
|
return &kgoMessage{}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
var ErrLostMessage = errors.New("message not marked for offsets commit and will be lost in next iteration")
|
var ErrLostMessage = errors.New("message not marked for offsets commit and will be lost in next iteration")
|
||||||
|
|
||||||
var DefaultRetryBackoffFn = func() func(int) time.Duration {
|
var DefaultRetryBackoffFn = func() func(int) time.Duration {
|
||||||
@@ -57,17 +64,17 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
type Broker struct {
|
type Broker struct {
|
||||||
|
funcPublish broker.FuncPublish
|
||||||
|
funcSubscribe broker.FuncSubscribe
|
||||||
c *kgo.Client
|
c *kgo.Client
|
||||||
connected *atomic.Uint32
|
connected *atomic.Uint32
|
||||||
|
|
||||||
done chan struct{}
|
|
||||||
|
|
||||||
kopts []kgo.Opt
|
kopts []kgo.Opt
|
||||||
subs []*Subscriber
|
subs []*Subscriber
|
||||||
|
|
||||||
opts broker.Options
|
opts broker.Options
|
||||||
sync.RWMutex
|
|
||||||
|
|
||||||
|
sync.RWMutex
|
||||||
init bool
|
init bool
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,6 +102,68 @@ func (k *Broker) Client() *kgo.Client {
|
|||||||
return k.c
|
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, *hookTracer, error) {
|
||||||
var c *kgo.Client
|
var c *kgo.Client
|
||||||
var err error
|
var err error
|
||||||
@@ -146,25 +215,6 @@ func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *ho
|
|||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
k.connected.Store(1)
|
k.connected.Store(1)
|
||||||
|
|
||||||
if fatalOnError {
|
|
||||||
go func() {
|
|
||||||
c := 3
|
|
||||||
n := 0
|
|
||||||
tc := mjitter.NewTicker(500*time.Millisecond, 1*time.Second)
|
|
||||||
defer tc.Stop()
|
|
||||||
for range tc.C {
|
|
||||||
if k.connected.Load() == 0 {
|
|
||||||
if n > c {
|
|
||||||
k.opts.Logger.Fatal(context.Background(), "broker fatal error")
|
|
||||||
}
|
|
||||||
n++
|
|
||||||
} else {
|
|
||||||
n = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
return c, htracer, nil
|
return c, htracer, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -226,7 +276,6 @@ func (k *Broker) Disconnect(ctx context.Context) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
k.connected.Store(0)
|
k.connected.Store(0)
|
||||||
close(k.done)
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -261,6 +310,18 @@ func (k *Broker) Init(opts ...broker.Option) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
k.funcPublish = k.fnPublish
|
||||||
|
k.funcSubscribe = k.fnSubscribe
|
||||||
|
|
||||||
|
k.opts.Hooks.EachPrev(func(hook options.Hook) {
|
||||||
|
switch h := hook.(type) {
|
||||||
|
case broker.HookPublish:
|
||||||
|
k.funcPublish = h(k.funcPublish)
|
||||||
|
case broker.HookSubscribe:
|
||||||
|
k.funcSubscribe = h(k.funcSubscribe)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
k.init = true
|
k.init = true
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -270,83 +331,88 @@ func (k *Broker) Options() broker.Options {
|
|||||||
return k.opts
|
return k.opts
|
||||||
}
|
}
|
||||||
|
|
||||||
func (k *Broker) BatchPublish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
|
func (b *Broker) Publish(ctx context.Context, topic string, messages ...broker.Message) error {
|
||||||
return k.publish(ctx, msgs, opts...)
|
return b.funcPublish(ctx, topic, messages...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message, opts ...broker.PublishOption) error {
|
func (b *Broker) fnPublish(ctx context.Context, topic string, messages ...broker.Message) error {
|
||||||
msg.Header.Set(metadata.HeaderTopic, topic)
|
return b.publish(ctx, topic, messages...)
|
||||||
return k.publish(ctx, []*broker.Message{msg}, opts...)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
|
func (b *Broker) publish(ctx context.Context, topic string, messages ...broker.Message) error {
|
||||||
options := broker.NewPublishOptions(opts...)
|
if b.connected.Load() == 0 {
|
||||||
records := make([]*kgo.Record, 0, len(msgs))
|
c, _, err := b.connect(ctx, b.kopts...)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.Lock()
|
||||||
|
b.c = c
|
||||||
|
b.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
records := make([]*kgo.Record, 0, len(messages))
|
||||||
var errs []string
|
var errs []string
|
||||||
var err error
|
|
||||||
var key []byte
|
var key []byte
|
||||||
var promise func(*kgo.Record, error)
|
var promise func(*kgo.Record, error)
|
||||||
|
|
||||||
if options.Context != nil {
|
for _, msg := range messages {
|
||||||
if k, ok := options.Context.Value(publishKey{}).([]byte); ok && k != nil {
|
|
||||||
|
if mctx := msg.Context(); mctx != nil {
|
||||||
|
if k, ok := mctx.Value(publishKey{}).([]byte); ok && k != nil {
|
||||||
key = k
|
key = k
|
||||||
}
|
}
|
||||||
if p, ok := options.Context.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
|
if p, ok := mctx.Value(publishPromiseKey{}).(func(*kgo.Record, error)); ok && p != nil {
|
||||||
promise = p
|
promise = p
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, msg := range msgs {
|
rec := &kgo.Record{
|
||||||
rec := &kgo.Record{Context: ctx, Key: key}
|
Context: ctx,
|
||||||
|
Key: key,
|
||||||
rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
|
Topic: topic,
|
||||||
msg.Header.Del(metadata.HeaderTopic)
|
Value: msg.Body(),
|
||||||
|
|
||||||
k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
|
|
||||||
if options.BodyOnly || k.opts.Codec.String() == "noop" {
|
|
||||||
rec.Value = msg.Body
|
|
||||||
setHeaders(rec, msg.Header)
|
|
||||||
} else {
|
|
||||||
rec.Value, err = k.opts.Codec.Marshal(msg)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
|
||||||
|
|
||||||
|
setHeaders(rec, msg.Header())
|
||||||
|
|
||||||
records = append(records, rec)
|
records = append(records, rec)
|
||||||
}
|
}
|
||||||
|
|
||||||
if promise != nil {
|
|
||||||
ts := time.Now()
|
ts := time.Now()
|
||||||
|
|
||||||
|
if promise != nil {
|
||||||
|
|
||||||
for _, rec := range records {
|
for _, rec := range records {
|
||||||
k.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
|
b.c.Produce(ctx, rec, func(r *kgo.Record, err error) {
|
||||||
te := time.Since(ts)
|
te := time.Since(ts)
|
||||||
k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Dec()
|
b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Dec()
|
||||||
k.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
|
b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
|
||||||
k.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
|
b.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "failure").Inc()
|
b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "failure").Inc()
|
||||||
} else {
|
} else {
|
||||||
k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "success").Inc()
|
b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", rec.Topic, "topic", rec.Topic, "status", "success").Inc()
|
||||||
}
|
}
|
||||||
promise(r, err)
|
promise(r, err)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
ts := time.Now()
|
|
||||||
|
|
||||||
results := k.c.ProduceSync(ctx, records...)
|
results := b.c.ProduceSync(ctx, records...)
|
||||||
|
|
||||||
te := time.Since(ts)
|
te := time.Since(ts)
|
||||||
for _, result := range results {
|
for _, result := range results {
|
||||||
k.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
|
b.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
|
||||||
k.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
|
b.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
|
||||||
k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
|
b.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
|
||||||
if result.Err != nil {
|
if result.Err != nil {
|
||||||
k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
|
b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
|
||||||
errs = append(errs, result.Err.Error())
|
errs = append(errs, result.Err.Error())
|
||||||
} else {
|
} else {
|
||||||
k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "success").Inc()
|
b.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "success").Inc()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -373,31 +439,50 @@ func (k *Broker) TopicExists(ctx context.Context, topic string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (k *Broker) BatchSubscribe(_ context.Context, _ string, _ broker.BatchHandler, _ ...broker.SubscribeOption) (broker.Subscriber, error) {
|
func (b *Broker) Subscribe(ctx context.Context, topic string, handler interface{}, opts ...broker.SubscribeOption) (broker.Subscriber, error) {
|
||||||
return nil, nil
|
return b.funcSubscribe(ctx, topic, handler, opts...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (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...)
|
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 == "" {
|
if options.Group == "" {
|
||||||
uid, err := uuid.NewRandom()
|
uid, err := id.New()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
options.Group = uid.String()
|
options.Group = uid
|
||||||
}
|
}
|
||||||
|
|
||||||
commitInterval := DefaultCommitInterval
|
commitInterval := DefaultCommitInterval
|
||||||
if k.opts.Context != nil {
|
if b.opts.Context != nil {
|
||||||
if v, ok := k.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
|
if v, ok := b.opts.Context.Value(commitIntervalKey{}).(time.Duration); ok && v > 0 {
|
||||||
commitInterval = v
|
commitInterval = v
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var fatalOnError bool
|
var fatalOnError bool
|
||||||
if k.opts.Context != nil {
|
if b.opts.Context != nil {
|
||||||
if v, ok := k.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
|
if v, ok := b.opts.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
|
||||||
|
fatalOnError = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if options.Context != nil {
|
||||||
|
if v, ok := options.Context.Value(fatalOnErrorKey{}).(bool); ok && v {
|
||||||
fatalOnError = v
|
fatalOnError = v
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -406,14 +491,14 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
|
|||||||
topic: topic,
|
topic: topic,
|
||||||
opts: options,
|
opts: options,
|
||||||
handler: handler,
|
handler: handler,
|
||||||
kopts: k.opts,
|
kopts: b.opts,
|
||||||
consumers: make(map[tp]*consumer),
|
consumers: make(map[tp]*consumer),
|
||||||
done: make(chan struct{}),
|
done: make(chan struct{}),
|
||||||
fatalOnError: fatalOnError,
|
fatalOnError: fatalOnError,
|
||||||
connected: k.connected,
|
connected: b.connected,
|
||||||
}
|
}
|
||||||
|
|
||||||
kopts := append(k.kopts,
|
kopts := append(b.kopts,
|
||||||
kgo.ConsumerGroup(options.Group),
|
kgo.ConsumerGroup(options.Group),
|
||||||
kgo.ConsumeTopics(topic),
|
kgo.ConsumeTopics(topic),
|
||||||
kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
|
kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
|
||||||
@@ -433,7 +518,7 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
c, htracer, err := k.connect(ctx, kopts...)
|
c, htracer, err := b.connect(ctx, kopts...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -455,9 +540,10 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
|
|||||||
|
|
||||||
go sub.poll(ctx)
|
go sub.poll(ctx)
|
||||||
|
|
||||||
k.Lock()
|
b.Lock()
|
||||||
k.subs = append(k.subs, sub)
|
b.subs = append(b.subs, sub)
|
||||||
k.Unlock()
|
b.Unlock()
|
||||||
|
|
||||||
return sub, nil
|
return sub, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -497,6 +583,5 @@ func NewBroker(opts ...broker.Option) *Broker {
|
|||||||
connected: &atomic.Uint32{},
|
connected: &atomic.Uint32{},
|
||||||
opts: options,
|
opts: options,
|
||||||
kopts: kopts,
|
kopts: kopts,
|
||||||
done: make(chan struct{}),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
35
kgo_test.go
35
kgo_test.go
@@ -9,11 +9,11 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
kg "github.com/twmb/franz-go/pkg/kgo"
|
kg "github.com/twmb/franz-go/pkg/kgo"
|
||||||
kgo "go.unistack.org/micro-broker-kgo/v3"
|
kgo "go.unistack.org/micro-broker-kgo/v4"
|
||||||
"go.unistack.org/micro/v3/broker"
|
"go.unistack.org/micro/v4/broker"
|
||||||
"go.unistack.org/micro/v3/logger"
|
"go.unistack.org/micro/v4/logger"
|
||||||
"go.unistack.org/micro/v3/logger/slog"
|
"go.unistack.org/micro/v4/logger/slog"
|
||||||
"go.unistack.org/micro/v3/metadata"
|
"go.unistack.org/micro/v4/metadata"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -23,11 +23,6 @@ var (
|
|||||||
loglevel = logger.DebugLevel
|
loglevel = logger.DebugLevel
|
||||||
)
|
)
|
||||||
|
|
||||||
var bm = &broker.Message{
|
|
||||||
Header: map[string]string{"hkey": "hval", metadata.HeaderTopic: "test"},
|
|
||||||
Body: []byte(`"body"`),
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestFail(t *testing.T) {
|
func TestFail(t *testing.T) {
|
||||||
if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
|
if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
|
||||||
t.Skip()
|
t.Skip()
|
||||||
@@ -72,9 +67,10 @@ func TestFail(t *testing.T) {
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
t.Logf("broker health %v", b.Health())
|
t.Logf("broker health %v", b.Health())
|
||||||
msgs := make([]*broker.Message, 0, msgcnt)
|
msgs := make([]broker.Message, 0, msgcnt)
|
||||||
for i := int64(0); i < msgcnt; i++ {
|
for i := int64(0); i < msgcnt; i++ {
|
||||||
msgs = append(msgs, bm)
|
m, _ := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
|
||||||
|
msgs = append(msgs, m)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, msg := range msgs {
|
for _, msg := range msgs {
|
||||||
@@ -86,7 +82,7 @@ func TestFail(t *testing.T) {
|
|||||||
// t.Skip()
|
// t.Skip()
|
||||||
|
|
||||||
idx := int64(0)
|
idx := int64(0)
|
||||||
fn := func(msg broker.Event) error {
|
fn := func(msg broker.Message) error {
|
||||||
atomic.AddInt64(&idx, 1)
|
atomic.AddInt64(&idx, 1)
|
||||||
time.Sleep(500 * time.Millisecond)
|
time.Sleep(500 * time.Millisecond)
|
||||||
t.Logf("ack")
|
t.Logf("ack")
|
||||||
@@ -117,10 +113,6 @@ func TestFail(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestConnect(t *testing.T) {
|
func TestConnect(t *testing.T) {
|
||||||
if tr := os.Getenv("INTEGRATION_TESTS"); len(tr) > 0 {
|
|
||||||
t.Skip()
|
|
||||||
}
|
|
||||||
|
|
||||||
var addrs []string
|
var addrs []string
|
||||||
ctx := context.TODO()
|
ctx := context.TODO()
|
||||||
b := kgo.NewBroker(
|
b := kgo.NewBroker(
|
||||||
@@ -174,19 +166,20 @@ func TestPubSub(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
if prefill {
|
if prefill {
|
||||||
msgs := make([]*broker.Message, 0, msgcnt)
|
msgs := make([]broker.Message, 0, msgcnt)
|
||||||
for i := int64(0); i < msgcnt; i++ {
|
for i := int64(0); i < msgcnt; i++ {
|
||||||
msgs = append(msgs, bm)
|
m, _ := b.NewMessage(ctx, metadata.Pairs("hkey", "hval"), []byte(`test`))
|
||||||
|
msgs = append(msgs, m)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := b.BatchPublish(ctx, msgs); err != nil {
|
if err := b.Publish(ctx, "test", msgs...); err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
// t.Skip()
|
// t.Skip()
|
||||||
}
|
}
|
||||||
done := make(chan bool, 1)
|
done := make(chan bool, 1)
|
||||||
idx := int64(0)
|
idx := int64(0)
|
||||||
fn := func(msg broker.Event) error {
|
fn := func(msg broker.Message) error {
|
||||||
atomic.AddInt64(&idx, 1)
|
atomic.AddInt64(&idx, 1)
|
||||||
// time.Sleep(200 * time.Millisecond)
|
// time.Sleep(200 * time.Millisecond)
|
||||||
return msg.Ack()
|
return msg.Ack()
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
|
|
||||||
"github.com/twmb/franz-go/pkg/kgo"
|
"github.com/twmb/franz-go/pkg/kgo"
|
||||||
"go.unistack.org/micro/v3/logger"
|
"go.unistack.org/micro/v4/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
type mlogger struct {
|
type mlogger struct {
|
||||||
|
|||||||
2
meter.go
2
meter.go
@@ -6,7 +6,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/twmb/franz-go/pkg/kgo"
|
"github.com/twmb/franz-go/pkg/kgo"
|
||||||
"go.unistack.org/micro/v3/meter"
|
"go.unistack.org/micro/v4/meter"
|
||||||
)
|
)
|
||||||
|
|
||||||
type hookMeter struct {
|
type hookMeter struct {
|
||||||
|
|||||||
13
options.go
13
options.go
@@ -5,8 +5,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/twmb/franz-go/pkg/kgo"
|
"github.com/twmb/franz-go/pkg/kgo"
|
||||||
"go.unistack.org/micro/v3/broker"
|
"go.unistack.org/micro/v4/broker"
|
||||||
"go.unistack.org/micro/v3/client"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -35,11 +34,6 @@ func PublishKey(key []byte) broker.PublishOption {
|
|||||||
return broker.SetPublishOption(publishKey{}, key)
|
return broker.SetPublishOption(publishKey{}, key)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ClientPublishKey set the kafka message key (client option)
|
|
||||||
func ClientPublishKey(key []byte) client.PublishOption {
|
|
||||||
return client.SetPublishOption(publishKey{}, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
type optionsKey struct{}
|
type optionsKey struct{}
|
||||||
|
|
||||||
// Options pass additional options to broker
|
// Options pass additional options to broker
|
||||||
@@ -115,8 +109,3 @@ type publishPromiseKey struct{}
|
|||||||
func PublishPromise(fn func(*kgo.Record, error)) broker.PublishOption {
|
func PublishPromise(fn func(*kgo.Record, error)) broker.PublishOption {
|
||||||
return broker.SetPublishOption(publishPromiseKey{}, fn)
|
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)
|
|
||||||
}
|
|
||||||
|
|||||||
161
subscriber.go
161
subscriber.go
@@ -11,11 +11,11 @@ import (
|
|||||||
"github.com/twmb/franz-go/pkg/kadm"
|
"github.com/twmb/franz-go/pkg/kadm"
|
||||||
"github.com/twmb/franz-go/pkg/kgo"
|
"github.com/twmb/franz-go/pkg/kgo"
|
||||||
"github.com/twmb/franz-go/pkg/kmsg"
|
"github.com/twmb/franz-go/pkg/kmsg"
|
||||||
"go.unistack.org/micro/v3/broker"
|
"go.unistack.org/micro/v4/broker"
|
||||||
"go.unistack.org/micro/v3/logger"
|
"go.unistack.org/micro/v4/logger"
|
||||||
"go.unistack.org/micro/v3/metadata"
|
"go.unistack.org/micro/v4/metadata"
|
||||||
"go.unistack.org/micro/v3/semconv"
|
"go.unistack.org/micro/v4/semconv"
|
||||||
"go.unistack.org/micro/v3/tracer"
|
"go.unistack.org/micro/v4/tracer"
|
||||||
)
|
)
|
||||||
|
|
||||||
type tp struct {
|
type tp struct {
|
||||||
@@ -25,43 +25,33 @@ type tp struct {
|
|||||||
|
|
||||||
type consumer struct {
|
type consumer struct {
|
||||||
topic string
|
topic string
|
||||||
|
|
||||||
c *kgo.Client
|
c *kgo.Client
|
||||||
htracer *hookTracer
|
htracer *hookTracer
|
||||||
connected *atomic.Uint32
|
|
||||||
|
|
||||||
quit chan struct{}
|
quit chan struct{}
|
||||||
done chan struct{}
|
done chan struct{}
|
||||||
recs chan kgo.FetchTopicPartition
|
recs chan kgo.FetchTopicPartition
|
||||||
|
|
||||||
handler broker.Handler
|
|
||||||
|
|
||||||
kopts broker.Options
|
kopts broker.Options
|
||||||
opts broker.SubscribeOptions
|
|
||||||
|
|
||||||
partition int32
|
partition int32
|
||||||
|
opts broker.SubscribeOptions
|
||||||
|
handler interface{}
|
||||||
|
connected *atomic.Uint32
|
||||||
}
|
}
|
||||||
|
|
||||||
type Subscriber struct {
|
type Subscriber struct {
|
||||||
topic string
|
|
||||||
|
|
||||||
consumers map[tp]*consumer
|
consumers map[tp]*consumer
|
||||||
|
|
||||||
c *kgo.Client
|
c *kgo.Client
|
||||||
htracer *hookTracer
|
htracer *hookTracer
|
||||||
connected *atomic.Uint32
|
topic string
|
||||||
|
|
||||||
handler broker.Handler
|
|
||||||
|
|
||||||
|
handler interface{}
|
||||||
done chan struct{}
|
done chan struct{}
|
||||||
|
|
||||||
kopts broker.Options
|
kopts broker.Options
|
||||||
opts broker.SubscribeOptions
|
opts broker.SubscribeOptions
|
||||||
|
|
||||||
|
connected *atomic.Uint32
|
||||||
|
sync.RWMutex
|
||||||
closed bool
|
closed bool
|
||||||
fatalOnError bool
|
fatalOnError bool
|
||||||
|
|
||||||
sync.RWMutex
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Subscriber) Client() *kgo.Client {
|
func (s *Subscriber) Client() *kgo.Client {
|
||||||
@@ -187,7 +177,7 @@ func (s *Subscriber) killConsumers(ctx context.Context, lost map[string][]int32)
|
|||||||
|
|
||||||
func (s *Subscriber) autocommit(_ *kgo.Client, _ *kmsg.OffsetCommitRequest, _ *kmsg.OffsetCommitResponse, err error) {
|
func (s *Subscriber) autocommit(_ *kgo.Client, _ *kmsg.OffsetCommitRequest, _ *kmsg.OffsetCommitResponse, err error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// s.connected.Store(0)
|
s.connected.Store(0)
|
||||||
if s.fatalOnError {
|
if s.fatalOnError {
|
||||||
s.kopts.Logger.Fatal(context.TODO(), "kgo.AutoCommitCallback error", err)
|
s.kopts.Logger.Fatal(context.TODO(), "kgo.AutoCommitCallback error", err)
|
||||||
}
|
}
|
||||||
@@ -238,17 +228,14 @@ func (s *Subscriber) assigned(_ context.Context, c *kgo.Client, assigned map[str
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (pc *consumer) consume() {
|
func (pc *consumer) consume() {
|
||||||
|
var err error
|
||||||
|
|
||||||
defer close(pc.done)
|
defer close(pc.done)
|
||||||
if pc.kopts.Logger.V(logger.DebugLevel) {
|
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))
|
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))
|
defer pc.kopts.Logger.Debug(pc.kopts.Context, fmt.Sprintf("killing, topic %s partition %d", pc.topic, pc.partition))
|
||||||
}
|
}
|
||||||
|
|
||||||
eh := pc.kopts.ErrorHandler
|
|
||||||
if pc.opts.ErrorHandler != nil {
|
|
||||||
eh = pc.opts.ErrorHandler
|
|
||||||
}
|
|
||||||
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-pc.quit:
|
case <-pc.quit:
|
||||||
@@ -258,122 +245,50 @@ func (pc *consumer) consume() {
|
|||||||
ctx, sp := pc.htracer.WithProcessSpan(record)
|
ctx, sp := pc.htracer.WithProcessSpan(record)
|
||||||
ts := time.Now()
|
ts := time.Now()
|
||||||
pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Inc()
|
pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Inc()
|
||||||
p := eventPool.Get().(*event)
|
p := messagePool.Get().(*kgoMessage)
|
||||||
p.msg.Header = nil
|
|
||||||
p.msg.Body = nil
|
p.body = record.Value
|
||||||
p.topic = record.Topic
|
p.topic = record.Topic
|
||||||
p.err = nil
|
|
||||||
p.ack = false
|
p.ack = false
|
||||||
p.msg.Header = metadata.New(len(record.Headers))
|
p.hdr = metadata.New(len(record.Headers))
|
||||||
p.ctx = ctx
|
p.ctx = ctx
|
||||||
for _, hdr := range record.Headers {
|
for _, hdr := range record.Headers {
|
||||||
p.msg.Header.Set(hdr.Key, string(hdr.Value))
|
p.hdr.Set(hdr.Key, string(hdr.Value))
|
||||||
}
|
}
|
||||||
if pc.kopts.Codec.String() == "noop" {
|
|
||||||
p.msg.Body = record.Value
|
switch h := pc.handler.(type) {
|
||||||
} else if pc.opts.BodyOnly {
|
case func(broker.Message) error:
|
||||||
p.msg.Body = record.Value
|
err = h(p)
|
||||||
} else {
|
case func([]broker.Message) error:
|
||||||
if sp != nil {
|
err = h([]broker.Message{p})
|
||||||
sp.AddEvent("codec unmarshal start")
|
|
||||||
}
|
|
||||||
err := pc.kopts.Codec.Unmarshal(record.Value, p.msg)
|
|
||||||
if sp != nil {
|
|
||||||
sp.AddEvent("codec unmarshal stop")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if sp != nil {
|
|
||||||
sp.SetStatus(tracer.SpanStatusError, err.Error())
|
sp.SetStatus(tracer.SpanStatusError, err.Error())
|
||||||
}
|
|
||||||
pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc()
|
pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc()
|
||||||
p.err = err
|
} else if pc.opts.AutoAck {
|
||||||
p.msg.Body = record.Value
|
|
||||||
if eh != nil {
|
|
||||||
_ = eh(p)
|
|
||||||
pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
|
|
||||||
if p.ack {
|
|
||||||
pc.c.MarkCommitRecords(record)
|
|
||||||
} else {
|
|
||||||
eventPool.Put(p)
|
|
||||||
// pc.connected.Store(0)
|
|
||||||
pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
eventPool.Put(p)
|
|
||||||
te := time.Since(ts)
|
|
||||||
pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
|
|
||||||
pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
|
|
||||||
continue
|
|
||||||
} else {
|
|
||||||
pc.kopts.Logger.Error(pc.kopts.Context, "[kgo]: unmarshal error", err)
|
|
||||||
}
|
|
||||||
te := time.Since(ts)
|
|
||||||
pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
|
|
||||||
pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
|
|
||||||
pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
|
|
||||||
eventPool.Put(p)
|
|
||||||
// pc.connected.Store(0)
|
|
||||||
pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] Unmarshal err not handled wtf?")
|
|
||||||
if sp != nil {
|
|
||||||
sp.Finish()
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if sp != nil {
|
|
||||||
sp.AddEvent("handler start")
|
|
||||||
}
|
|
||||||
err := pc.handler(p)
|
|
||||||
if sp != nil {
|
|
||||||
sp.AddEvent("handler stop")
|
|
||||||
}
|
|
||||||
if err == nil {
|
|
||||||
pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "success").Inc()
|
|
||||||
} else {
|
|
||||||
if sp != nil {
|
|
||||||
sp.SetStatus(tracer.SpanStatusError, err.Error())
|
|
||||||
}
|
|
||||||
pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc()
|
|
||||||
}
|
|
||||||
pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
|
|
||||||
if err == nil && pc.opts.AutoAck {
|
|
||||||
p.ack = true
|
p.ack = true
|
||||||
} else if err != nil {
|
|
||||||
p.err = err
|
|
||||||
if eh != nil {
|
|
||||||
if sp != nil {
|
|
||||||
sp.AddEvent("error handler start")
|
|
||||||
}
|
|
||||||
_ = eh(p)
|
|
||||||
if sp != nil {
|
|
||||||
sp.AddEvent("error handler stop")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if pc.kopts.Logger.V(logger.ErrorLevel) {
|
|
||||||
pc.kopts.Logger.Error(pc.kopts.Context, "[kgo]: subscriber error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
te := time.Since(ts)
|
te := time.Since(ts)
|
||||||
pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
|
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())
|
pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
|
||||||
if p.ack {
|
|
||||||
eventPool.Put(p)
|
ack := p.ack
|
||||||
|
messagePool.Put(p)
|
||||||
|
|
||||||
|
if ack {
|
||||||
pc.c.MarkCommitRecords(record)
|
pc.c.MarkCommitRecords(record)
|
||||||
} else {
|
} else {
|
||||||
eventPool.Put(p)
|
|
||||||
// pc.connected.Store(0)
|
|
||||||
pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
|
|
||||||
if sp != nil {
|
|
||||||
sp.SetStatus(tracer.SpanStatusError, "ErrLostMessage")
|
|
||||||
sp.Finish()
|
sp.Finish()
|
||||||
}
|
pc.connected.Store(0)
|
||||||
|
pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] message not commited")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if sp != nil {
|
|
||||||
sp.Finish()
|
sp.Finish()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
23
tracer.go
23
tracer.go
@@ -6,8 +6,8 @@ import (
|
|||||||
|
|
||||||
"github.com/twmb/franz-go/pkg/kgo"
|
"github.com/twmb/franz-go/pkg/kgo"
|
||||||
semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
|
semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
|
||||||
"go.unistack.org/micro/v3/metadata"
|
"go.unistack.org/micro/v4/metadata"
|
||||||
"go.unistack.org/micro/v3/tracer"
|
"go.unistack.org/micro/v4/tracer"
|
||||||
)
|
)
|
||||||
|
|
||||||
type hookTracer struct {
|
type hookTracer struct {
|
||||||
@@ -32,9 +32,6 @@ var (
|
|||||||
// the record's context, so it can be ended in the OnProduceRecordUnbuffered
|
// the record's context, so it can be ended in the OnProduceRecordUnbuffered
|
||||||
// hook.
|
// hook.
|
||||||
func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
|
func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
|
||||||
if !m.tracer.Enabled() {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// Set up span options.
|
// Set up span options.
|
||||||
attrs := []interface{}{
|
attrs := []interface{}{
|
||||||
messagingSystem,
|
messagingSystem,
|
||||||
@@ -80,9 +77,6 @@ func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
|
|||||||
// It sets attributes with values unset when producing and records any error
|
// It sets attributes with values unset when producing and records any error
|
||||||
// that occurred during the publish operation.
|
// that occurred during the publish operation.
|
||||||
func (m *hookTracer) OnProduceRecordUnbuffered(r *kgo.Record, err error) {
|
func (m *hookTracer) OnProduceRecordUnbuffered(r *kgo.Record, err error) {
|
||||||
if !m.tracer.Enabled() {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if span, ok := tracer.SpanFromContext(r.Context); ok {
|
if span, ok := tracer.SpanFromContext(r.Context); ok {
|
||||||
span.AddLabels(
|
span.AddLabels(
|
||||||
semconv.MessagingKafkaDestinationPartition(int(r.Partition)),
|
semconv.MessagingKafkaDestinationPartition(int(r.Partition)),
|
||||||
@@ -102,9 +96,6 @@ func (m *hookTracer) OnProduceRecordUnbuffered(r *kgo.Record, err error) {
|
|||||||
// OnFetchRecordUnbuffered hook and can be used in downstream consumer
|
// OnFetchRecordUnbuffered hook and can be used in downstream consumer
|
||||||
// processing.
|
// processing.
|
||||||
func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
|
func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
|
||||||
if !m.tracer.Enabled() {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// Set up the span options.
|
// Set up the span options.
|
||||||
attrs := []interface{}{
|
attrs := []interface{}{
|
||||||
messagingSystem,
|
messagingSystem,
|
||||||
@@ -150,9 +141,6 @@ func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
|
|||||||
// OnFetchRecordUnbuffered continues and ends the "receive" span for an
|
// OnFetchRecordUnbuffered continues and ends the "receive" span for an
|
||||||
// unbuffered record.
|
// unbuffered record.
|
||||||
func (m *hookTracer) OnFetchRecordUnbuffered(r *kgo.Record, _ bool) {
|
func (m *hookTracer) OnFetchRecordUnbuffered(r *kgo.Record, _ bool) {
|
||||||
if !m.tracer.Enabled() {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
span, _ := tracer.SpanFromContext(r.Context)
|
span, _ := tracer.SpanFromContext(r.Context)
|
||||||
span.Finish()
|
span.Finish()
|
||||||
}
|
}
|
||||||
@@ -167,13 +155,6 @@ func (m *hookTracer) OnFetchRecordUnbuffered(r *kgo.Record, _ bool) {
|
|||||||
// not a record which has been created for producing, so call this at the start of each
|
// not a record which has been created for producing, so call this at the start of each
|
||||||
// iteration of your processing for the record.
|
// iteration of your processing for the record.
|
||||||
func (m *hookTracer) WithProcessSpan(r *kgo.Record) (context.Context, tracer.Span) {
|
func (m *hookTracer) WithProcessSpan(r *kgo.Record) (context.Context, tracer.Span) {
|
||||||
if r.Context == nil {
|
|
||||||
r.Context = context.Background()
|
|
||||||
}
|
|
||||||
|
|
||||||
if !m.tracer.Enabled() {
|
|
||||||
return r.Context, nil
|
|
||||||
}
|
|
||||||
// Set up the span options.
|
// Set up the span options.
|
||||||
attrs := []interface{}{
|
attrs := []interface{}{
|
||||||
messagingSystem,
|
messagingSystem,
|
||||||
|
|||||||
Reference in New Issue
Block a user