tracer/context.go

@@ -37,15 +37,6 @@ func NewContext(ctx context.Context, tracer Tracer) context.Context {
 
 type spanKey struct{}
 
-// SpanFromContext returns a span from context
-func SpanMustContext(ctx context.Context) Span {
-	sp, ok := SpanFromContext(ctx)
-	if !ok {
-		panic("missing span")
-	}
-	return sp
-}
-
 // SpanFromContext returns a span from context
 func SpanFromContext(ctx context.Context) (Span, bool) {
 	if ctx == nil {

tracer/memory/memory.go

@@ -25,7 +25,6 @@ func (t *Tracer) Start(ctx context.Context, name string, opts ...tracer.SpanOpti
 		name:      name,
 		ctx:       ctx,
 		tracer:    t,
-		labels:    options.Labels,
 		kind:      options.Kind,
 		startTime: time.Now(),
 	}
@@ -38,14 +37,6 @@ func (t *Tracer) Start(ctx context.Context, name string, opts ...tracer.SpanOpti
 	return tracer.NewSpanContext(ctx, span), span
 }
 
-type memoryStringer struct {
-	s string
-}
-
-func (s memoryStringer) String() string {
-	return s.s
-}
-
 func (t *Tracer) Flush(_ context.Context) error {
 	return nil
 }
@@ -61,6 +52,14 @@ func (t *Tracer) Name() string {
 	return t.opts.Name
 }
 
+type noopStringer struct {
+	s string
+}
+
+func (s noopStringer) String() string {
+	return s.s
+}
+
 type Span struct {
 	ctx        context.Context
 	tracer     tracer.Tracer
@@ -68,8 +67,8 @@ type Span struct {
 	statusMsg  string
 	startTime  time.Time
 	finishTime time.Time
-	traceID    memoryStringer
-	spanID     memoryStringer
+	traceID    noopStringer
+	spanID     noopStringer
 	events     []*Event
 	labels     []interface{}
 	logs       []interface{}

tracer/noop.go

@@ -2,7 +2,6 @@ package tracer
 
 import (
 	"context"
-	"time"
 
 	"go.unistack.org/micro/v3/util/id"
 )
@@ -21,18 +20,18 @@ func (t *noopTracer) Spans() []Span {
 func (t *noopTracer) Start(ctx context.Context, name string, opts ...SpanOption) (context.Context, Span) {
 	options := NewSpanOptions(opts...)
 	span := &noopSpan{
-		name:      name,
-		ctx:       ctx,
-		tracer:    t,
-		startTime: time.Now(),
-		labels:    options.Labels,
-		kind:      options.Kind,
+		name:   name,
+		ctx:    ctx,
+		tracer: t,
+		labels: options.Labels,
+		kind:   options.Kind,
 	}
 	span.spanID.s, _ = id.New()
 	span.traceID.s, _ = id.New()
 	if span.ctx == nil {
 		span.ctx = context.Background()
 	}
+	t.spans = append(t.spans, span)
 	return NewSpanContext(ctx, span), span
 }
 
@@ -59,18 +58,23 @@ func (t *noopTracer) Name() string {
 	return t.opts.Name
 }
 
+type noopEvent struct {
+	name   string
+	labels []interface{}
+}
+
 type noopSpan struct {
-	ctx        context.Context
-	tracer     Tracer
-	name       string
-	statusMsg  string
-	startTime  time.Time
-	finishTime time.Time
-	traceID    noopStringer
-	spanID     noopStringer
-	labels     []interface{}
-	kind       SpanKind
-	status     SpanStatus
+	ctx       context.Context
+	tracer    Tracer
+	name      string
+	statusMsg string
+	traceID   noopStringer
+	spanID    noopStringer
+	events    []*noopEvent
+	labels    []interface{}
+	logs      []interface{}
+	kind      SpanKind
+	status    SpanStatus
 }
 
 func (s *noopSpan) TraceID() string {
@@ -82,7 +86,6 @@ func (s *noopSpan) SpanID() string {
 }
 
 func (s *noopSpan) Finish(_ ...SpanOption) {
-	s.finishTime = time.Now()
 }
 
 func (s *noopSpan) Context() context.Context {
@@ -94,6 +97,8 @@ func (s *noopSpan) Tracer() Tracer {
 }
 
 func (s *noopSpan) AddEvent(name string, opts ...EventOption) {
+	options := NewEventOptions(opts...)
+	s.events = append(s.events, &noopEvent{name: name, labels: options.Labels})
 }
 
 func (s *noopSpan) SetName(name string) {
@@ -101,6 +106,7 @@ func (s *noopSpan) SetName(name string) {
 }
 
 func (s *noopSpan) AddLogs(kv ...interface{}) {
+	s.logs = append(s.logs, kv...)
 }
 
 func (s *noopSpan) AddLabels(kv ...interface{}) {