aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Hillegeer <aktau@google.com>2024-02-22 13:50:47 -0800
committerGopher Robot <gobot@golang.org>2024-02-22 22:21:26 +0000
commitd892cb496a30ec274ee87f3cd0cf6bb7ac682ab3 (patch)
tree2b0f72e30b0d265f43b18723519e8cd2cf1dd2b0
parentdb57e5a040922c9cd1dac26ebc0b48f310f84095 (diff)
downloadgo-d892cb496a30ec274ee87f3cd0cf6bb7ac682ab3.tar.xz
internal/trace/v2: make readBatch param more permissive
This function is copied to x/exp/trace. In https://go.dev/cl/566255 a change is made where the source is a bytes.Reader instead of a bufio.Reader from one of the two callers. Change the prototype here instead of diverging the implementations. Change-Id: I594224663996eadbc8c388442d68ac5706c52c8e Reviewed-on: https://go-review.googlesource.com/c/go/+/566236 Auto-Submit: Michael Knyszek <mknyszek@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Michael Knyszek <mknyszek@google.com>
-rw-r--r--src/internal/trace/v2/batch.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/internal/trace/v2/batch.go b/src/internal/trace/v2/batch.go
index 899eb0f59b..d7afc06eec 100644
--- a/src/internal/trace/v2/batch.go
+++ b/src/internal/trace/v2/batch.go
@@ -5,7 +5,6 @@
package trace
import (
- "bufio"
"bytes"
"encoding/binary"
"fmt"
@@ -43,7 +42,10 @@ func (b *batch) isFreqBatch() bool {
}
// readBatch reads the next full batch from r.
-func readBatch(r *bufio.Reader) (batch, uint64, error) {
+func readBatch(r interface {
+ io.Reader
+ io.ByteReader
+}) (batch, uint64, error) {
// Read batch header byte.
b, err := r.ReadByte()
if err != nil {