.gitignore

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

carrier.go

@@ -2,7 +2,6 @@ package kgo
 
 import (
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/metadata"
 )
 
 // RecordCarrier injects and extracts traces from a kgo.Record.
@@ -52,25 +51,3 @@ func (c RecordCarrier) Keys() []string {
 	}
 	return out
 }
-
-func setHeaders(r *kgo.Record, md metadata.Metadata) {
-	seen := make(map[string]struct{})
-loop:
-	for k, v := range md {
-		for i := 0; i < len(r.Headers); i++ {
-			if r.Headers[i].Key == k {
-				// Key exist, update the value.
-				r.Headers[i].Value = []byte(v)
-				continue loop
-			} else if _, ok := seen[k]; ok {
-				continue loop
-			}
-			// Key does not exist, append new header.
-			r.Headers = append(r.Headers, kgo.RecordHeader{
-				Key:   k,
-				Value: []byte(v),
-			})
-			seen[k] = struct{}{}
-		}
-	}
-}

event.go

@@ -1,14 +1,12 @@
 package kgo
 
 import (
-	"context"
 	"sync"
 
 	"go.unistack.org/micro/v3/broker"
 )
 
 type event struct {
-	ctx   context.Context
 	topic string
 	err   error
 	sync.RWMutex
@@ -16,10 +14,6 @@ type event struct {
 	ack bool
 }
 
-func (p *event) Context() context.Context {
-	return p.ctx
-}
-
 func (p *event) Topic() string {
 	return p.topic
 }

go.mod

@@ -1,25 +1,21 @@
 module go.unistack.org/micro-broker-kgo/v3
 
-go 1.22
+go 1.19
-
-toolchain go1.23.1
 
 require (
 	github.com/google/uuid v1.6.0
-	github.com/twmb/franz-go v1.18.0
+	github.com/twmb/franz-go v1.16.1
-	github.com/twmb/franz-go/pkg/kadm v1.14.0
+	github.com/twmb/franz-go/pkg/kmsg v1.7.0
-	github.com/twmb/franz-go/pkg/kmsg v1.9.0
+	go.opentelemetry.io/otel v1.24.0
-	go.opentelemetry.io/otel v1.32.0
+	go.unistack.org/micro/v3 v3.10.46
-	go.unistack.org/micro/v3 v3.10.101
 )
 
 require (
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/klauspost/compress v1.17.7 // indirect
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
+	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/crypto v0.29.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
-	golang.org/x/sys v0.27.0 // indirect
+	google.golang.org/grpc v1.62.1 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
 )

go.sum

@@ -1,42 +1,32 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
 github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/twmb/franz-go v1.16.1 h1:rpWc7fB9jd7TgmCyfxzenBI+QbgS8ZfJOUQE+tzPtbE=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/twmb/franz-go v1.16.1/go.mod h1:/pER254UPPGp/4WfGqRi+SIRGE50RSQzVubQp6+N4FA=
-github.com/twmb/franz-go v1.18.0 h1:25FjMZfdozBywVX+5xrWC2W+W76i0xykKjTdEeD2ejw=
+github.com/twmb/franz-go/pkg/kmsg v1.7.0 h1:a457IbvezYfA5UkiBvyV3zj0Is3y1i8EJgqjJYoij2E=
-github.com/twmb/franz-go v1.18.0/go.mod h1:zXCGy74M0p5FbXsLeASdyvfLFsBvTubVqctIaa5wQ+I=
+github.com/twmb/franz-go/pkg/kmsg v1.7.0/go.mod h1:se9Mjdt0Nwzc9lnjJ0HyDtLyBnaBDAd7pCje47OhSyw=
-github.com/twmb/franz-go/pkg/kadm v1.14.0 h1:nAn1co1lXzJQocpzyIyOFOjUBf4WHWs5/fTprXy2IZs=
+go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
-github.com/twmb/franz-go/pkg/kadm v1.14.0/go.mod h1:XjOPz6ZaXXjrW2jVCfLuucP8H1w2TvD6y3PT2M+aAM4=
+go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
-github.com/twmb/franz-go/pkg/kmsg v1.9.0 h1:JojYUph2TKAau6SBtErXpXGC7E3gg4vGZMv9xFU/B6M=
+go.unistack.org/micro/v3 v3.10.46 h1:rnuEqiFkerwJmKzHmHBXRgxFemZustxWz2hRNLQQ8cU=
-github.com/twmb/franz-go/pkg/kmsg v1.9.0/go.mod h1:CMbfazviCyY6HM0SXuG5t9vOwYDHRCSrJJyBAe5paqg=
+go.unistack.org/micro/v3 v3.10.46/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-go.unistack.org/micro/v3 v3.10.101 h1:CwMg7f2Mnsy+tRcsY0RTcAMkTVp+GMUgPU6pPaG8gpw=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-go.unistack.org/micro/v3 v3.10.101/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 h1:IR+hp6ypxjH24bkMfEJ0yHR21+gwPWdV+/IBrPQyn3k=
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
+google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
-google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
-google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

kgo.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
-	"net/http"
 	"strings"
 	"sync"
 	"time"
@@ -17,7 +16,6 @@ import (
 	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/semconv"
 	"go.unistack.org/micro/v3/tracer"
 	mrand "go.unistack.org/micro/v3/util/rand"
 )
@@ -63,7 +61,7 @@ type Broker struct {
 	connected bool
 	sync.RWMutex
 	opts broker.Options
-	subs []*Subscriber
+	subs []*subscriber
 }
 
 func (k *Broker) Address() string {
@@ -74,15 +72,12 @@ func (k *Broker) Name() string {
 	return k.opts.Name
 }
 
-func (k *Broker) Client() *kgo.Client {
+func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, error) {
-	return k.c
-}
-
-func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *hookTracer, error) {
 	var c *kgo.Client
 	var err error
-
+	var span tracer.Span
-	sp, _ := tracer.SpanFromContext(ctx)
+	ctx, span = k.opts.Tracer.Start(ctx, "Connect")
+	defer span.Finish()
 
 	clientID := "kgo"
 	group := ""
@@ -95,33 +90,28 @@ func (k *Broker) connect(ctx context.Context, opts ...kgo.Opt) (*kgo.Client, *ho
 		}
 	}
 
-	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(&hookTracer{group: group, clientID: clientID, tracer: k.opts.Tracer}),
 	)
 
 	select {
 	case <-ctx.Done():
 		if ctx.Err() != nil {
-			if sp != nil {
+			span.SetStatus(tracer.SpanStatusError, ctx.Err().Error())
-				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 {
+			span.SetStatus(tracer.SpanStatusError, err.Error())
-				sp.SetStatus(tracer.SpanStatusError, err.Error())
+			return nil, err
-			}
-			return nil, nil, err
 		}
 	}
-	return c, htracer, nil
+	return c, nil
 }
 
 func (k *Broker) Connect(ctx context.Context) error {
@@ -137,7 +127,7 @@ func (k *Broker) Connect(ctx context.Context) error {
 		nctx = ctx
 	}
 
-	c, _, err := k.connect(nctx, k.kopts...)
+	c, err := k.connect(nctx, k.kopts...)
 	if err != nil {
 		return err
 	}
@@ -240,9 +230,13 @@ func (k *Broker) Publish(ctx context.Context, topic string, msg *broker.Message,
 }
 
 func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...broker.PublishOption) error {
+	var span tracer.Span
+	ctx, span = k.opts.Tracer.Start(ctx, "Publish")
+	defer span.Finish()
+
 	k.Lock()
 	if !k.connected {
-		c, _, err := k.connect(ctx, k.kopts...)
+		c, err := k.connect(ctx, k.kopts...)
 		if err != nil {
 			k.Unlock()
 			return err
@@ -272,11 +266,11 @@ func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...br
 		rec := &kgo.Record{Context: ctx, Key: key}
 		rec.Topic, _ = msg.Header.Get(metadata.HeaderTopic)
 		msg.Header.Del(metadata.HeaderTopic)
-		k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", rec.Topic, "topic", rec.Topic).Inc()
+		// k.opts.Meter.Counter(broker.PublishMessageInflight, "endpoint", rec.Topic).Inc()
 		if options.BodyOnly || k.opts.Codec.String() == "noop" {
 			rec.Value = msg.Body
 			for k, v := range msg.Header {
-				rec.Headers = append(rec.Headers, kgo.RecordHeader{Key: http.CanonicalHeaderKey(k), Value: []byte(v)})
+				rec.Headers = append(rec.Headers, kgo.RecordHeader{Key: k, Value: []byte(v)})
 			}
 		} else {
 			rec.Value, err = k.opts.Codec.Marshal(msg)
@@ -288,35 +282,35 @@ func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...br
 	}
 
 	if promise != nil {
-		ts := time.Now()
+		// ts := time.Now()
 		for _, rec := range records {
 			k.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()
+				//	k.opts.Meter.Counter(broker.PublishMessageInflight, "endpoint", rec.Topic).Dec()
-				k.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
+				//	k.opts.Meter.Summary(broker.PublishMessageLatencyMicroseconds, "endpoint", r.Topic).Update(te.Seconds())
-				k.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", rec.Topic, "topic", rec.Topic).Update(te.Seconds())
+				//	k.opts.Meter.Histogram(broker.PublishMessageDurationSeconds, "endpoint", r.Topic).Update(te.Seconds())
 				if err != nil {
-					k.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 {
-					k.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
 	}
-	ts := time.Now()
+	// ts := time.Now()
 	results := k.c.ProduceSync(ctx, records...)
-	te := time.Since(ts)
+	// te := time.Since(ts)
 	for _, result := range results {
-		k.opts.Meter.Summary(semconv.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
+		//	k.opts.Meter.Summary(broker.PublishMessageLatencyMicroseconds, "endpoint", result.Record.Topic).Update(te.Seconds())
-		k.opts.Meter.Histogram(semconv.PublishMessageDurationSeconds, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Update(te.Seconds())
+		//	k.opts.Meter.Histogram(broker.PublishMessageDurationSeconds, "endpoint", result.Record.Topic).Update(te.Seconds())
-		k.opts.Meter.Counter(semconv.PublishMessageInflight, "endpoint", result.Record.Topic, "topic", result.Record.Topic).Dec()
+		///		k.opts.Meter.Counter(broker.PublishMessageInflight, "endpoint", result.Record.Topic).Dec()
 		if result.Err != nil {
-			k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "failure").Inc()
+			//			k.opts.Meter.Counter(broker.PublishMessageTotal, "endpoint", result.Record.Topic, "status", "failure").Inc()
 			errs = append(errs, result.Err.Error())
 		} else {
-			k.opts.Meter.Counter(semconv.PublishMessageTotal, "endpoint", result.Record.Topic, "topic", result.Record.Topic, "status", "success").Inc()
+			//			k.opts.Meter.Counter(broker.PublishMessageTotal, "endpoint", result.Record.Topic, "status", "success").Inc()
 		}
 	}
 
@@ -327,22 +321,6 @@ func (k *Broker) publish(ctx context.Context, msgs []*broker.Message, opts ...br
 	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
 }
@@ -365,7 +343,7 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 		}
 	}
 
-	sub := &Subscriber{
+	sub := &subscriber{
 		topic:     topic,
 		opts:      options,
 		handler:   handler,
@@ -392,7 +370,7 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 		}
 	}
 
-	c, htracer, err := k.connect(ctx, kopts...)
+	c, err := k.connect(ctx, kopts...)
 	if err != nil {
 		return nil, err
 	}
@@ -410,8 +388,6 @@ func (k *Broker) Subscribe(ctx context.Context, topic string, handler broker.Han
 	}
 
 	sub.c = c
-	sub.htracer = htracer
-
 	go sub.poll(ctx)
 
 	k.Lock()
@@ -437,13 +413,12 @@ 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.Clone(logger.WithCallerSkipCount(options.Logger.Options().CallerSkipCount + 2)), ctx: options.Context}),
 		kgo.SeedBrokers(kaddrs...),
 		kgo.RetryBackoffFn(DefaultRetryBackoffFn),
 		kgo.BlockRebalanceOnPoll(),
 		kgo.Balancers(kgo.CooperativeStickyBalancer()),
 		kgo.FetchIsolationLevel(kgo.ReadUncommitted()),
-		kgo.UnknownTopicRetries(0),
 	}
 
 	if options.Context != nil {

kgo_test.go

@@ -50,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()

logger.go

@@ -28,8 +28,11 @@ func (l *mlogger) Log(lvl kgo.LogLevel, msg string, args ...interface{}) {
 	default:
 		return
 	}
-
+	if len(args) > 0 {
-	l.l.Log(l.ctx, mlvl, msg, args...)
+		l.l.Log(l.ctx, mlvl, append([]interface{}{msg}, args...)...)
+	} else {
+		l.l.Log(l.ctx, mlvl, msg)
+	}
 }
 
 func (l *mlogger) Level() kgo.LogLevel {

meter.go

@@ -14,21 +14,14 @@ type hookMeter struct {
 }
 
 var (
-	_ kgo.HookBrokerConnect    = &hookMeter{}
+	_ kgo.HookBrokerConnect       = &hookMeter{}
-	_ kgo.HookBrokerDisconnect = &hookMeter{}
+	_ kgo.HookBrokerDisconnect    = &hookMeter{}
-	// HookBrokerE2E
+	_ kgo.HookBrokerRead          = &hookMeter{}
-	_ kgo.HookBrokerRead     = &hookMeter{}
+	_ kgo.HookBrokerThrottle      = &hookMeter{}
-	_ kgo.HookBrokerThrottle = &hookMeter{}
+	_ kgo.HookBrokerWrite         = &hookMeter{}
-	_ kgo.HookBrokerWrite    = &hookMeter{}
+	_ kgo.HookFetchBatchRead      = &hookMeter{}
-	_ kgo.HookFetchBatchRead = &hookMeter{}
-	// HookFetchRecordBuffered
-	// HookFetchRecordUnbuffered
-	_ kgo.HookGroupManageError = &hookMeter{}
-	// HookNewClient
 	_ kgo.HookProduceBatchWritten = &hookMeter{}
-	// HookProduceRecordBuffered
+	_ kgo.HookGroupManageError    = &hookMeter{}
-	// HookProduceRecordPartitioned
-	// HookProduceRecordUnbuffered
 )
 
 const (

options.go

@@ -9,17 +9,8 @@ import (
 	"go.unistack.org/micro/v3/client"
 )
 
-var (
+// DefaultCommitInterval specifies how fast send commit offsets to kafka
-
+var DefaultCommitInterval = 5 * time.Second
-	// 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
-)
 
 type subscribeContextKey struct{}
 
@@ -91,6 +82,8 @@ func CommitInterval(td time.Duration) broker.Option {
 	return broker.SetOption(commitIntervalKey{}, td)
 }
 
+var DefaultSubscribeMaxInflight = 10
+
 type subscribeMaxInflightKey struct{}
 
 // SubscribeMaxInFlight max queued messages

subscriber.go

@@ -2,18 +2,12 @@ package kgo
 
 import (
 	"context"
-	"fmt"
-	"strconv"
 	"sync"
-	"time"
 
-	"github.com/twmb/franz-go/pkg/kadm"
 	"github.com/twmb/franz-go/pkg/kgo"
 	"go.unistack.org/micro/v3/broker"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/semconv"
-	"go.unistack.org/micro/v3/tracer"
 )
 
 type tp struct {
@@ -25,7 +19,6 @@ type consumer struct {
 	c         *kgo.Client
 	topic     string
 	partition int32
-	htracer   *hookTracer
 	opts      broker.SubscribeOptions
 	kopts     broker.Options
 	handler   broker.Handler
@@ -34,10 +27,9 @@ type consumer struct {
 	recs      chan kgo.FetchTopicPartition
 }
 
-type Subscriber struct {
+type subscriber struct {
 	c         *kgo.Client
 	topic     string
-	htracer   *hookTracer
 	opts      broker.SubscribeOptions
 	kopts     broker.Options
 	handler   broker.Handler
@@ -47,19 +39,15 @@ type Subscriber struct {
 	sync.RWMutex
 }
 
-func (s *Subscriber) Client() *kgo.Client {
+func (s *subscriber) Options() broker.SubscribeOptions {
-	return s.c
-}
-
-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
 	}
@@ -81,48 +69,13 @@ func (s *Subscriber) Unsubscribe(ctx context.Context) error {
 	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)), "lag", strconv.Itoa(int(l.Lag)))
-				}
-				s.Unlock()
-
-			}
-		}
-	}()
-
 	for {
 		select {
 		case <-ctx.Done():
@@ -137,7 +90,7 @@ func (s *Subscriber) poll(ctx context.Context) {
 				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) {
@@ -149,7 +102,7 @@ func (s *Subscriber) poll(ctx context.Context) {
 	}
 }
 
-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()
 
@@ -159,50 +112,42 @@ func (s *Subscriber) killConsumers(ctx context.Context, lost map[string][]int32)
 			pc := s.consumers[tp]
 			delete(s.consumers, tp)
 			close(pc.quit)
-			if s.kopts.Logger.V(logger.DebugLevel) {
+			s.kopts.Logger.Debugf(ctx, "[kgo] waiting for work to finish topic %s partition %d", topic, partition)
-				s.kopts.Logger.Debug(ctx, fmt.Sprintf("[kgo] waiting for work to finish topic %s partition %d", topic, partition))
-			}
 			wg.Add(1)
 			go func() { <-pc.done; wg.Done() }()
 		}
 	}
 }
 
-func (s *Subscriber) lost(ctx context.Context, _ *kgo.Client, lost map[string][]int32) {
+func (s *subscriber) lost(ctx context.Context, _ *kgo.Client, lost map[string][]int32) {
-	if s.kopts.Logger.V(logger.DebugLevel) {
+	s.kopts.Logger.Debugf(ctx, "[kgo] lost %#+v", lost)
-		s.kopts.Logger.Debug(ctx, fmt.Sprintf("[kgo] lost %#+v", lost))
-	}
 	s.killConsumers(ctx, lost)
 }
 
-func (s *Subscriber) revoked(ctx context.Context, c *kgo.Client, revoked map[string][]int32) {
+func (s *subscriber) revoked(ctx context.Context, c *kgo.Client, revoked map[string][]int32) {
-	if s.kopts.Logger.V(logger.DebugLevel) {
+	s.kopts.Logger.Debugf(ctx, "[kgo] revoked %#+v", revoked)
-		s.kopts.Logger.Debug(ctx, fmt.Sprintf("[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.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{}),
+				quit:    make(chan struct{}),
-				done:      make(chan struct{}),
+				done:    make(chan struct{}),
-				recs:      make(chan kgo.FetchTopicPartition, 100),
+				recs:    make(chan kgo.FetchTopicPartition, 100),
-				handler:   s.handler,
+				handler: s.handler,
-				kopts:     s.kopts,
+				kopts:   s.kopts,
-				opts:      s.opts,
+				opts:    s.opts,
 			}
-			s.Lock()
 			s.consumers[tp{topic, partition}] = pc
-			s.Unlock()
 			go pc.consume()
 		}
 	}
@@ -210,10 +155,8 @@ func (s *Subscriber) assigned(_ context.Context, c *kgo.Client, assigned map[str
 
 func (pc *consumer) consume() {
 	defer close(pc.done)
-	if pc.kopts.Logger.V(logger.DebugLevel) {
+	pc.kopts.Logger.Debugf(pc.kopts.Context, "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.Debugf(pc.kopts.Context, "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 {
@@ -226,9 +169,8 @@ func (pc *consumer) consume() {
 			return
 		case p := <-pc.recs:
 			for _, record := range p.Records {
-				ctx, sp := pc.htracer.WithProcessSpan(record)
+				// ts := time.Now()
-				ts := time.Now()
+				//	pc.kopts.Meter.Counter(broker.SubscribeMessageInflight, "endpoint", record.Topic).Inc()
-				pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Inc()
 				p := eventPool.Get().(*event)
 				p.msg.Header = nil
 				p.msg.Body = nil
@@ -236,7 +178,6 @@ func (pc *consumer) consume() {
 				p.err = nil
 				p.ack = false
 				p.msg.Header = metadata.New(len(record.Headers))
-				p.ctx = ctx
 				for _, hdr := range record.Headers {
 					p.msg.Header.Set(hdr.Key, string(hdr.Value))
 				}
@@ -245,80 +186,69 @@ func (pc *consumer) consume() {
 				} else if pc.opts.BodyOnly {
 					p.msg.Body = record.Value
 				} else {
-					sp.AddEvent("codec unmarshal start")
+					if err := pc.kopts.Codec.Unmarshal(record.Value, p.msg); err != nil {
-					err := pc.kopts.Codec.Unmarshal(record.Value, p.msg)
+						//	pc.kopts.Meter.Counter(broker.SubscribeMessageTotal, "endpoint", record.Topic, "status", "failure").Inc()
-					sp.AddEvent("codec unmarshal stop")
-					if err != nil {
-						sp.SetStatus(tracer.SpanStatusError, err.Error())
-						pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "failure").Inc()
 						p.err = err
 						p.msg.Body = record.Value
 						if eh != nil {
 							_ = eh(p)
-							pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
+							//	pc.kopts.Meter.Counter(broker.SubscribeMessageInflight, "endpoint", record.Topic).Dec()
 							if p.ack {
 								pc.c.MarkCommitRecords(record)
 							} else {
 								eventPool.Put(p)
-								pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
+								pc.kopts.Logger.Fatalf(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
 								return
 							}
 							eventPool.Put(p)
-							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(broker.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic).Update(te.Seconds())
-							pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
+							//	pc.kopts.Meter.Histogram(broker.SubscribeMessageDurationSeconds, "endpoint", record.Topic).Update(te.Seconds())
 							continue
 						} else {
-							pc.kopts.Logger.Error(pc.kopts.Context, "[kgo]: unmarshal error", err)
+							if pc.kopts.Logger.V(logger.ErrorLevel) {
+								pc.kopts.Logger.Errorf(pc.kopts.Context, "[kgo]: failed to unmarshal: %v", err)
+							}
 						}
-						te := time.Since(ts)
+						//		te := time.Since(ts)
-						pc.kopts.Meter.Counter(semconv.SubscribeMessageInflight, "endpoint", record.Topic, "topic", record.Topic).Dec()
+						//		pc.kopts.Meter.Counter(broker.SubscribeMessageInflight, "endpoint", record.Topic).Dec()
-						pc.kopts.Meter.Summary(semconv.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
+						//		pc.kopts.Meter.Summary(broker.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic).Update(te.Seconds())
-						pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", record.Topic).Update(te.Seconds())
+						//			pc.kopts.Meter.Histogram(broker.SubscribeMessageDurationSeconds, "endpoint", record.Topic).Update(te.Seconds())
 						eventPool.Put(p)
-						pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] Unmarshal err not handled wtf?")
+						pc.kopts.Logger.Fatalf(pc.kopts.Context, "[kgo] Unmarshal err not handled wtf?")
-						sp.Finish()
 						return
 					}
 				}
-				sp.AddEvent("handler start")
 				err := pc.handler(p)
-				sp.AddEvent("handler stop")
 				if err == nil {
-					pc.kopts.Meter.Counter(semconv.SubscribeMessageTotal, "endpoint", record.Topic, "topic", record.Topic, "status", "success").Inc()
+					//	pc.kopts.Meter.Counter(broker.SubscribeMessageTotal, "endpoint", record.Topic, "status", "success").Inc()
 				} else {
-					sp.SetStatus(tracer.SpanStatusError, err.Error())
+					//	pc.kopts.Meter.Counter(broker.SubscribeMessageTotal, "endpoint", record.Topic, "status", "failure").Inc()
-					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()
+				// 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 {
-						sp.AddEvent("error handler start")
 						_ = eh(p)
-						sp.AddEvent("error handler stop")
 					} else {
 						if pc.kopts.Logger.V(logger.ErrorLevel) {
-							pc.kopts.Logger.Error(pc.kopts.Context, "[kgo]: subscriber error", err)
+							pc.kopts.Logger.Errorf(pc.kopts.Context, "[kgo]: subscriber error: %v", 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(broker.SubscribeMessageLatencyMicroseconds, "endpoint", record.Topic).Update(te.Seconds())
-				pc.kopts.Meter.Histogram(semconv.SubscribeMessageDurationSeconds, "endpoint", record.Topic, "topic", 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 {
 					eventPool.Put(p)
-					pc.kopts.Logger.Fatal(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
+					pc.kopts.Logger.Fatalf(pc.kopts.Context, "[kgo] ErrLostMessage wtf?")
-					sp.SetStatus(tracer.SpanStatusError, "ErrLostMessage")
-					sp.Finish()
 					return
 				}
-				sp.Finish()
 			}
 		}
 	}

tracer.go

@@ -2,11 +2,12 @@ package kgo
 
 import (
 	"context"
+	"net"
+	"time"
 	"unicode/utf8"
 
 	"github.com/twmb/franz-go/pkg/kgo"
 	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
-	"go.unistack.org/micro/v3/metadata"
 	"go.unistack.org/micro/v3/tracer"
 )
 
@@ -16,15 +17,41 @@ type hookTracer struct {
 	tracer   tracer.Tracer
 }
 
-var messagingSystem = semconv.MessagingSystemKey.String("kafka")
-
 var (
-	_ kgo.HookProduceRecordBuffered   = (*hookTracer)(nil)
+	_ kgo.HookBrokerConnect       = &hookTracer{}
-	_ kgo.HookProduceRecordUnbuffered = (*hookTracer)(nil)
+	_ kgo.HookBrokerDisconnect    = &hookTracer{}
-	_ kgo.HookFetchRecordBuffered     = (*hookTracer)(nil)
+	_ kgo.HookBrokerRead          = &hookTracer{}
-	_ kgo.HookFetchRecordUnbuffered   = (*hookTracer)(nil)
+	_ kgo.HookBrokerThrottle      = &hookTracer{}
+	_ kgo.HookBrokerWrite         = &hookTracer{}
+	_ kgo.HookFetchBatchRead      = &hookTracer{}
+	_ kgo.HookProduceBatchWritten = &hookTracer{}
+	_ kgo.HookGroupManageError    = &hookTracer{}
 )
 
+func (m *hookTracer) OnGroupManageError(err error) {
+}
+
+func (m *hookTracer) OnBrokerConnect(meta kgo.BrokerMetadata, _ time.Duration, _ net.Conn, err error) {
+}
+
+func (m *hookTracer) OnBrokerDisconnect(meta kgo.BrokerMetadata, _ net.Conn) {
+}
+
+func (m *hookTracer) OnBrokerWrite(meta kgo.BrokerMetadata, _ int16, bytesWritten int, writeWait, timeToWrite time.Duration, err error) {
+}
+
+func (m *hookTracer) OnBrokerRead(meta kgo.BrokerMetadata, _ int16, bytesRead int, readWait, timeToRead time.Duration, err error) {
+}
+
+func (m *hookTracer) OnBrokerThrottle(meta kgo.BrokerMetadata, throttleInterval time.Duration, _ bool) {
+}
+
+func (m *hookTracer) OnProduceBatchWritten(meta kgo.BrokerMetadata, topic string, _ int32, kmetrics kgo.ProduceBatchMetrics) {
+}
+
+func (m *hookTracer) OnFetchBatchRead(meta kgo.BrokerMetadata, topic string, _ int32, kmetrics kgo.FetchBatchMetrics) {
+}
+
 // OnProduceRecordBuffered starts a new span for the "publish" operation on a
 // buffered record.
 //
@@ -34,7 +61,7 @@ var (
 func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
 	// Set up span options.
 	attrs := []interface{}{
-		messagingSystem,
+		semconv.MessagingSystemKey.String("kafka"),
 		semconv.MessagingDestinationKindTopic,
 		semconv.MessagingDestinationName(r.Topic),
 		semconv.MessagingOperationPublish,
@@ -47,28 +74,12 @@ func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
 		tracer.WithSpanLabels(attrs...),
 		tracer.WithSpanKind(tracer.SpanKindProducer),
 	}
-
+	// Start the "publish" span.
-	if r.Context == nil {
+	ctx, _ := m.tracer.Start(r.Context, r.Topic+" publish", opts...)
-		r.Context = context.Background()
+	// Inject the span context into the record.
-	}
+	// t.propagators.Inject(ctx, NewRecordCarrier(r))
-
+	// Update the record context.
-	omd, ok := metadata.FromOutgoingContext(r.Context)
+	r.Context = ctx
-	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)
 }
 
 // OnProduceRecordUnbuffered continues and ends the "publish" span for an
@@ -77,14 +88,16 @@ func (m *hookTracer) OnProduceRecordBuffered(r *kgo.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, ok := tracer.SpanFromContext(r.Context)
-		span.AddLabels(
+	if !ok {
-			semconv.MessagingKafkaDestinationPartition(int(r.Partition)),
+		return
-		)
+	}
-		if err != nil {
+	defer span.Finish()
-			span.SetStatus(tracer.SpanStatusError, err.Error())
+	span.AddLabels(
-		}
+		semconv.MessagingKafkaDestinationPartition(int(r.Partition)),
-		span.Finish()
+	)
+	if err != nil {
+		span.SetStatus(tracer.SpanStatusError, err.Error())
 	}
 }
 
@@ -98,7 +111,7 @@ func (m *hookTracer) OnProduceRecordUnbuffered(r *kgo.Record, err error) {
 func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
 	// Set up the span options.
 	attrs := []interface{}{
-		messagingSystem,
+		semconv.MessagingSystemKey.String("kafka"),
 		semconv.MessagingSourceKindTopic,
 		semconv.MessagingSourceName(r.Topic),
 		semconv.MessagingOperationReceive,
@@ -119,30 +132,20 @@ func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
 	if r.Context == nil {
 		r.Context = context.Background()
 	}
-	omd, ok := metadata.FromIncomingContext(r.Context)
+	// Extract the span context from the record.
-	if !ok {
+	// ctx := t.propagators.Extract(r.Context, NewRecordCarrier(r))
-		omd = metadata.New(len(r.Headers))
+	// Start the "receive" span.
-	}
+	newCtx, _ := m.tracer.Start(r.Context, r.Topic+" receive", opts...)
-
+	// Update the record context.
-	md := metadata.Copy(omd)
+	r.Context = newCtx
-	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)
 }
 
 // OnFetchRecordUnbuffered continues and ends the "receive" span for an
 // unbuffered record.
 func (m *hookTracer) OnFetchRecordUnbuffered(r *kgo.Record, _ bool) {
-	span, _ := tracer.SpanFromContext(r.Context)
+	if span, ok := tracer.SpanFromContext(r.Context); ok {
-	span.Finish()
+		defer span.Finish()
+	}
 }
 
 // WithProcessSpan starts a new span for the "process" operation on a consumer
@@ -157,7 +160,7 @@ func (m *hookTracer) OnFetchRecordUnbuffered(r *kgo.Record, _ bool) {
 func (m *hookTracer) WithProcessSpan(r *kgo.Record) (context.Context, tracer.Span) {
 	// Set up the span options.
 	attrs := []interface{}{
-		messagingSystem,
+		semconv.MessagingSystemKey.String("kafka"),
 		semconv.MessagingSourceKindTopic,
 		semconv.MessagingSourceName(r.Topic),
 		semconv.MessagingOperationProcess,
@@ -179,16 +182,8 @@ func (m *hookTracer) WithProcessSpan(r *kgo.Record) (context.Context, tracer.Spa
 	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...)
+	return m.tracer.Start(r.Context, r.Topic+" process", opts...)
 }
 
 func maybeKeyAttr(attrs []interface{}, r *kgo.Record) []interface{} {