diff options
| author | Hana Kim <hakim@google.com> | 2018-03-02 15:52:30 -0500 |
|---|---|---|
| committer | Hyang-Ah Hana Kim <hyangah@gmail.com> | 2018-03-05 20:10:22 +0000 |
| commit | d3946f75d3061c6150e74d854e7345ecc1751785 (patch) | |
| tree | 884e2c65147cfdf9a060c2dccc0f7a5921fe5974 /src/runtime/trace | |
| parent | 83e41b3e76cb1e9033e6b2860e5f6cab5330dd23 (diff) | |
| download | go-d3946f75d3061c6150e74d854e7345ecc1751785.tar.gz go-d3946f75d3061c6150e74d854e7345ecc1751785.zip | |
internal/trace: remove backlinks from span/task end to start
This is an updated version of golang.org/cl/96395, with the fix to
TestUserSpan.
This reverts commit 7b6f6267e90a8e4eab37a3f2164ba882e6222adb.
Change-Id: I31eec8ba0997f9178dffef8dac608e731ab70872
Reviewed-on: https://go-review.googlesource.com/98236
Run-TryBot: Hyang-Ah Hana Kim <hyangah@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Heschi Kreinick <heschi@google.com>
Diffstat (limited to 'src/runtime/trace')
| -rw-r--r-- | src/runtime/trace/annotation_test.go | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/runtime/trace/annotation_test.go b/src/runtime/trace/annotation_test.go index 72cf2bf7b0..0dcb9aca29 100644 --- a/src/runtime/trace/annotation_test.go +++ b/src/runtime/trace/annotation_test.go @@ -3,9 +3,11 @@ package trace_test import ( "bytes" "context" + "fmt" "internal/trace" "reflect" . "runtime/trace" + "strings" "sync" "testing" ) @@ -102,13 +104,20 @@ func TestUserTaskSpan(t *testing.T) { {trace.EvUserSpan, []string{"task0", "span0"}, []uint64{0}, true}, {trace.EvUserSpan, []string{"task0", "span1"}, []uint64{0}, true}, {trace.EvUserLog, []string{"task0", "key0", "0123456789abcdef"}, nil, false}, - {trace.EvUserSpan, []string{"task0", "span1"}, []uint64{1}, true}, - {trace.EvUserSpan, []string{"task0", "span0"}, []uint64{1}, true}, - {trace.EvUserTaskEnd, []string{"task0"}, nil, true}, + {trace.EvUserSpan, []string{"task0", "span1"}, []uint64{1}, false}, + {trace.EvUserSpan, []string{"task0", "span0"}, []uint64{1}, false}, + {trace.EvUserTaskEnd, []string{"task0"}, nil, false}, {trace.EvUserSpan, []string{"", "pre-existing span"}, []uint64{1}, false}, {trace.EvUserSpan, []string{"", "post-existing span"}, []uint64{0}, false}, } if !reflect.DeepEqual(got, want) { - t.Errorf("Got user span related events %+v\nwant: %+v", got, want) + pretty := func(data []testData) string { + var s strings.Builder + for _, d := range data { + s.WriteString(fmt.Sprintf("\t%+v\n", d)) + } + return s.String() + } + t.Errorf("Got user span related events\n%+v\nwant:\n%+v", pretty(got), pretty(want)) } } |