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>

diff --git a/src/internal/trace/internal/oldtrace/parser.go b/src/internal/trace/internal/oldtrace/parser.go
index 7af690d7bb11fd8a03aee50b7fc254f93411e8e9..afbf0ed50ed776e0e602cb1a102975fde66e25f7 100644 (file)
--- a/src/internal/trace/internal/oldtrace/parser.go
+++ b/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 {

diff --git a/src/internal/trace/testdata/generators/go122-confuse-seq-across-generations.go b/src/internal/trace/testdata/generators/go122-confuse-seq-across-generations.go
index f618c41e78ba85faacbc9b258494296ef3fa21e7..9f27ae046ff49cf5e5f313175c624ae4fc45eb9f 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-confuse-seq-across-generations.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-create-syscall-reuse-thread-id.go b/src/internal/trace/testdata/generators/go122-create-syscall-reuse-thread-id.go
index 107cce2cc29c2d032ff48692801198301e56efce..a14d376779ced6a21dead955e164f4c326e50c44 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-create-syscall-reuse-thread-id.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-create-syscall-with-p.go b/src/internal/trace/testdata/generators/go122-create-syscall-with-p.go
index 4cb1c4a9a770a2545eb35fdc6fa4e80e77ca8049..1eb18026ecb3df26f43a8424104a5e51fd60f829 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-create-syscall-with-p.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-fail-first-gen-first.go b/src/internal/trace/testdata/generators/go122-fail-first-gen-first.go
index e5dea24e3b09d0c8b5b5205eb8a16ebec0ddd9b3..f0e02be15560d225c4180faf3f42a76362d30282 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-fail-first-gen-first.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-go-create-without-running-g.go b/src/internal/trace/testdata/generators/go122-go-create-without-running-g.go
index b693245b5b47c769c3e4145a303b18b2f53e6aea..217089975861fd08a6ebcab33dbd8bf87eb86755 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-go-create-without-running-g.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-ambiguous.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-ambiguous.go
index 349a575ef385cb8351472fb6f8c671351ef3a87b..1f01cc9e78b21edf6f85b4b72c64455500bd408f 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-ambiguous.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-bare-m.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-bare-m.go
index f4c9f6ecf3bab77cf020b13f12ce46a0c74e04ee..1d7fe9c57c55d847dfd69a99a3c4c38ff92853d2 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-bare-m.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc-bare-m.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc-bare-m.go
index e6023ba70194f0d188bdc70e2b571e065dddff9f..a94b8f058d59220d556e8a816e22f81fb4b8801d 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc-bare-m.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc.go
index 2232dca5dc46dc6a3586fe82b54e64b252e7e59f..04aef0644cdffb32edba8266c71d1104da511c91 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary-reacquire-new-proc.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary.go
index 710827a8f65b388122a488f97e5fdf8ff001b434..769203ab4ae9dc0fe8046965ddf706c7484895ff 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-gen-boundary.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc-bare-m.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc-bare-m.go
index 24e5cb2a3eb75fc90ce15a619157ee289fa6fd1a..c1c39569f8e7f7b40445c3a0789c9c45810cb32a 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc-bare-m.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc.go
index 2caefe8be5c00646bc949bf49dd23d69c8654dab..217e4e6f96204548b669d27d9e54f94695327c63 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-reacquire-new-proc.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-self.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-self.go
index dd947346c6f7ebc6cffe89b8a215d4458d2c7190..a12f47177fb9884dbe8f54d08df65e476b36fe79 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-self.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple-bare-m.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple-bare-m.go
index 630eba8cf298587a01f1ace8de220cd7cfbdb36d..34c7415cae613f8ed1ec450b8518ce3042a99edb 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple-bare-m.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple.go
index 54b43f4f0b1394c6e6b0cb3438b777fa438332c2..6304105af04cffb4e34d76e1a3132e494fe4cffb 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-simple.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-sitting-in-syscall.go b/src/internal/trace/testdata/generators/go122-syscall-steal-proc-sitting-in-syscall.go
index 870f8f69f601016777fd8e50d215048146deb1f1..ac84261f020593ee870c0e4ae9e27ba5ce966645 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-syscall-steal-proc-sitting-in-syscall.go
+++ b/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() {

diff --git a/src/internal/trace/testdata/generators/go122-task-across-generations.go b/src/internal/trace/testdata/generators/go122-task-across-generations.go
index 06ef96e51a235832e87cc50dfd8b69f3da73eda9..83b1bcdb5ef49105c9474f939f142cea578f93b6 100644 (file)
--- a/src/internal/trace/testdata/generators/go122-task-across-generations.go
+++ b/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() {