Merge pull request 'move to micro v4' (#40) from v4 into master

Reviewed-on: #40

go.mod

@@ -1,10 +1,14 @@
-module go.unistack.org/micro-tracer-opentracing/v3
+module go.unistack.org/micro-tracer-opentracing/v4
 
 go 1.20
 
 require (
 	github.com/opentracing/opentracing-go v1.2.0
-	go.unistack.org/micro/v3 v3.10.27
+	go.unistack.org/micro/v4 v4.0.1
 )
 
-require github.com/stretchr/testify v1.8.1 // indirect
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/stretchr/testify v1.5.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)

go.sum

@@ -6,16 +6,12 @@ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYr
 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/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
-go.unistack.org/micro/v3 v3.10.27 h1:jluDdhkG9P/nchaNlhLkBmGxUASkV/L+/fuWG5RX1tY=
-go.unistack.org/micro/v3 v3.10.27/go.mod h1:ALkeXpqChYDjx8KPi7tz9mmIyOnob6nlNswsg8BnZjQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

opentracing.go

@@ -3,36 +3,31 @@ package opentracing
 import (
 	"context"
 	"errors"
-	"fmt"
 
-	ot "github.com/opentracing/opentracing-go"
+	"github.com/opentracing/opentracing-go"
-	otlog "github.com/opentracing/opentracing-go/log"
+	"github.com/opentracing/opentracing-go/log"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 var _ tracer.Tracer = &otTracer{}
 
 type otTracer struct {
 	opts   tracer.Options
-	tracer ot.Tracer
+	tracer opentracing.Tracer
 }
 
-func (t *otTracer) Name() string {
+func (ot *otTracer) Name() string {
-	return t.opts.Name
+	return ot.opts.Name
 }
 
-func (t *otTracer) Flush(ctx context.Context) error {
+func (ot *otTracer) Init(opts ...tracer.Option) error {
-	return nil
-}
-
-func (t *otTracer) Init(opts ...tracer.Option) error {
 	for _, o := range opts {
-		o(&t.opts)
+		o(&ot.opts)
 	}
 
-	if tr, ok := t.opts.Context.Value(tracerKey{}).(ot.Tracer); ok {
+	if tr, ok := ot.opts.Context.Value(tracerKey{}).(opentracing.Tracer); ok {
-		t.tracer = tr
+		ot.tracer = tr
 	} else {
 		return errors.New("Tracer option missing")
 	}
@@ -40,31 +35,32 @@ func (t *otTracer) Init(opts ...tracer.Option) error {
 	return nil
 }
 
-func (t *otTracer) Start(ctx context.Context, name string, opts ...tracer.SpanOption) (context.Context, tracer.Span) {
+func (ot *otTracer) Start(ctx context.Context, name string, opts ...tracer.SpanOption) (context.Context, tracer.Span) {
 	options := tracer.NewSpanOptions(opts...)
-	var span ot.Span
+	var span opentracing.Span
 	switch options.Kind {
-	case tracer.SpanKindUnspecified:
+	case tracer.SpanKindInternal, tracer.SpanKindUnspecified:
-		ctx, span = t.startSpanFromAny(ctx, name)
+		ctx, span = ot.startSpanFromContext(ctx, name)
-	case tracer.SpanKindInternal:
-		ctx, span = t.startSpanFromContext(ctx, name)
 	case tracer.SpanKindClient, tracer.SpanKindProducer:
-		ctx, span = t.startSpanFromOutgoingContext(ctx, name)
+		ctx, span = ot.startSpanFromOutgoingContext(ctx, name)
 	case tracer.SpanKindServer, tracer.SpanKindConsumer:
-		ctx, span = t.startSpanFromIncomingContext(ctx, name)
+		ctx, span = ot.startSpanFromIncomingContext(ctx, ot.tracer, name)
 	}
-	sp := &otSpan{span: span, opts: options}
+	return ctx, &otSpan{span: span, opts: options}
-	return tracer.NewSpanContext(ctx, sp), sp
 }
 
 type otSpan struct {
-	span      ot.Span
+	span      opentracing.Span
 	opts      tracer.SpanOptions
 	status    tracer.SpanStatus
 	statusMsg string
 }
 
 func (os *otSpan) SetStatus(st tracer.SpanStatus, msg string) {
+	switch st {
+	case tracer.SpanStatusError:
+		os.span.SetTag("error", true)
+	}
 	os.status = st
 	os.statusMsg = msg
 }
@@ -78,41 +74,18 @@ func (os *otSpan) Tracer() tracer.Tracer {
 }
 
 func (os *otSpan) Finish(opts ...tracer.SpanOption) {
-	if len(os.opts.Labels)%2 != 0 {
+	if len(os.opts.Labels) > 0 {
-		os.opts.Labels = os.opts.Labels[:len(os.opts.Labels)-1]
+		os.span.LogKV(os.opts.Labels...)
 	}
-	os.opts.Labels = tracer.UniqLabels(os.opts.Labels)
-	for idx := 0; idx < len(os.opts.Labels); idx += 2 {
-		switch os.opts.Labels[idx] {
-		case "err":
-			os.status = tracer.SpanStatusError
-			os.statusMsg = fmt.Sprintf("%v", os.opts.Labels[idx+1])
-		case "error":
-			continue
-		case "X-Request-Id", "x-request-id":
-			os.span.SetTag("x-request-id", os.opts.Labels[idx+1])
-		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":
-			os.span.SetTag(fmt.Sprintf("%v", os.opts.Labels[idx]), os.opts.Labels[idx+1])
-		default:
-			os.span.LogKV(os.opts.Labels[idx], os.opts.Labels[idx+1])
-		}
-	}
-	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 ...tracer.EventOption) {
-	os.span.LogFields(otlog.Event(name))
+	os.span.LogFields(log.Event(name))
 }
 
 func (os *otSpan) Context() context.Context {
-	return ot.ContextWithSpan(context.Background(), os.span)
+	return opentracing.ContextWithSpan(context.Background(), os.span)
 }
 
 func (os *otSpan) SetName(name string) {
@@ -136,141 +109,75 @@ func NewTracer(opts ...tracer.Option) *otTracer {
 	return &otTracer{opts: options}
 }
 
-func spanFromContext(ctx context.Context) ot.Span {
+func spanFromContext(ctx context.Context) opentracing.Span {
-	return ot.SpanFromContext(ctx)
+	return opentracing.SpanFromContext(ctx)
 }
 
-func (t *otTracer) startSpanFromAny(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
+func (ot *otTracer) startSpanFromContext(ctx context.Context, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span) {
-	if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil {
+	if parentSpan := opentracing.SpanFromContext(ctx); parentSpan != nil {
-		return t.startSpanFromContext(ctx, name, opts...)
+		opts = append(opts, opentracing.ChildOf(parentSpan.Context()))
-	}
-
-	if otSpan := ot.SpanFromContext(ctx); otSpan != nil {
-		return t.startSpanFromContext(ctx, name, opts...)
-	}
-
-	if md, ok := metadata.FromIncomingContext(ctx); ok && md != nil {
-		return t.startSpanFromIncomingContext(ctx, name, opts...)
-	}
-
-	if md, ok := metadata.FromOutgoingContext(ctx); ok && md != nil {
-		return t.startSpanFromOutgoingContext(ctx, name, opts...)
-	}
-
-	return t.startSpanFromContext(ctx, name, opts...)
-}
-
-func (t *otTracer) startSpanFromContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
-	var parentSpan ot.Span
-	if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil {
-		if sp, ok := tracerSpan.(*otSpan); ok {
-			parentSpan = sp.span
-		}
-	}
-	if parentSpan == nil {
-		if otSpan := ot.SpanFromContext(ctx); otSpan != nil {
-			parentSpan = otSpan
-		}
-	}
-
-	if parentSpan != nil {
-		opts = append(opts, ot.ChildOf(parentSpan.Context()))
 	}
 
 	md := metadata.New(1)
 
-	sp := t.tracer.StartSpan(name, opts...)
+	sp := ot.tracer.StartSpan(name, opts...)
-	if err := sp.Tracer().Inject(sp.Context(), ot.TextMap, ot.TextMapCarrier(md)); err != nil {
+	if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(md)); err != nil {
 		return nil, nil
 	}
 
-	ctx = ot.ContextWithSpan(ctx, sp)
+	ctx = opentracing.ContextWithSpan(ctx, sp)
 
 	return ctx, sp
 }
 
-func (t *otTracer) startSpanFromOutgoingContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
+func (ot *otTracer) startSpanFromOutgoingContext(ctx context.Context, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span) {
-	var parentSpan ot.Span
+	var parentCtx opentracing.SpanContext
-	if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil {
-		if sp, ok := tracerSpan.(*otSpan); ok {
-			parentSpan = sp.span
-		}
-	}
-	if parentSpan == nil {
-		if otSpan := ot.SpanFromContext(ctx); otSpan != nil {
-			parentSpan = otSpan
-		}
-	}
 
 	md, ok := metadata.FromOutgoingContext(ctx)
-
+	if ok && md != nil {
-	if parentSpan != nil {
+		if spanCtx, err := ot.tracer.Extract(opentracing.TextMap, opentracing.TextMapCarrier(md)); err == nil && ok {
-		opts = append(opts, ot.ChildOf(parentSpan.Context()))
+			parentCtx = spanCtx
-	} else {
-		var parentCtx ot.SpanContext
-
-		if ok && md != nil {
-			if spanCtx, err := t.tracer.Extract(ot.TextMap, ot.TextMapCarrier(md)); err == nil && ok {
-				parentCtx = spanCtx
-			}
 		}
+	}
 
-		if parentCtx != nil {
+	if parentCtx != nil {
-			opts = append(opts, ot.ChildOf(parentCtx))
+		opts = append(opts, opentracing.ChildOf(parentCtx))
-		}
 	}
 
 	nmd := metadata.Copy(md)
 
-	sp := t.tracer.StartSpan(name, opts...)
+	sp := ot.tracer.StartSpan(name, opts...)
-	if err := sp.Tracer().Inject(sp.Context(), ot.TextMap, ot.TextMapCarrier(nmd)); err != nil {
+	if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(nmd)); err != nil {
 		return nil, nil
 	}
 
-	ctx = metadata.NewOutgoingContext(ot.ContextWithSpan(ctx, sp), nmd)
+	ctx = metadata.NewOutgoingContext(opentracing.ContextWithSpan(ctx, sp), nmd)
 
 	return ctx, sp
 }
 
-func (t *otTracer) startSpanFromIncomingContext(ctx context.Context, name string, opts ...ot.StartSpanOption) (context.Context, ot.Span) {
+func (ot *otTracer) startSpanFromIncomingContext(ctx context.Context, tracer opentracing.Tracer, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span) {
-	var parentSpan ot.Span
+	var parentCtx opentracing.SpanContext
-	if tracerSpan, ok := tracer.SpanFromContext(ctx); ok && tracerSpan != nil {
-		if sp, ok := tracerSpan.(*otSpan); ok {
-			parentSpan = sp.span
-		}
-	}
-	if parentSpan == nil {
-		if otSpan := ot.SpanFromContext(ctx); otSpan != nil {
-			parentSpan = otSpan
-		}
-	}
 
 	md, ok := metadata.FromIncomingContext(ctx)
-
+	if ok && md != nil {
-	if parentSpan != nil {
+		if spanCtx, err := tracer.Extract(opentracing.TextMap, opentracing.TextMapCarrier(md)); err == nil {
-		opts = append(opts, ot.ChildOf(parentSpan.Context()))
+			parentCtx = spanCtx
-	} else {
-		var parentCtx ot.SpanContext
-
-		if ok && md != nil {
-			if spanCtx, err := t.tracer.Extract(ot.TextMap, ot.TextMapCarrier(md)); err == nil {
-				parentCtx = spanCtx
-			}
 		}
+	}
 
-		if parentCtx != nil {
+	if parentCtx != nil {
-			opts = append(opts, ot.ChildOf(parentCtx))
+		opts = append(opts, opentracing.ChildOf(parentCtx))
-		}
 	}
 
 	nmd := metadata.Copy(md)
 
-	sp := t.tracer.StartSpan(name, opts...)
+	sp := tracer.StartSpan(name, opts...)
-	if err := sp.Tracer().Inject(sp.Context(), ot.TextMap, ot.TextMapCarrier(nmd)); err != nil {
+	if err := sp.Tracer().Inject(sp.Context(), opentracing.TextMap, opentracing.TextMapCarrier(nmd)); err != nil {
 		return nil, nil
 	}
 
-	ctx = metadata.NewIncomingContext(ot.ContextWithSpan(ctx, sp), nmd)
+	ctx = metadata.NewIncomingContext(opentracing.ContextWithSpan(ctx, sp), nmd)
 
 	return ctx, sp
 }

opentracing_test.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/opentracing/opentracing-go"
+	opentracing "github.com/opentracing/opentracing-go"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/metadata"
 )
 
 func TestStartSpanFromIncomingContext(t *testing.T) {
@@ -20,16 +20,14 @@ func TestStartSpanFromIncomingContext(t *testing.T) {
 	ctx = metadata.NewIncomingContext(ctx, md)
 
 	tracer := opentracing.GlobalTracer()
+	ot := &otTracer{tracer: tracer}
 
 	g.Add(8000)
 	cherr := make(chan error)
 	for i := 0; i < 8000; i++ {
 		go func() {
 			defer g.Done()
-			_, sp, err := startSpanFromIncomingContext(ctx, tracer, "test")
+			_, sp := ot.startSpanFromIncomingContext(ctx, tracer, "test")
-			if err != nil {
-				cherr <- err
-			}
 			sp.Finish()
 		}()
 	}

options.go

@@ -2,7 +2,7 @@ package opentracing
 
 import (
 	"github.com/opentracing/opentracing-go"
-	"go.unistack.org/micro/v3/tracer"
+	"go.unistack.org/micro/v4/tracer"
 )
 
 type tracerKey struct{}