fixup span tags and logs

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

go.mod

@@ -1,11 +1,10 @@
-module go.unistack.org/micro-tracer-opentracing/v3
+module go.unistack.org/micro-tracer-opentracing/v4
 
-go 1.21
-
-toolchain go1.22.2
+go 1.20
 
 require (
 	github.com/opentracing/opentracing-go v1.2.0
-	go.opentelemetry.io/otel v1.28.0
-	go.unistack.org/micro/v3 v3.10.81
+	go.unistack.org/micro/v4 v4.0.13
 )
+
+require github.com/stretchr/testify v1.8.3 // indirect

go.sum

@@ -1,23 +1,13 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 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/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs=
-go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
-go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
-go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
-go.unistack.org/micro/v3 v3.10.77 h1:nn731y84q3S8a4UgpVdC/wN9cs30ruZeH81rKw6XcUc=
-go.unistack.org/micro/v3 v3.10.77/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-go.unistack.org/micro/v3 v3.10.81 h1:zHttMUEwL/f9GtrNAQOk8bK0NrEwAuKeUW8DEoywgJI=
-go.unistack.org/micro/v3 v3.10.81/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+go.unistack.org/micro/v4 v4.0.13 h1:wyprk+KNAv/zR6bri6p6ucmXcJ9WyZ/vzru4zjPd8dA=
+go.unistack.org/micro/v4 v4.0.13/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

opentracing.go

