From 96ab48eb7d8ac3cd1337a5f66565ea8019c72e48 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 17 Nov 2023 07:06:42 +0100 Subject: [PATCH] fix serialization of connection ID in filenames of qlog files (#4170) --- README.md | 2 +- example/client/main.go | 2 +- example/main.go | 2 +- integrationtests/tools/qlog.go | 2 +- interop/utils/logging.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 71f857ac2..cfb4e6123 100644 --- a/README.md +++ b/README.md @@ -192,7 +192,7 @@ quic.Config{ if p == logging.PerspectiveClient { role = "client" } - filename := fmt.Sprintf("./log_%x_%s.qlog", connID, role) + filename := fmt.Sprintf("./log_%s_%s.qlog", connID, role) f, err := os.Create(filename) // handle the error return qlog.NewConnectionTracer(f, p, connID) diff --git a/example/client/main.go b/example/client/main.go index 5b86faa37..847acb724 100644 --- a/example/client/main.go +++ b/example/client/main.go @@ -59,7 +59,7 @@ func main() { var qconf quic.Config if *enableQlog { qconf.Tracer = func(ctx context.Context, p logging.Perspective, connID quic.ConnectionID) *logging.ConnectionTracer { - filename := fmt.Sprintf("client_%x.qlog", connID) + filename := fmt.Sprintf("client_%s.qlog", connID) f, err := os.Create(filename) if err != nil { log.Fatal(err) diff --git a/example/main.go b/example/main.go index c2fb574d4..cd476e44e 100644 --- a/example/main.go +++ b/example/main.go @@ -164,7 +164,7 @@ func main() { quicConf := &quic.Config{} if *enableQlog { quicConf.Tracer = func(ctx context.Context, p logging.Perspective, connID quic.ConnectionID) *logging.ConnectionTracer { - filename := fmt.Sprintf("server_%x.qlog", connID) + filename := fmt.Sprintf("server_%s.qlog", connID) f, err := os.Create(filename) if err != nil { log.Fatal(err) diff --git a/integrationtests/tools/qlog.go b/integrationtests/tools/qlog.go index ea37456e8..049432cc6 100644 --- a/integrationtests/tools/qlog.go +++ b/integrationtests/tools/qlog.go @@ -20,7 +20,7 @@ func NewQlogger(logger io.Writer) func(context.Context, logging.Perspective, qui if p == logging.PerspectiveClient { role = "client" } - filename := fmt.Sprintf("log_%x_%s.qlog", connID.Bytes(), role) + filename := fmt.Sprintf("log_%s_%s.qlog", connID, role) fmt.Fprintf(logger, "Creating %s.\n", filename) f, err := os.Create(filename) if err != nil { diff --git a/interop/utils/logging.go b/interop/utils/logging.go index 3cb42244b..fa076ef47 100644 --- a/interop/utils/logging.go +++ b/interop/utils/logging.go @@ -39,7 +39,7 @@ func NewQLOGConnectionTracer(_ context.Context, p logging.Perspective, connID qu log.Fatalf("failed to create qlog dir %s: %v", qlogDir, err) } } - path := fmt.Sprintf("%s/%x.qlog", strings.TrimRight(qlogDir, "/"), connID) + path := fmt.Sprintf("%s/%s.qlog", strings.TrimRight(qlogDir, "/"), connID) f, err := os.Create(path) if err != nil { log.Printf("Failed to create qlog file %s: %s", path, err.Error())