diff options
| author | Rhys Hiltner <rhys@justin.tv> | 2022-06-23 09:43:47 -0700 |
|---|---|---|
| committer | Rhys Hiltner <rhys@justin.tv> | 2022-06-24 22:08:17 +0000 |
| commit | bd4753905d15035fabbc4dda79573506090fe40b (patch) | |
| tree | 7acf4f84065aa99696743c241542318546cc3f8a /src | |
| parent | 6b6c64b1cc918633824e7a9165816c81f0c08b21 (diff) | |
| download | go-bd4753905d15035fabbc4dda79573506090fe40b.tar.xz | |
internal/trace: add Go 1.19 test data
Update instructions to match what seems to be the historical practice:
to generate canned traces when a version is finalized, rather than
waiting until it is superseded.
Follow rename of trace-internal tests from "Span" to "Region". Update
the net/http test invocation to match the apparent intent and the actual
http_1_5_good behavior (about 7ms of total run time and trace file size
under 50kB).
Change-Id: Ifd4c85882159478852e0b8f0d771b6f16b8f3c1b
Reviewed-on: https://go-review.googlesource.com/c/go/+/413776
Run-TryBot: Rhys Hiltner <rhys@justin.tv>
Reviewed-by: Carlos Amedee <carlos@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Michael Pratt <mpratt@google.com>
Diffstat (limited to 'src')
| -rwxr-xr-x | src/internal/trace/mkcanned.bash | 6 | ||||
| -rw-r--r-- | src/internal/trace/parser.go | 4 | ||||
| -rw-r--r-- | src/internal/trace/testdata/http_1_19_good | bin | 0 -> 28172 bytes | |||
| -rw-r--r-- | src/internal/trace/testdata/stress_1_19_good | bin | 0 -> 322338 bytes | |||
| -rw-r--r-- | src/internal/trace/testdata/stress_start_stop_1_19_good | bin | 0 -> 7448 bytes | |||
| -rw-r--r-- | src/internal/trace/testdata/user_task_region_1_11_good (renamed from src/internal/trace/testdata/user_task_span_1_11_good) | bin | 2000 -> 2000 bytes | |||
| -rw-r--r-- | src/internal/trace/testdata/user_task_region_1_19_good | bin | 0 -> 1922 bytes |
7 files changed, 5 insertions, 5 deletions
diff --git a/src/internal/trace/mkcanned.bash b/src/internal/trace/mkcanned.bash index b365b909c8..879cf1c500 100755 --- a/src/internal/trace/mkcanned.bash +++ b/src/internal/trace/mkcanned.bash @@ -13,8 +13,8 @@ if [ $# != 1 ]; then exit 1 fi -go test -run ClientServerParallel4 -trace "testdata/http_$1_good" net/http -go test -run 'TraceStress$|TraceStressStartStop$|TestUserTaskSpan$' runtime/trace -savetraces +go test -run '^$' -bench ClientServerParallel4 -benchtime 10x -trace "testdata/http_$1_good" net/http +go test -run 'TraceStress$|TraceStressStartStop$|TestUserTaskRegion$' runtime/trace -savetraces mv ../../runtime/trace/TestTraceStress.trace "testdata/stress_$1_good" mv ../../runtime/trace/TestTraceStressStartStop.trace "testdata/stress_start_stop_$1_good" -mv ../../runtime/trace/TestUserTaskSpan.trace "testdata/user_task_span_$1_good" +mv ../../runtime/trace/TestUserTaskRegion.trace "testdata/user_task_region_$1_good" diff --git a/src/internal/trace/parser.go b/src/internal/trace/parser.go index 8c74196ddf..866fe8cdd9 100644 --- a/src/internal/trace/parser.go +++ b/src/internal/trace/parser.go @@ -152,8 +152,8 @@ func readTrace(r io.Reader) (ver int, events []rawEvent, strings map[uint64]stri } switch ver { case 1005, 1007, 1008, 1009, 1010, 1011, 1019: - // Note: When adding a new version, add canned traces - // from the old version to the test suite using mkcanned.bash. + // Note: When adding a new version, confirm that canned traces from the + // old version are part of the test suite. Add them using mkcanned.bash. break default: err = fmt.Errorf("unsupported trace file version %v.%v (update Go toolchain) %v", ver/1000, ver%1000, ver) diff --git a/src/internal/trace/testdata/http_1_19_good b/src/internal/trace/testdata/http_1_19_good Binary files differnew file mode 100644 index 0000000000..c1d519e7d5 --- /dev/null +++ b/src/internal/trace/testdata/http_1_19_good diff --git a/src/internal/trace/testdata/stress_1_19_good b/src/internal/trace/testdata/stress_1_19_good Binary files differnew file mode 100644 index 0000000000..13f59268e6 --- /dev/null +++ b/src/internal/trace/testdata/stress_1_19_good diff --git a/src/internal/trace/testdata/stress_start_stop_1_19_good b/src/internal/trace/testdata/stress_start_stop_1_19_good Binary files differnew file mode 100644 index 0000000000..92d92789c4 --- /dev/null +++ b/src/internal/trace/testdata/stress_start_stop_1_19_good diff --git a/src/internal/trace/testdata/user_task_span_1_11_good b/src/internal/trace/testdata/user_task_region_1_11_good Binary files differindex f4edb67e65..f4edb67e65 100644 --- a/src/internal/trace/testdata/user_task_span_1_11_good +++ b/src/internal/trace/testdata/user_task_region_1_11_good diff --git a/src/internal/trace/testdata/user_task_region_1_19_good b/src/internal/trace/testdata/user_task_region_1_19_good Binary files differnew file mode 100644 index 0000000000..1daa3b25a6 --- /dev/null +++ b/src/internal/trace/testdata/user_task_region_1_19_good |