diff --git a/ddtrace/tracer/span.go b/ddtrace/tracer/span.go index efc3561a00..20dd45e330 100644 --- a/ddtrace/tracer/span.go +++ b/ddtrace/tracer/span.go @@ -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) } diff --git a/ddtrace/tracer/span_test.go b/ddtrace/tracer/span_test.go index 1108f0d598..7927aff02d 100644 --- a/ddtrace/tracer/span_test.go +++ b/ddtrace/tracer/span_test.go @@ -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)) }) @@ -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)) }) @@ -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)) }) @@ -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)) }) @@ -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)) }) @@ -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)) }) @@ -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)) }) @@ -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)) }) @@ -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)) }) }