Skip to content

Commit fac9736

Browse files
authored
Merge pull request #1 from Vinelab/graceful_inject
Define errors out of existence
2 parents ee0768f + 5bea0cb commit fac9736

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

drivers/noop/tracer.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@ func (tracer *Tracer) Extract(carrier interface{}, format string) (tracing.SpanC
6666
// Inject implicitly serializes current span context using the format descriptor that
6767
// tells how to encode trace info in the carrier parameters
6868
func (tracer *Tracer) Inject(carrier interface{}, format string) error {
69-
span := tracer.currentSpan
70-
if span == nil {
71-
return tracing.ErrMissingTraceContext
72-
}
73-
7469
return nil
7570
}
7671

drivers/zipkin/tracer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func (tracer *Tracer) Extract(carrier interface{}, format string) (tracing.SpanC
172172
func (tracer *Tracer) Inject(carrier interface{}, format string) error {
173173
span := tracer.currentSpan
174174
if span == nil {
175-
return tracing.ErrMissingTraceContext
175+
return nil
176176
}
177177

178178
injector, ok := tracer.injectionFormats[format]

errors.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
package tracing
22

33
import (
4-
"errors"
54
"fmt"
65
)
76

8-
var (
9-
// ErrMissingTraceContext is returned when trying to implicitly inject SpanContext
10-
// and there is no active span
11-
ErrMissingTraceContext = errors.New("cannot obtain context because there is no active span")
12-
)
13-
147
// UnregisteredFormatError is returned when you tried to inject/extract trace context
158
// using unregistered format or when there is a mismatch between format and extractor
169
type UnregisteredFormatError struct {

0 commit comments

Comments
 (0)