@@ -7,10 +7,10 @@ import (
 
 	ot "github.com/opentracing/opentracing-go"
 	otlog "github.com/opentracing/opentracing-go/log"
-	"go.opentelemetry.io/otel/attribute"
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/tracer"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v4/tracer"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var _ tracer.Tracer = &otTracer{}
@@ -28,9 +28,11 @@ func (t *otTracer) Flush(ctx context.Context) error {
 	return nil
 }
 
-func (t *otTracer) Init(opts ...tracer.Option) error {
+func (t *otTracer) Init(opts ...options.Option) error {
 	for _, o := range opts {
-		o(&t.opts)
+		if err := o(&t.opts); err != nil {
+			return err
+		}
 	}
 
 	if tr, ok := t.opts.Context.Value(tracerKey{}).(ot.Tracer); ok {
@@ -47,17 +49,8 @@ type spanContext interface {
 	SpanID() idStringer
 }
 
-func (t *otTracer) Start(ctx context.Context, name string, opts ...tracer.SpanOption) (context.Context, tracer.Span) {
+func (t *otTracer) Start(ctx context.Context, name string, opts ...options.Option) (context.Context, tracer.Span) {
 	options := tracer.NewSpanOptions(opts...)
-
-	if len(options.Labels)%2 != 0 {
-		options.Labels = options.Labels[:len(options.Labels)-1]
-	}
-
-	for _, fn := range t.opts.ContextAttrFuncs {
-		options.Labels = append(options.Labels, fn(ctx)...)
-	}
-
 	var span ot.Span
 	switch options.Kind {
 	case tracer.SpanKindUnspecified:
@@ -103,8 +96,6 @@ type otSpan struct {
 	opts      tracer.SpanOptions
 	status    tracer.SpanStatus
 	statusMsg string
-	labels    []interface{}
-	finished  bool
 }
 
 func (os *otSpan) TraceID() string {
@@ -128,61 +119,52 @@ func (os *otSpan) Tracer() tracer.Tracer {
 	return &otTracer{tracer: os.span.Tracer()}
 }
 
-func (os *otSpan) Finish(opts ...tracer.SpanOption) {
-	if os.finished {
-		return
-	}
-
-	options := os.opts
-
-	options.Status = os.status
-	options.StatusMsg = os.statusMsg
-	options.Labels = append(options.Labels, os.labels...)
-
-	for _, o := range opts {
-		o(&options)
-	}
-
-	if !options.Record {
-		return
-	}
-
-	if len(options.Labels)%2 != 0 {
-		options.Labels = options.Labels[:len(options.Labels)-1]
-	}
-
-	l := len(options.Labels)
-	for idx := 0; idx < l; idx++ {
-		switch lt := options.Labels[idx].(type) {
-		case attribute.KeyValue:
-			os.span.SetTag(string(lt.Key), lt.Value.AsInterface())
-		case string:
-			if l > idx+1 {
-				os.span.SetTag(lt, options.Labels[idx+1])
-				idx++
-			}
-		}
-	}
-
-	if options.Status == tracer.SpanStatusError {
-		os.span.SetTag("error", true)
-		os.span.LogKV("error", options.StatusMsg)
-	}
-
-	os.span.SetTag("span.kind", options.Kind)
-	os.span.Finish()
-
-	os.finished = true
-}
-
-func (os *otSpan) AddEvent(name string, opts ...tracer.EventOption) {
-	os.span.LogFields(otlog.Event(name))
-}
-
 func (os *otSpan) AddLogs(kv ...interface{}) {
 	os.span.LogKV(kv...)
 }
 
+func (os *otSpan) Finish(opts ...options.Option) {
+	if len(os.opts.Labels)%2 != 0 {
+		os.opts.Labels = os.opts.Labels[:len(os.opts.Labels)-1]
+	}
+	os.opts.Labels = tracer.UniqLabels(os.opts.Labels)
+	for idx := 0; idx < len(os.opts.Labels); idx += 2 {
+		k, ok := os.opts.Labels[idx].(string)
+		if !ok {
+			continue
+		}
+		v, ok := os.opts.Labels[idx+1].(string)
+		if !ok {
+			v = fmt.Sprintf("%v", os.opts.Labels[idx+1])
+		}
+		switch k {
+		case "err":
+			os.status = tracer.SpanStatusError
+			os.statusMsg = v
+		case "error":
+			continue
+		case "X-Request-Id", "x-request-id":
+			os.span.SetTag("x-request-id", v)
+		case "rpc.call", "rpc.call_type", "rpc.flavor", "rpc.service", "rpc.method",
+			"sdk.database", "db.statement", "db.args", "db.query", "db.method",
+			"messaging.destination.name", "messaging.source.name", "messaging.operation":
+			os.span.SetTag(k, v)
+		default:
+			os.span.LogKV(k, v)
+		}
+	}
+	if os.status == tracer.SpanStatusError {
+		os.span.SetTag("error", true)
+		os.span.LogKV("error", os.statusMsg)
+	}
+	os.span.SetTag("span.kind", os.opts.Kind)
+	os.span.Finish()
+}
+
+func (os *otSpan) AddEvent(name string, opts ...options.Option) {
+	os.span.LogFields(otlog.Event(name))
+}
+
 func (os *otSpan) Context() context.Context {
 	return ot.ContextWithSpan(context.Background(), os.span)
 }
@@ -200,10 +182,10 @@ func (os *otSpan) Kind() tracer.SpanKind {
 }
 
 func (os *otSpan) AddLabels(labels ...interface{}) {
-	os.labels = append(os.labels, labels...)
+	os.opts.Labels = append(os.opts.Labels, labels...)
 }
 
-func NewTracer(opts ...tracer.Option) *otTracer {
+func NewTracer(opts ...options.Option) *otTracer {
 	options := tracer.NewOptions(opts...)
 	return &otTracer{opts: options}
 }

opentracing_test.go

@@ -2,12 +2,11 @@ package opentracing
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	"github.com/opentracing/opentracing-go/mocktracer"
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 func TestTraceID(t *testing.T) {
@@ -31,31 +30,3 @@ func TestTraceID(t *testing.T) {
 		t.Fatalf("invalid span span id %#+v", v)
 	}
 }
-
-func TestTraceTags(t *testing.T) {
-	md := metadata.New(1)
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	ctx = metadata.NewIncomingContext(ctx, md)
-
-	mtr := mocktracer.New()
-	tr := NewTracer(Tracer(mtr))
-	if err := tr.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	var sp tracer.Span
-
-	ctx, sp = tr.Start(ctx, "test", tracer.WithSpanLabels("key", "val", "odd"))
-	sp.Finish(tracer.WithSpanLabels("xkey", "xval"))
-	_ = ctx
-	msp := mtr.FinishedSpans()[0]
-
-	if "val" != fmt.Sprintf("%v", msp.Tags()["key"]) {
-		t.Fatal("mock span invalid")
-	}
-
-	if "xval" != fmt.Sprintf("%v", msp.Tags()["xkey"]) {
-		t.Fatalf("mock span invalid %#+v", msp)
-	}
-}

options.go

@@ -2,11 +2,11 @@ package opentracing
 
 import (
 	"github.com/opentracing/opentracing-go"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/options"
 )
 
 type tracerKey struct{}
 
-func Tracer(ot opentracing.Tracer) tracer.Option {
-	return tracer.SetOption(tracerKey{}, ot)
+func Tracer(ot opentracing.Tracer) options.Option {
+	return options.ContextOption(tracerKey{}, ot)
 }