qlog: implement a minimal jsontext-like JSON encoder (#5353)

* qlog: use fork of encoding/json/jsontext instead of unmaintained gojay

* implement a minimal jsontext-compatible encoder

* qlogtext: improve fuzz test

* qlog: simplify JSON encoding error handling

* qlog: make use of jsontext.Bool
This commit is contained in:
Marten Seemann
2025-10-06 12:48:40 +08:00
committed by GitHub
parent 7c1ce0efe2
commit e6d5d960e3
14 changed files with 1714 additions and 637 deletions

View File

@@ -6,7 +6,8 @@ import (
"testing"
"time"
"github.com/francoispqt/gojay"
"github.com/quic-go/quic-go/qlog/jsontext"
"github.com/stretchr/testify/require"
)
@@ -14,17 +15,27 @@ type mevent struct{}
var _ eventDetails = mevent{}
func (mevent) Name() string { return "foobar:mevent" }
func (mevent) IsNil() bool { return false }
func (mevent) MarshalJSONObject(enc *gojay.Encoder) { enc.StringKey("event", "details") }
func (mevent) Name() string { return "foobar:mevent" }
func (mevent) Encode(enc *jsontext.Encoder) error {
if err := enc.WriteToken(jsontext.BeginObject); err != nil {
return err
}
if err := enc.WriteToken(jsontext.String("event")); err != nil {
return err
}
if err := enc.WriteToken(jsontext.String("details")); err != nil {
return err
}
return enc.WriteToken(jsontext.EndObject)
}
func TestEventMarshaling(t *testing.T) {
buf := &bytes.Buffer{}
enc := gojay.NewEncoder(buf)
err := enc.Encode(event{
enc := jsontext.NewEncoder(buf)
err := (event{
RelativeTime: 1337 * time.Microsecond,
eventDetails: mevent{},
})
}).Encode(enc)
require.NoError(t, err)
var decoded map[string]any