Skip to content

Commit b22da3f

Browse files
felixgegopherbot
authored andcommitted
internal/trace/internal/testgen: make generated trace version configurable
Replace hard coded references to version.Go122 with the trace version passed to NewTrace. This allows writing testgen tests for newer trace versions. For #69869 Change-Id: Id25350cea1c397a09ca23465526ff259e34a4752 Reviewed-on: https://go-review.googlesource.com/c/go/+/653875 Auto-Submit: Michael Knyszek <mknyszek@google.com> Reviewed-by: Michael Knyszek <mknyszek@google.com> Reviewed-by: Cherry Mui <cherryyz@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
1 parent 847f157 commit b22da3f

File tree

1 file changed

+4
-3
lines changed
  • src/internal/trace/internal/testgen

1 file changed

+4
-3
lines changed

src/internal/trace/internal/testgen/trace.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ func NewTrace(ver version.Version) *Trace {
6666
return &Trace{
6767
names: tracev2.EventNames(ver.Specs()),
6868
specs: ver.Specs(),
69+
ver: ver,
6970
validTimestamps: true,
7071
}
7172
}
@@ -115,7 +116,7 @@ func (t *Trace) Generation(gen uint64) *Generation {
115116
func (t *Trace) Generate() []byte {
116117
// Trace file contents.
117118
var buf bytes.Buffer
118-
tw, err := raw.NewTextWriter(&buf, version.Go122)
119+
tw, err := raw.NewTextWriter(&buf, t.ver)
119120
if err != nil {
120121
panic(err.Error())
121122
}
@@ -153,7 +154,7 @@ func (t *Trace) createEvent(ev tracev2.EventType, data []byte, args ...uint64) r
153154
}
154155
}
155156
return raw.Event{
156-
Version: version.Go122,
157+
Version: t.ver,
157158
Ev: ev,
158159
Args: args,
159160
Data: data,
@@ -382,7 +383,7 @@ func (b *Batch) RawEvent(typ tracev2.EventType, data []byte, args ...uint64) {
382383
// writeEventsTo emits events in the batch, including the batch header, to tw.
383384
func (b *Batch) writeEventsTo(tw *raw.TextWriter) {
384385
tw.WriteEvent(raw.Event{
385-
Version: version.Go122,
386+
Version: b.gen.trace.ver,
386387
Ev: tracev2.EvEventBatch,
387388
Args: []uint64{b.gen.gen, uint64(b.thread), uint64(b.timestamp), b.size},
388389
})

0 commit comments

Comments
 (0)