diff --git a/ddtrace/tracer/rand_go1_22.go b/ddtrace/tracer/rand_go1_22.go index 9e7948e47e..94b8e805d3 100644 --- a/ddtrace/tracer/rand_go1_22.go +++ b/ddtrace/tracer/rand_go1_22.go @@ -16,6 +16,6 @@ func randUint64() uint64 { return rand.Uint64() } -func generateSpanID(startTime int64) uint64 { +func generateSpanID() uint64 { return rand.Uint64() & math.MaxInt64 } diff --git a/ddtrace/tracer/sqlcomment.go b/ddtrace/tracer/sqlcomment.go index afa0a72ed7..428a55b74a 100644 --- a/ddtrace/tracer/sqlcomment.go +++ b/ddtrace/tracer/sqlcomment.go @@ -66,7 +66,7 @@ type SQLCommentCarrier struct { // Inject injects a span context in the carrier's Query field as a comment. func (c *SQLCommentCarrier) Inject(ctx *SpanContext) error { - c.SpanID = generateSpanID(now()) + c.SpanID = generateSpanID() tags := make(map[string]string) switch c.Mode { case DBMPropagationModeUndefined: diff --git a/ddtrace/tracer/tracer.go b/ddtrace/tracer/tracer.go index 5ef68ae603..094dbb20ec 100644 --- a/ddtrace/tracer/tracer.go +++ b/ddtrace/tracer/tracer.go @@ -538,7 +538,7 @@ func SpanStart(operationName string, options ...StartSpanOption) *Span { } id := opts.SpanID if id == 0 { - id = generateSpanID(startTime) + id = generateSpanID() } // span defaults span := &Span{ diff --git a/ddtrace/tracer/tracer_test.go b/ddtrace/tracer/tracer_test.go index b9311693ee..6bc8aee7fa 100644 --- a/ddtrace/tracer/tracer_test.go +++ b/ddtrace/tracer/tracer_test.go @@ -2192,7 +2192,7 @@ func BenchmarkStartSpanConcurrent(b *testing.B) { func BenchmarkGenSpanID(b *testing.B) { b.ResetTimer() for n := 0; n < b.N; n++ { - generateSpanID(0) + generateSpanID() } }