fixup logger caller skip count

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

kgo.go

@@ -14,6 +14,7 @@ import (
 	"github.com/twmb/franz-go/pkg/kgo"
 	"github.com/twmb/franz-go/pkg/kmsg"
 	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
 	"go.unistack.org/micro/v3/tracer"
 	mrand "go.unistack.org/micro/v3/util/rand"
@@ -54,6 +55,7 @@ var DefaultRetryBackoffFn = func() func(int) time.Duration {
 }()
 
 type Broker struct {
+	init      bool
 	c         *kgo.Client
 	kopts     []kgo.Opt
 	connected bool
@@ -182,6 +184,10 @@ func (k *Broker) Init(opts ...broker.Option) error {
 	k.Lock()
 	defer k.Unlock()
 
+	if len(opts) == 0 && k.init {
+		return nil
+	}
+
 	for _, o := range opts {
 		o(&k.opts)
 	}
@@ -205,6 +211,8 @@ func (k *Broker) Init(opts ...broker.Option) error {
 		}
 	}
 
+	k.init = true
+
 	return nil
 }
 
@@ -405,7 +413,7 @@ func NewBroker(opts ...broker.Option) *Broker {
 		kgo.DialTimeout(3 * time.Second),
 		kgo.DisableIdempotentWrite(),
 		kgo.ProducerBatchCompression(kgo.NoCompression()),
-		kgo.WithLogger(&mlogger{l: options.Logger, ctx: options.Context}),
+		kgo.WithLogger(&mlogger{l: options.Logger.Clone(logger.WithCallerSkipCount(options.Logger.Options().CallerSkipCount + 1)), ctx: options.Context}),
 		kgo.SeedBrokers(kaddrs...),
 		kgo.RetryBackoffFn(DefaultRetryBackoffFn),
 		kgo.BlockRebalanceOnPoll(),

tracer.go

@@ -7,9 +7,8 @@ import (
 	"unicode/utf8"
 
 	"github.com/twmb/franz-go/pkg/kgo"
-	"go.unistack.org/micro/v3/tracer"
-	"go.opentelemetry.io/otel/attribute"
 	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
+	"go.unistack.org/micro/v3/tracer"
 )
 
 type hookTracer struct {
@@ -61,7 +60,7 @@ func (m *hookTracer) OnFetchBatchRead(meta kgo.BrokerMetadata, topic string, _ i
 // hook.
 func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
 	// Set up span options.
-	attrs := []attribute.KeyValue{
+	attrs := []interface{}{
 		semconv.MessagingSystemKey.String("kafka"),
 		semconv.MessagingDestinationKindTopic,
 		semconv.MessagingDestinationName(r.Topic),
@@ -71,12 +70,8 @@ func (m *hookTracer) OnProduceRecordBuffered(r *kgo.Record) {
 	if m.clientID != "" {
 		attrs = append(attrs, semconv.MessagingKafkaClientIDKey.String(m.clientID))
 	}
-	ifattrs := make([]interface{}, 0, len(attrs))
-	for _, attr := range attrs {
-		ifattrs = append(ifattrs, attr)
-	}
 	opts := []tracer.SpanOption{
-		tracer.WithSpanLabels(ifattrs...),
+		tracer.WithSpanLabels(attrs...),
 		tracer.WithSpanKind(tracer.SpanKindProducer),
 	}
 	// Start the "publish" span.
@@ -115,7 +110,7 @@ func (m *hookTracer) OnProduceRecordUnbuffered(r *kgo.Record, err error) {
 // processing.
 func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
 	// Set up the span options.
-	attrs := []attribute.KeyValue{
+	attrs := []interface{}{
 		semconv.MessagingSystemKey.String("kafka"),
 		semconv.MessagingSourceKindTopic,
 		semconv.MessagingSourceName(r.Topic),
@@ -129,12 +124,8 @@ func (m *hookTracer) OnFetchRecordBuffered(r *kgo.Record) {
 	if m.group != "" {
 		attrs = append(attrs, semconv.MessagingKafkaConsumerGroupKey.String(m.group))
 	}
-	ifattrs := make([]interface{}, 0, len(attrs))
-	for _, attr := range attrs {
-		ifattrs = append(ifattrs, attr)
-	}
 	opts := []tracer.SpanOption{
-		tracer.WithSpanLabels(ifattrs...),
+		tracer.WithSpanLabels(attrs...),
 		tracer.WithSpanKind(tracer.SpanKindConsumer),
 	}
 
@@ -168,7 +159,7 @@ func (m *hookTracer) OnFetchRecordUnbuffered(r *kgo.Record, _ bool) {
 // iteration of your processing for the record.
 func (m *hookTracer) WithProcessSpan(r *kgo.Record) (context.Context, tracer.Span) {
 	// Set up the span options.
-	attrs := []attribute.KeyValue{
+	attrs := []interface{}{
 		semconv.MessagingSystemKey.String("kafka"),
 		semconv.MessagingSourceKindTopic,
 		semconv.MessagingSourceName(r.Topic),
@@ -177,10 +168,6 @@ func (m *hookTracer) WithProcessSpan(r *kgo.Record) (context.Context, tracer.Spa
 		semconv.MessagingKafkaMessageOffset(int(r.Offset)),
 	}
 	attrs = maybeKeyAttr(attrs, r)
-	ifattrs := make([]interface{}, 0, len(attrs))
-	for _, attr := range attrs {
-		ifattrs = append(ifattrs, attr)
-	}
 	if m.clientID != "" {
 		attrs = append(attrs, semconv.MessagingKafkaClientIDKey.String(m.clientID))
 	}
@@ -188,7 +175,7 @@ func (m *hookTracer) WithProcessSpan(r *kgo.Record) (context.Context, tracer.Spa
 		attrs = append(attrs, semconv.MessagingKafkaConsumerGroupKey.String(m.group))
 	}
 	opts := []tracer.SpanOption{
-		tracer.WithSpanLabels(ifattrs...),
+		tracer.WithSpanLabels(attrs...),
 		tracer.WithSpanKind(tracer.SpanKindConsumer),
 	}
 
@@ -199,7 +186,7 @@ func (m *hookTracer) WithProcessSpan(r *kgo.Record) (context.Context, tracer.Spa
 	return m.tracer.Start(r.Context, r.Topic+" process", opts...)
 }
 
-func maybeKeyAttr(attrs []attribute.KeyValue, r *kgo.Record) []attribute.KeyValue {
+func maybeKeyAttr(attrs []interface{}, r *kgo.Record) []interface{} {
 	if r.Key == nil {
 		return attrs
 	}