Skip to content

Commit

Permalink
Revert "ddtrace/tracer: add quotes to trace and span id in format (#676…
Browse files Browse the repository at this point in the history 
…)"

This reverts commit 307997d.
  • Loading branch information
@gbbr
gbbr authored Jun 5, 2020
1 parent 307997d commit caddb35
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion ddtrace/tracer/span.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ func (s *span) Format(f fmt.State, c rune) {
fmt.Fprintf(f, "dd.version=%s ", v)
}
}
fmt.Fprintf(f, `dd.trace_id="%d" dd.span_id="%d"`, s.TraceID, s.SpanID)
fmt.Fprintf(f, "dd.trace_id=%d dd.span_id=%d", s.TraceID, s.SpanID)
default:
fmt.Fprintf(f, "%%!%c(ddtrace.Span=%v)", c, s)
}
Expand Down
18 changes: 9 additions & 9 deletions ddtrace/tracer/span_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ func TestSpanLog(t *testing.T) {
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"))
defer stop()
span := tracer.StartSpan("test.request").(*span)
expect := fmt.Sprintf(`dd.service=tracer.test dd.trace_id="%d" dd.span_id="%d"`, span.TraceID, span.SpanID)
expect := fmt.Sprintf("dd.service=tracer.test dd.trace_id=%d dd.span_id=%d", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -420,7 +420,7 @@ func TestSpanLog(t *testing.T) {
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"), WithEnv("testenv"))
defer stop()
span := tracer.StartSpan("test.request").(*span)
expect := fmt.Sprintf(`dd.service=tracer.test dd.env=testenv dd.trace_id="%d" dd.span_id="%d"`, span.TraceID, span.SpanID)
expect := fmt.Sprintf("dd.service=tracer.test dd.env=testenv dd.trace_id=%d dd.span_id=%d", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -429,7 +429,7 @@ func TestSpanLog(t *testing.T) {
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"), WithServiceVersion("1.2.3"))
defer stop()
span := tracer.StartSpan("test.request").(*span)
expect := fmt.Sprintf(`dd.service=tracer.test dd.version=1.2.3 dd.trace_id="%d" dd.span_id="%d"`, span.TraceID, span.SpanID)
expect := fmt.Sprintf("dd.service=tracer.test dd.version=1.2.3 dd.trace_id=%d dd.span_id=%d", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -438,7 +438,7 @@ func TestSpanLog(t *testing.T) {
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"), WithServiceVersion("1.2.3"), WithEnv("testenv"))
defer stop()
span := tracer.StartSpan("test.request").(*span)
expect := fmt.Sprintf(`dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id="%d" dd.span_id="%d"`, span.TraceID, span.SpanID)
expect := fmt.Sprintf("dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id=%d dd.span_id=%d", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -447,7 +447,7 @@ func TestSpanLog(t *testing.T) {
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"), WithServiceVersion("1.2.3"), WithEnv("testenv"))
defer stop()
span := tracer.StartSpan("test.request", ServiceName("subservice name")).(*span)
expect := fmt.Sprintf(`dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id="%d" dd.span_id="%d"`, span.TraceID, span.SpanID)
expect := fmt.Sprintf("dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id=%d dd.span_id=%d", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -462,7 +462,7 @@ func TestSpanLog(t *testing.T) {
tracer, _, _, stop := startTestTracer(t)
defer stop()
span := tracer.StartSpan("test.request").(*span)
expect := fmt.Sprintf(`dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id="%d" dd.span_id="%d"`, span.TraceID, span.SpanID)
expect := fmt.Sprintf("dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id=%d dd.span_id=%d", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -471,7 +471,7 @@ func TestSpanLog(t *testing.T) {
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"), WithServiceVersion("1.2.3"))
defer stop()
span := tracer.StartSpan("test.request").(*span)
expect := fmt.Sprintf(`%%!b(ddtrace.Span=dd.service=tracer.test dd.version=1.2.3 dd.trace_id="%d" dd.span_id="%d")`, span.TraceID, span.SpanID)
expect := fmt.Sprintf("%%!b(ddtrace.Span=dd.service=tracer.test dd.version=1.2.3 dd.trace_id=%d dd.span_id=%d)", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%b", span))
})

Expand All @@ -480,7 +480,7 @@ func TestSpanLog(t *testing.T) {
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"), WithServiceVersion("1.2.3"), WithEnv("testenv"))
span := tracer.StartSpan("test.request").(*span)
stop()
expect := fmt.Sprintf(`dd.service=tracer.test dd.trace_id="%d" dd.span_id="%d"`, span.TraceID, span.SpanID)
expect := fmt.Sprintf("dd.service=tracer.test dd.trace_id=%d dd.span_id=%d", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -495,7 +495,7 @@ func TestSpanLog(t *testing.T) {
tracer, _, _, stop := startTestTracer(t)
span := tracer.StartSpan("test.request").(*span)
stop()
expect := fmt.Sprintf(`dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id="%d" dd.span_id="%d"`, span.TraceID, span.SpanID)
expect := fmt.Sprintf("dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id=%d dd.span_id=%d", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})
}
Expand Down

0 comments on commit caddb35

Please sign in to comment.