feat(v2fix): expand analyzer coverage and harden suggested fix generation

tools/v2fix/_stage/appseclogin/appseclogin.go

@@ -0,0 +1,22 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2024 Datadog, Inc.
+
+package main
+
+import (
+	"context"
+
+	"gopkg.in/DataDog/dd-trace-go.v1/appsec"
+)
+
+func main() {
+	ctx := context.Background()
+
+	// Login success event
+	appsec.TrackUserLoginSuccessEvent(ctx, "user123", nil) // want `appsec login event functions have been renamed`
+
+	// Login failure event
+	appsec.TrackUserLoginFailureEvent(ctx, "user123", false, nil) // want `appsec login event functions have been renamed`
+}

tools/v2fix/_stage/appseclogin/appseclogin.go.golden

@@ -0,0 +1,23 @@
+-- appsec login event functions have been renamed (remove 'Event' suffix) --
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2024 Datadog, Inc.
+
+package main
+
+import (
+	"context"
+
+	"gopkg.in/DataDog/dd-trace-go.v1/appsec"
+)
+
+func main() {
+	ctx := context.Background()
+
+	// Login success event
+	appsec.TrackUserLoginSuccess(ctx, "user123", nil) // want `appsec login event functions have been renamed`
+
+	// Login failure event
+	appsec.TrackUserLoginFailure(ctx, "user123", false, nil) // want `appsec login event functions have been renamed`
+}

tools/v2fix/_stage/childof/childof.go

@@ -0,0 +1,39 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2024 Datadog, Inc.
+
+package main
+
+import (
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+)
+
+func main() {
+	tracer.Start()
+	defer tracer.Stop()
+
+	parent := tracer.StartSpan("parent")
+	defer parent.Finish()
+
+	extraOpt := tracer.ResourceName("resource")
+
+	// Simple ChildOf usage
+	child := tracer.StartSpan("child", tracer.ChildOf(parent.Context())) // want `use StartChild instead of StartSpan with ChildOf`
+	defer child.Finish()
+
+	// ChildOf with additional options
+	child2 := tracer.StartSpan("child2", tracer.ChildOf(parent.Context()), tracer.ResourceName("resource")) // want `use StartChild instead of StartSpan with ChildOf`
+	defer child2.Finish()
+
+	// ChildOf with non-call option (variable)
+	child3 := tracer.StartSpan("child3", tracer.ChildOf(parent.Context()), extraOpt) // want `use StartChild instead of StartSpan with ChildOf`
+	defer child3.Finish()
+
+	// ChildOf passed via variadic (ellipsis applies to ChildOf itself) - should not be rewritten
+	parentOpts := []tracer.StartSpanOption{
+		tracer.ChildOf(parent.Context()),
+	}
+	child4 := tracer.StartSpan("child4", parentOpts...)
+	defer child4.Finish()
+}

tools/v2fix/_stage/childof/childof.go.golden

@@ -0,0 +1,40 @@
+-- use StartChild instead of StartSpan with ChildOf --
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2024 Datadog, Inc.
+
+package main
+
+import (
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+)
+
+func main() {
+	tracer.Start()
+	defer tracer.Stop()
+
+	parent := tracer.StartSpan("parent")
+	defer parent.Finish()
+
+	extraOpt := tracer.ResourceName("resource")
+
+	// Simple ChildOf usage
+	child := parent.StartChild("child") // want `use StartChild instead of StartSpan with ChildOf`
+	defer child.Finish()
+
+	// ChildOf with additional options
+	child2 := parent.StartChild("child2", tracer.ResourceName("resource")) // want `use StartChild instead of StartSpan with ChildOf`
+	defer child2.Finish()
+
+	// ChildOf with non-call option (variable)
+	child3 := parent.StartChild("child3", extraOpt) // want `use StartChild instead of StartSpan with ChildOf`
+	defer child3.Finish()
+
+	// ChildOf passed via variadic (ellipsis applies to ChildOf itself) - should not be rewritten
+	parentOpts := []tracer.StartSpanOption{
+		tracer.ChildOf(parent.Context()),
+	}
+	child4 := tracer.StartSpan("child4", parentOpts...)
+	defer child4.Finish()
+}

tools/v2fix/_stage/ddtracetypes/ddtracetypes.go

@@ -11,6 +11,8 @@ import (
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
 )
 
