Skip to content

Commit

Permalink
Update tests previously relying on 64bit tids
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtoffl01
mtoffl01 committed Jan 15, 2025
1 parent bc24881 commit b08de4b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 13 deletions.
6 changes: 4 additions & 2 deletions ddtrace/tracer/log_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,11 @@ func TestLogFormat(t *testing.T) {
defer stop()
tp.Reset()
tp.Ignore("appsec: ", telemetry.LogPrefix)
tracer.StartSpan("test", ServiceName("test-service"), ResourceName("/"), WithSpanID(12345))
sp := tracer.StartSpan("test", ServiceName("test-service"), ResourceName("/"), WithSpanID(12345))
sCtx, ok := sp.Context().(*spanContext)
assert.True(ok)
assert.Len(tp.Logs(), 1)
assert.Regexp(logPrefixRegexp+` DEBUG: Started Span: dd.trace_id="12345" dd.span_id="12345" dd.parent_id="0", Operation: test, Resource: /, Tags: map.*, map.*`, tp.Logs()[0])
assert.Regexp(logPrefixRegexp+` DEBUG: Started Span: dd.trace_id="`+sCtx.TraceID128()+`" dd.span_id="12345" dd.parent_id="0", Operation: test, Resource: /, Tags: map.*, map.*`, tp.Logs()[0])
}

func TestLogPropagators(t *testing.T) {
Expand Down
32 changes: 21 additions & 11 deletions ddtrace/tracer/span_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,8 @@ func TestSpanLog(t *testing.T) {
tracer, _, _, stop := startTestTracer(t)
defer stop()
span := tracer.StartSpan("test.request").(*span)
expect := fmt.Sprintf(`dd.trace_id="%d" dd.span_id="%d" dd.parent_id="0"`, span.TraceID, span.SpanID)
sctx := span.Context().(*spanContext)
expect := fmt.Sprintf(`dd.trace_id="%s" dd.span_id="%d" dd.parent_id="0"`, sctx.TraceID128(), span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
}
t.Run("noservice_first", noServiceTest)
Expand All @@ -722,7 +723,8 @@ 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" dd.parent_id="0"`, span.TraceID, span.SpanID)
sctx := span.Context().(*spanContext)
expect := fmt.Sprintf(`dd.service=tracer.test dd.trace_id="%s" dd.span_id="%d" dd.parent_id="0"`, sctx.TraceID128(), span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -731,7 +733,8 @@ 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" dd.parent_id="0"`, span.TraceID, span.SpanID)
sctx := span.Context().(*spanContext)
expect := fmt.Sprintf(`dd.service=tracer.test dd.env=testenv dd.trace_id="%s" dd.span_id="%d" dd.parent_id="0"`, sctx.TraceID128(), span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -740,7 +743,8 @@ 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" dd.parent_id="0"`, span.TraceID, span.SpanID)
sctx := span.Context().(*spanContext)
expect := fmt.Sprintf(`dd.service=tracer.test dd.version=1.2.3 dd.trace_id="%s" dd.span_id="%d" dd.parent_id="0"`, sctx.TraceID128(), span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -749,7 +753,8 @@ 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" dd.parent_id="0"`, span.TraceID, span.SpanID)
sctx := span.Context().(*spanContext)
expect := fmt.Sprintf(`dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id="%s" dd.span_id="%d" dd.parent_id="0"`, sctx.TraceID128(), span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -761,7 +766,8 @@ 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" dd.parent_id="0"`, span.TraceID, span.SpanID)
sctx := span.Context().(*spanContext)
expect := fmt.Sprintf(`dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id="%s" dd.span_id="%d" dd.parent_id="0"`, sctx.TraceID128(), span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -773,7 +779,8 @@ 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" dd.parent_id="0"`, span.TraceID, span.SpanID)
sctx := span.Context().(*spanContext)
expect := fmt.Sprintf(`dd.service=tracer.test dd.env=testenv dd.version=1.2.3 dd.trace_id="%s" dd.span_id="%d" dd.parent_id="0"`, sctx.TraceID128(), span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -782,17 +789,19 @@ 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" dd.parent_id="0")`, span.TraceID, span.SpanID)
sctx := span.Context().(*spanContext)
expect := fmt.Sprintf(`%%!b(ddtrace.Span=dd.service=tracer.test dd.version=1.2.3 dd.trace_id="%s" dd.span_id="%d" dd.parent_id="0")`, sctx.TraceID128(), span.SpanID)
assert.Equal(expect, fmt.Sprintf("%b", span))
})

t.Run("notracer/options", func(t *testing.T) {
assert := assert.New(t)
tracer, _, _, stop := startTestTracer(t, WithService("tracer.test"), WithServiceVersion("1.2.3"), WithEnv("testenv"))
span := tracer.StartSpan("test.request").(*span)
sctx := span.Context().(*spanContext)
stop()
// no service, env, or version after the tracer is stopped
expect := fmt.Sprintf(`dd.trace_id="%d" dd.span_id="%d" dd.parent_id="0"`, span.TraceID, span.SpanID)
expect := fmt.Sprintf(`dd.trace_id="%s" dd.span_id="%d" dd.parent_id="0"`, sctx.TraceID128(), span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -803,10 +812,11 @@ func TestSpanLog(t *testing.T) {
assert := assert.New(t)
tracer, _, _, stop := startTestTracer(t)
span := tracer.StartSpan("test.request").(*span)
sctx := span.Context().(*spanContext)
stop()
// service is not included: it is cleared when we stop the tracer
// env, version are included: it reads the environment variable when there is no tracer
expect := fmt.Sprintf(`dd.env=testenv dd.version=1.2.3 dd.trace_id="%d" dd.span_id="%d" dd.parent_id="0"`, span.TraceID, span.SpanID)
expect := fmt.Sprintf(`dd.env=testenv dd.version=1.2.3 dd.trace_id="%s" dd.span_id="%d" dd.parent_id="0"`, sctx.TraceID128(), span.SpanID)
assert.Equal(expect, fmt.Sprintf("%v", span))
})

Expand All @@ -825,7 +835,7 @@ func TestSpanLog(t *testing.T) {
})

t.Run("128-bit-logging-only", func(t *testing.T) {
// Logging 128-bit trace ids is enabled, but it's not present in
// Logging 128-bit trace ids is enabled, but format is not present in
// the span. So only the lower 64 bits should be logged in decimal form.
t.Setenv("DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED", "false")
assert := assert.New(t)
Expand Down

0 comments on commit b08de4b

Please sign in to comment.