Merge pull request #28 from unistack-org/fixup

add ability to pass opentracing.Tracer

go.mod

@@ -4,6 +4,6 @@ go 1.16
 
 require (
 	github.com/opentracing/opentracing-go v1.2.0
-	go.unistack.org/micro/v3 v3.9.13
+	go.unistack.org/micro/v3 v3.10.1
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -73,8 +73,8 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.unistack.org/micro-proto/v3 v3.3.1/go.mod h1:cwRyv8uInM2I7EbU7O8Fx2Ls3N90Uw9UCCcq4olOdfE=
-go.unistack.org/micro/v3 v3.9.13 h1:x1/H4rDgvz2JWXx6UvFiWDyRLxg2Kpp6V1kjzpLlyvo=
+go.unistack.org/micro/v3 v3.10.1 h1:MbtPj7ueTw4x6lL2Ok2ez70ORyGXBWhxizO5fQsnAA4=
-go.unistack.org/micro/v3 v3.9.13/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI=
+go.unistack.org/micro/v3 v3.10.1/go.mod h1:gI4RkJKHLPW7KV6h4+ZBOZD997MRvFRXMPQIHpozikI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=

opentracing.go

@@ -1,10 +1,11 @@
-// Package opentracing provides wrappers for OpenTracing
 package opentracing
 
 import (
 	"context"
+	"errors"
 
-	opentracing "github.com/opentracing/opentracing-go"
+	"github.com/opentracing/opentracing-go"
+	"github.com/opentracing/opentracing-go/log"
 	"go.unistack.org/micro/v3/metadata"
 	"go.unistack.org/micro/v3/tracer"
 )
@@ -12,7 +13,8 @@ import (
 var _ tracer.Tracer = &opentracingTracer{}
 
 type opentracingTracer struct {
-	opts tracer.Options
+	opts   tracer.Options
+	tracer opentracing.Tracer
 }
 
 func (ot *opentracingTracer) Name() string {
@@ -20,11 +22,58 @@ func (ot *opentracingTracer) Name() string {
 }
 
 func (ot *opentracingTracer) Init(opts ...tracer.Option) error {
+	for _, o := range opts {
+		o(&ot.opts)
+	}
+
+	if tr, ok := ot.opts.Context.Value(tracerKey{}).(opentracing.Tracer); ok {
+		ot.tracer = tr
+	} else {
+		return errors.New("Tracer option missing")
+	}
+
 	return nil
 }
 
 func (ot *opentracingTracer) Start(ctx context.Context, name string, opts ...tracer.SpanOption) (context.Context, tracer.Span) {
-	return nil, nil
+	ctx, span, _ := startSpanFromIncomingContext(ctx, ot.tracer, name)
+	return ctx, &opentracingSpan{span: span}
+}
+
+type opentracingSpan struct {
+	span   opentracing.Span
+	labels []interface{}
+}
+
+func (os *opentracingSpan) Tracer() tracer.Tracer {
+	return &opentracingTracer{tracer: os.span.Tracer()}
+}
+
+func (os *opentracingSpan) Finish(opts ...tracer.SpanOption) {
+	if len(os.labels) > 0 {
+		os.span.LogKV(os.labels...)
+	}
+	os.span.Finish()
+}
+
+func (os *opentracingSpan) AddEvent(name string, opts ...tracer.EventOption) {
+	os.span.LogFields(log.Event(name))
+}
+
+func (os *opentracingSpan) Context() context.Context {
+	return tracer.NewSpanContext(context.Background(), os)
+}
+
+func (os *opentracingSpan) SetName(name string) {
+	os.span = os.span.SetOperationName(name)
+}
+
+func (os *opentracingSpan) SetLabels(labels ...interface{}) {
+	os.labels = labels
+}
+
+func (os *opentracingSpan) AddLabels(labels ...interface{}) {
+	os.labels = append(os.labels, labels...)
 }
 
 func NewTracer(opts ...tracer.Option) *opentracingTracer {
@@ -36,9 +85,9 @@ func spanFromContext(ctx context.Context) opentracing.Span {
 	return opentracing.SpanFromContext(ctx)
 }
 
-// StartSpanFromOutgoingContext returns a new span with the given operation name and options. If a span
+// startSpanFromOutgoingContext returns a new span with the given operation name and options. If a span
 // is found in the context, it will be used as the parent of the resulting span.
-func StartSpanFromOutgoingContext(ctx context.Context, tracer opentracing.Tracer, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span, error) {
+func startSpanFromOutgoingContext(ctx context.Context, tracer opentracing.Tracer, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span, error) {
 	var parentCtx opentracing.SpanContext
 
 	md, ok := metadata.FromIncomingContext(ctx)
@@ -67,9 +116,9 @@ func StartSpanFromOutgoingContext(ctx context.Context, tracer opentracing.Tracer
 	return ctx, sp, nil
 }
 
-// StartSpanFromIncomingContext returns a new span with the given operation name and options. If a span
+// startSpanFromIncomingContext returns a new span with the given operation name and options. If a span
 // is found in the context, it will be used as the parent of the resulting span.
-func StartSpanFromIncomingContext(ctx context.Context, tracer opentracing.Tracer, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span, error) {
+func startSpanFromIncomingContext(ctx context.Context, tracer opentracing.Tracer, name string, opts ...opentracing.StartSpanOption) (context.Context, opentracing.Span, error) {
 	var parentCtx opentracing.SpanContext
 
 	// Find parent span.

opentracing_test.go

@@ -26,7 +26,7 @@ func TestStartSpanFromIncomingContext(t *testing.T) {
 	for i := 0; i < 8000; i++ {
 		go func() {
 			defer g.Done()
-			_, sp, err := StartSpanFromIncomingContext(ctx, tracer, "test")
+			_, sp, err := startSpanFromIncomingContext(ctx, tracer, "test")
 			if err != nil {
 				cherr <- err
 			}

options.go

@@ -0,0 +1,12 @@
+package opentracing
+
+import (
+	"github.com/opentracing/opentracing-go"
+	"go.unistack.org/micro/v3/tracer"
+)
+
+type tracerKey struct{}
+
+func Tracer(ot opentracing.Tracer) tracer.Option {
+	return tracer.SetOption(tracerKey{}, ot)
+}