+const N = 2
+
 func main() {
 	var (
 		_ ddtrace.FinishConfig // want `the declared type is in the ddtrace/tracer package now`
@@ -23,8 +25,27 @@ func main() {
 		_ ddtrace.StartSpanOption // want `the declared type is in the ddtrace/tracer package now`
 		_ ddtrace.Tracer          // want `the declared type is in the ddtrace/tracer package now`
 		_ time.Time
+
+		// Composite type tests: pointer, slice, array
+		_ *ddtrace.Span       // want `the declared type is in the ddtrace/tracer package now`
+		_ []ddtrace.Span      // want `the declared type is in the ddtrace/tracer package now`
+		_ [3]ddtrace.SpanLink // want `the declared type is in the ddtrace/tracer package now`
+
+		// Non-literal array length: diagnostic emitted but no fix (preserves original formatting)
+		_ [N + 1]ddtrace.Span // want `the declared type is in the ddtrace/tracer package now`
+
+		// Composite SpanContext types should NOT be migrated (exclusion applies to unwrapped base type)
+		_ *ddtrace.SpanContext
+		_ []ddtrace.SpanContext
+		_ [2]ddtrace.SpanContext
 	)
 }
 
 func spanConsumer(_ ddtrace.Span) { // want `the declared type is in the ddtrace/tracer package now`
 }
+
+func pointerConsumer(_ *ddtrace.Span) { // want `the declared type is in the ddtrace/tracer package now`
+}
+
+func sliceConsumer(_ []ddtrace.Span) { // want `the declared type is in the ddtrace/tracer package now`
+}

tools/v2fix/_stage/ddtracetypes/ddtracetypes.go.golden

@@ -12,6 +12,8 @@ import (
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
 )
 
+const N = 2
+
 func main() {
 	var (
 		_ tracer.FinishConfig // want `the declared type is in the ddtrace/tracer package now`
@@ -24,8 +26,27 @@ func main() {
 		_ tracer.StartSpanOption // want `the declared type is in the ddtrace/tracer package now`
 		_ tracer.Tracer          // want `the declared type is in the ddtrace/tracer package now`
 		_ time.Time
+
+		// Composite type tests: pointer, slice, array
+		_ *tracer.Span       // want `the declared type is in the ddtrace/tracer package now`
+		_ []tracer.Span      // want `the declared type is in the ddtrace/tracer package now`
+		_ [3]tracer.SpanLink // want `the declared type is in the ddtrace/tracer package now`
+
+		// Non-literal array length: diagnostic emitted but no fix (preserves original formatting)
+		_ [N + 1]ddtrace.Span // want `the declared type is in the ddtrace/tracer package now`
+
+		// Composite SpanContext types should NOT be migrated (exclusion applies to unwrapped base type)
+		_ *ddtrace.SpanContext
+		_ []ddtrace.SpanContext
+		_ [2]ddtrace.SpanContext
 	)
 }
 
 func spanConsumer(_ tracer.Span) { // want `the declared type is in the ddtrace/tracer package now`
 }
+
+func pointerConsumer(_ *tracer.Span) { // want `the declared type is in the ddtrace/tracer package now`
+}
+
+func sliceConsumer(_ []tracer.Span) { // want `the declared type is in the ddtrace/tracer package now`
+}

tools/v2fix/_stage/falsepositive/falsepositive.go

@@ -0,0 +1,40 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2023 Datadog, Inc.
+
+// This test verifies that functions with the same names as dd-trace-go v1 functions
+// but from different packages are NOT flagged for migration.
+package main
+
+// Local type and function definitions that shadow dd-trace-go names
+type Span struct {
+	Name string
+}
+
+func WithServiceName(name string) string {
+	return name
+}
+
+func TraceID() uint64 {
+	return 0
+}
+
+func WithDogstatsdAddress(addr string) string {
+	return addr
+}
+
+func ServiceRule(service string, rate float64) string {
+	return service
+}
+
+func main() {
+	// These should NOT be flagged - they're local functions, not from dd-trace-go v1
+	_ = WithServiceName("test")
+	_ = TraceID()
+	_ = WithDogstatsdAddress("localhost:8125")
+	_ = ServiceRule("myservice", 0.5)
+
+	// Local type should NOT be flagged
+	var _ Span
+}

tools/v2fix/_stage/samplingrules/samplingrules.go

@@ -16,6 +16,7 @@ func tags() map[string]string {
 func main() {
 	_ = tracer.ServiceRule("test-service", 1.0)                                                // want `a deprecated sampling rule constructor function should be replaced with a tracer.Rule{...} struct literal`
 	_ = tracer.NameRule("http.request", 1.0)                                                   // want `a deprecated sampling rule constructor function should be replaced with a tracer.Rule{...} struct literal`
+	_ = tracer.RateRule(0.5)                                                                   // want `a deprecated sampling rule constructor function should be replaced with a tracer.Rule{...} struct literal`
 	_ = tracer.NameServiceRule("http.request", "test-service", 1.0)                            // want `a deprecated sampling rule constructor function should be replaced with a tracer.Rule{...} struct literal`
 	_ = tracer.NameServiceRule("http.*", "test-*", 1.0)                                        // want `a deprecated sampling rule constructor function should be replaced with a tracer.Rule{...} struct literal`
 	_ = tracer.ServiceRule("other-service-1", 0.0)                                             // want `a deprecated sampling rule constructor function should be replaced with a tracer.Rule{...} struct literal`