internal/trace: remove last references to internal/trace/v2

This change removes the last few references to internal/trace/v2.
Notably, it shows up in the generators' imports, so they'll fail to run
currently.

Change-Id: Ibc5a9c1844634ea7620558e270ca3db9921ba56e
Reviewed-on: https://go-review.googlesource.com/c/go/+/587930
Auto-Submit: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Carlos Amedee <carlos@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

src/internal/trace/internal/oldtrace/parser.go

@@ -167,7 +167,7 @@ func newParser(r io.Reader, ver version.Version) (*parser, error) {
 // be the version of the trace. This can be achieved by using
 // version.ReadHeader.
 func Parse(r io.Reader, vers version.Version) (Trace, error) {
-	// We accept the version as an argument because internal/trace/v2 will have
+	// We accept the version as an argument because internal/trace will have
 	// already read the version to determine which parser to use.
 	p, err := newParser(r, vers)
 	if err != nil {

src/internal/trace/testdata/generators/go122-confuse-seq-across-generations.go

@@ -22,9 +22,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-create-syscall-reuse-thread-id.go

@@ -24,9 +24,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-create-syscall-with-p.go

@@ -15,9 +15,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-fail-first-gen-first.go

@@ -19,8 +19,8 @@
 package main
 
 import (
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-go-create-without-running-g.go

@@ -12,9 +12,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-ambiguous.go

@@ -14,9 +14,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-bare-m.go

@@ -7,9 +7,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc-bare-m.go

@@ -7,9 +7,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc.go

@@ -7,9 +7,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary.go

@@ -7,9 +7,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc-bare-m.go

@@ -7,9 +7,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc.go

@@ -7,9 +7,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-self.go

@@ -11,9 +11,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple-bare-m.go

@@ -7,9 +7,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple.go

@@ -7,9 +7,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-syscall-steal-proc-sitting-in-syscall.go

@@ -8,9 +8,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {

src/internal/trace/testdata/generators/go122-task-across-generations.go

@@ -13,9 +13,9 @@
 package main
 
 import (
-	"internal/trace/v2"
-	"internal/trace/v2/event/go122"
-	testgen "internal/trace/v2/internal/testgen/go122"
+	"internal/trace"
+	"internal/trace/event/go122"
+	testgen "internal/trace/internal/testgen/go122"
 )
 
 func main() {