From 648c74d24363e1653f8e652af39ff7daf6e6df12 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Tue, 29 Jul 2025 12:43:43 -0700 Subject: [PATCH] Add separate const for daemon httputils to avoid jsonmessage import Signed-off-by: Derek McGowan (cherry picked from commit 02fcde0c184da53297bbd0f3530931dd1904410b) Signed-off-by: Sebastiaan van Stijn --- api/server/httputils/write_log_stream.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/api/server/httputils/write_log_stream.go b/api/server/httputils/write_log_stream.go index 5f9e43f585..1f33a3351d 100644 --- a/api/server/httputils/write_log_stream.go +++ b/api/server/httputils/write_log_stream.go @@ -11,10 +11,13 @@ import ( "github.com/docker/docker/api/types/backend" "github.com/docker/docker/api/types/container" "github.com/docker/docker/pkg/ioutils" - "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/pkg/stdcopy" ) +// rfc3339NanoFixed is time.RFC3339Nano with nanoseconds padded using zeros to +// ensure the formatted time isalways the same number of characters. +const rfc3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00" + // WriteLogStream writes an encoded byte stream of log messages from the // messages channel, multiplexing them with a stdcopy.Writer if mux is true func WriteLogStream(_ context.Context, w http.ResponseWriter, msgs <-chan *backend.LogMessage, config *container.LogsOptions, mux bool) { @@ -53,7 +56,7 @@ func WriteLogStream(_ context.Context, w http.ResponseWriter, msgs <-chan *backe logLine = append(logLine, msg.Line...) } if config.Timestamps { - logLine = append([]byte(msg.Timestamp.Format(jsonmessage.RFC3339NanoFixed)+" "), logLine...) + logLine = append([]byte(msg.Timestamp.Format(rfc3339NanoFixed)+" "), logLine...) } if msg.Source == "stdout" && config.ShowStdout { _, _ = outStream.Write(logLine)