Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(zap): porting to uint64 IDs

pull/10616/head
Leonardo Di Donato 2018-09-26 18:18:08 +02:00 committed by Chris Goller
parent 95dfff47c6
commit 7c932dad56
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zap/tracer.go
View File

@ -49,7 +49,7 @@ func (t *Tracer) StartSpan(operationName string, opts ...opentracing.StartSpanOp
break break
} }
} }
if len(ctx.traceID) == 0 { if !ctx.traceID.Valid() {
ctx.traceID = t.IDGenerator.ID() ctx.traceID = t.IDGenerator.ID()
} }
return &Span{ return &Span{
@ -115,10 +115,10 @@ func (t *Tracer) Extract(format interface{}, carrier interface{}) (opentracing.S
default: default:
return nil, fmt.Errorf("unsupported format %v", format) return nil, fmt.Errorf("unsupported format %v", format)
} }
if len(ctx.traceID) == 0 { if !ctx.traceID.Valid() {
ctx.traceID = t.IDGenerator.ID() ctx.traceID = t.IDGenerator.ID()
} }
if len(ctx.spanID) == 0 { if !ctx.spanID.Valid() {
return nil, errors.New("no span ID found in carrier") return nil, errors.New("no span ID found in carrier")
} }
return ctx, err return ctx, err