register/memory.go

@@ -369,9 +369,9 @@ func (m *memory) ListServices(ctx context.Context, opts ...ListOption) ([]*Servi
 	// serialize the result, each version counts as an individual service
 	var result []*Service
 
-	for domain, service := range services {
+	for _, service := range services {
 		for _, version := range service {
-			result = append(result, recordToService(version, domain))
+			result = append(result, recordToService(version, options.Domain))
 		}
 	}
 

tracer/context.go

@@ -3,41 +3,46 @@ package tracer
 
 import (
 	"context"
-
-	"github.com/unistack-org/micro/v3/metadata"
 )
 
-const (
-	traceIDKey = "Micro-Trace-Id"
-	spanIDKey  = "Micro-Span-Id"
-)
+type tracerKey struct{}
 
-// FromContext returns a span from context
-func FromContext(ctx context.Context) (traceID string, parentSpanID string, isFound bool) {
-	md, ok := metadata.FromIncomingContext(ctx)
-	if !ok {
-		return "", "", false
+// FromContext returns a tracer from context
+func FromContext(ctx context.Context) Tracer {
+	if ctx == nil {
+		return DefaultTracer
+	}
+	if tracer, ok := ctx.Value(tracerKey{}).(Tracer); ok {
+		return tracer
 	}
-	traceID, traceOk := md.Get(traceIDKey)
-	microID, microOk := md.Get("Micro-Id")
-	if !traceOk && !microOk {
-		isFound = false
-		return
+	return DefaultTracer
+}
+
+// NewContext saves the tracer in the context
+func NewContext(ctx context.Context, tracer Tracer) context.Context {
+	if ctx == nil {
+		ctx = context.Background()
+	}
+	return context.WithValue(ctx, tracerKey{}, tracer)
+}
+
+type spanKey struct{}
+
+// SpanFromContext returns a span from context
+func SpanFromContext(ctx context.Context) Span {
+	if ctx == nil {
+		return &noopSpan{}
 	}
-	if !traceOk {
-		traceID = microID
+	if span, ok := ctx.Value(spanKey{}).(Span); ok {
+		return span
 	}
-	parentSpanID, ok = md.Get(spanIDKey)
-	return traceID, parentSpanID, ok
+	return &noopSpan{}
 }
 
-// NewContext saves the trace and span ids in the context
-func NewContext(ctx context.Context, traceID, parentSpanID string) context.Context {
-	md, ok := metadata.FromContext(ctx)
-	if !ok {
-		md = metadata.New(2)
+// NewSpanContext saves the span in the context
+func NewSpanContext(ctx context.Context, span Span) context.Context {
+	if ctx == nil {
+		ctx = context.Background()
 	}
-	md.Set(traceIDKey, traceID)
-	md.Set(spanIDKey, parentSpanID)
-	return metadata.NewContext(ctx, md)
+	return context.WithValue(ctx, spanKey{}, span)
 }

tracer/noop.go

@@ -0,0 +1,69 @@
+package tracer
+
+import (
+	"context"
+)
+
+type noopTracer struct {
+	opts Options
+}
+
+func (t *noopTracer) Start(ctx context.Context, name string, opts ...SpanOption) (context.Context, Span) {
+	span := &noopSpan{
+		name:   name,
+		ctx:    ctx,
+		tracer: t,
+	}
+	if span.ctx == nil {
+		span.ctx = context.Background()
+	}
+	return NewSpanContext(ctx, span), span
+}
+
+func (t *noopTracer) Init(opts ...Option) error {
+	for _, o := range opts {
+		o(&t.opts)
+	}
+	return nil
+}
+
+func (t *noopTracer) Name() string {
+	return t.opts.Name
+}
+
+type noopSpan struct {
+	name   string
+	ctx    context.Context
+	tracer Tracer
+}
+
+func (s *noopSpan) Finish(opts ...SpanOption) {
+
+}
+
+func (s *noopSpan) Context() context.Context {
+	return s.ctx
+}
+
+func (s *noopSpan) Tracer() Tracer {
+	return s.tracer
+}
+
+func (s *noopSpan) AddEvent(name string, opts ...EventOption) {
+
+}
+
+func (s *noopSpan) SetName(name string) {
+	s.name = name
+}
+
+func (s *noopSpan) SetLabels(labels ...Label) {
+
+}
+
+// NewTracer returns new memory tracer
+func NewTracer(opts ...Option) Tracer {
+	return &noopTracer{
+		opts: NewOptions(opts...),
+	}
+}

tracer/options.go

@@ -2,39 +2,27 @@ package tracer
 
 import "github.com/unistack-org/micro/v3/logger"
 
-var (
-	// DefaultSize of the buffer
-	DefaultSize = 64
-)
+type SpanOptions struct {
+}
+
+type SpanOption func(o *SpanOptions)
+
+type EventOptions struct {
+}
+
+type EventOption func(o *EventOptions)
 
 // Options struct
 type Options struct {
+	// Name of the tracer
 	Name string
 	// Logger is the logger for messages
 	Logger logger.Logger
-	// Size is the size of ring buffer
-	Size int
 }
 
 // Option func
 type Option func(o *Options)
 
-// ReadOptions struct
-type ReadOptions struct {
-	// Trace id
-	Trace string
-}
-
-// ReadOption func
-type ReadOption func(o *ReadOptions)
-
-// ReadTrace read the given trace
-func ReadTrace(t string) ReadOption {
-	return func(o *ReadOptions) {
-		o.Trace = t
-	}
-}
-
 // Logger sets the logger
 func Logger(l logger.Logger) Option {
 	return func(o *Options) {
@@ -46,7 +34,6 @@ func Logger(l logger.Logger) Option {
 func NewOptions(opts ...Option) Options {
 	options := Options{
 		Logger: logger.DefaultLogger,
-		Size:   DefaultSize,
 	}
 	for _, o := range opts {
 		o(&options)