github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

tracing: return (ctx, span) from StartSpan

Browse Source 
OpenTelemetry's Tracer#Start() returns (ctx, span). We have no reasons
to swap them.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato 2022-01-27 23:35:14 +00:00
parent e751f1f44f
commit cc59ae4d98
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/tracing.md
View File

@ -77,7 +77,7 @@ func clientWithTrace() error {
} }
defer cancel() defer cancel()
span, ctx := tracing.StartSpan(ctx, "OPERATION NAME") ctx, span := tracing.StartSpan(ctx, "OPERATION NAME")
defer span.End() defer span.End()
... ...
} }

8
tracing/tracing.go
View File

@ -24,13 +24,11 @@ import (
) )
// StartSpan starts child span in a context. // StartSpan starts child span in a context.
func StartSpan(ctx context.Context, opName string, opts ...trace.SpanStartOption) (trace.Span, context.Context) { func StartSpan(ctx context.Context, opName string, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
if parent := trace.SpanFromContext(ctx); parent != nil && parent.SpanContext().IsValid() { if parent := trace.SpanFromContext(ctx); parent != nil && parent.SpanContext().IsValid() {
ctx, span := parent.TracerProvider().Tracer("").Start(ctx, opName, opts...) return parent.TracerProvider().Tracer("").Start(ctx, opName, opts...)
return span, ctx
} }
ctx, span := otel.Tracer("").Start(ctx, opName, opts...) return otel.Tracer("").Start(ctx, opName, opts...)
return span, ctx
} }
// StopSpan ends the span specified // StopSpan ends the span specified