internal/trace: move v2 tracer into trace directory

This change moves the v2 tracer into the trace directory.

Updates #67367

Change-Id: I3657b4227002cb00fdf29c797434800ea796715e
Reviewed-on: https://go-review.googlesource.com/c/go/+/584538
Reviewed-by: Michael Knyszek <mknyszek@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/src/runtime/crash_test.go b/src/runtime/crash_test.go
index 9a5fa61588..7471977a36 100644
--- a/src/runtime/crash_test.go
+++ b/src/runtime/crash_test.go
@@ -11,7 +11,7 @@ import (
 	"flag"
 	"fmt"
 	"internal/testenv"
-	tracev2 "internal/trace/v2"
+	traceparse "internal/trace"
 	"io"
 	"log"
 	"os"
@@ -900,7 +900,7 @@ func TestCrashWhileTracing(t *testing.T) {
 	if err := cmd.Start(); err != nil {
 		t.Fatalf("could not start subprocess: %v", err)
 	}
-	r, err := tracev2.NewReader(stdOut)
+	r, err := traceparse.NewReader(stdOut)
 	if err != nil {
 		t.Fatalf("could not create trace.NewReader: %v", err)
 	}
@@ -918,9 +918,9 @@ loop:
 			break loop
 		}
 		switch ev.Kind() {
-		case tracev2.EventSync:
+		case traceparse.EventSync:
 			seenSync = true
-		case tracev2.EventLog:
+		case traceparse.EventLog:
 			v := ev.Log()
 			if v.Category == "xyzzy-cat" && v.Message == "xyzzy-msg" {
 				// Should we already stop reading here? More events may come, but
diff --git a/src/runtime/trace_cgo_test.go b/src/runtime/trace_cgo_test.go
index fb33f756e4..f0db3b7ffb 100644
--- a/src/runtime/trace_cgo_test.go
+++ b/src/runtime/trace_cgo_test.go
@@ -10,7 +10,7 @@ import (
 	"bytes"
 	"fmt"
 	"internal/testenv"
-	tracev2 "internal/trace/v2"
+	"internal/trace"
 	"io"
 	"os"
 	"runtime"
@@ -37,7 +37,7 @@ func TestTraceUnwindCGO(t *testing.T) {
 		"goCalledFromC",
 		"goCalledFromCThread",
 	}
-	logs := make(map[string]*tracev2.Event)
+	logs := make(map[string]*trace.Event)
 	for _, category := range wantLogs {
 		logs[category] = nil
 	}
@@ -65,12 +65,12 @@ func TestTraceUnwindCGO(t *testing.T) {
 	}
 }
 
-func mustFindLogV2(t *testing.T, trace io.Reader, category string) tracev2.Event {
-	r, err := tracev2.NewReader(trace)
+func mustFindLogV2(t *testing.T, trc io.Reader, category string) trace.Event {
+	r, err := trace.NewReader(trc)
 	if err != nil {
 		t.Fatalf("bad trace: %v", err)
 	}
-	var candidates []tracev2.Event
+	var candidates []trace.Event
 	for {
 		ev, err := r.ReadEvent()
 		if err == io.EOF {
@@ -79,7 +79,7 @@ func mustFindLogV2(t *testing.T, trace io.Reader, category string) tracev2.Event
 		if err != nil {
 			t.Fatalf("failed to parse trace: %v", err)
 		}
-		if ev.Kind() == tracev2.EventLog && ev.Log().Category == category {
+		if ev.Kind() == trace.EventLog && ev.Log().Category == category {
 			candidates = append(candidates, ev)
 		}
 	}
@@ -92,9 +92,9 @@ func mustFindLogV2(t *testing.T, trace io.Reader, category string) tracev2.Event
 }
 
 // dumpStack returns e.Stack() as a string.
-func dumpStackV2(e *tracev2.Event) string {
+func dumpStackV2(e *trace.Event) string {
 	var buf bytes.Buffer
-	e.Stack().Frames(func(f tracev2.StackFrame) bool {
+	e.Stack().Frames(func(f trace.StackFrame) bool {
 		file := strings.TrimPrefix(f.File, runtime.GOROOT())
 		fmt.Fprintf(&buf, "%s\n\t%s:%d\n", f.Func, file, f.Line)
 		return true