Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddtrace/tracer: implement fmt.Formatter interface to support log injection #657

Merged
merged 9 commits into from
May 15, 2020
Merged
18 changes: 18 additions & 0 deletions ddtrace/tracer/span.go
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,24 @@ func (s *span) String() string {
return strings.Join(lines, "\n")
}

// Format implements fmt.Formatter.
func (s *span) Format(f fmt.State, c rune) {
switch c {
case 's':
fmt.Fprint(f, s.String())
case 'v':
fmt.Fprintf(f, "dd.trace_id=%d dd.span_id=%d dd.service=%s", s.TraceID, s.SpanID, s.Service)
knusbaum marked this conversation as resolved.
Show resolved Hide resolved
if e := s.Meta[ext.Environment]; e != "" {
fmt.Fprintf(f, " dd.env=%s", e)
}
if v := s.Meta[ext.Version]; v != "" {
knusbaum marked this conversation as resolved.
Show resolved Hide resolved
fmt.Fprintf(f, " dd.version=%s", v)
}
default:
fmt.Fprintf(f, "%%!%c(ddtrace.Span=%v)", c, s)
}
}

const (
keySamplingPriority = "_sampling_priority_v1"
keySamplingPriorityRate = "_sampling_priority_rate_v1"
Expand Down
38 changes: 38 additions & 0 deletions ddtrace/tracer/span_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,44 @@ func TestSpanSamplingPriority(t *testing.T) {
}
}

func TestSpanLog(t *testing.T) {
t.Run("default", func(t *testing.T) {
assert := assert.New(t)
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"))
defer stop()
span := tracer.StartSpan("test.request").(*span)
expect := fmt.Sprintf("dd.trace_id=%d dd.span_id=%d dd.service=tracer.test", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

t.Run("env", func(t *testing.T) {
assert := assert.New(t)
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"), WithEnv("testenv"))
defer stop()
span := tracer.StartSpan("test.request").(*span)
expect := fmt.Sprintf("dd.trace_id=%d dd.span_id=%d dd.service=tracer.test dd.env=testenv", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

t.Run("version", func(t *testing.T) {
assert := assert.New(t)
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"), WithServiceVersion("1.2.3"))
defer stop()
span := tracer.StartSpan("test.request").(*span)
expect := fmt.Sprintf("dd.trace_id=%d dd.span_id=%d dd.service=tracer.test dd.version=1.2.3", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})
jdgumz marked this conversation as resolved.
Show resolved Hide resolved

t.Run("badformat", func(t *testing.T) {
assert := assert.New(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.trace_id=%d dd.span_id=%d dd.service=tracer.test dd.version=1.2.3)", span.TraceID, span.SpanID)
assert.Equal(expect, fmt.Sprintf("%b", span))
})
}

func BenchmarkSetTagMetric(b *testing.B) {
span := newBasicSpan("bench.span")
keys := "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
Expand Down