From 4aa315a4713517db967d774143d4e1fdca8d4c7f Mon Sep 17 00:00:00 2001 From: Amir Raminfar Date: Tue, 23 Jul 2024 21:52:46 -0700 Subject: [PATCH] fix: fixes first few lines not showing up. fixes #3139 (#3142) --- internal/docker/client.go | 2 +- internal/docker/client_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/docker/client.go b/internal/docker/client.go index e08961b3..b84cbd7a 100644 --- a/internal/docker/client.go +++ b/internal/docker/client.go @@ -323,7 +323,7 @@ func (d *httpClient) ContainerStats(ctx context.Context, id string, stats chan<- func (d *httpClient) ContainerLogs(ctx context.Context, id string, since time.Time, stdType StdType) (io.ReadCloser, error) { log.WithField("id", id).WithField("since", since).WithField("stdType", stdType).Debug("streaming logs for container") - sinceQuery := since.Add(time.Millisecond).Format(time.RFC3339Nano) + sinceQuery := since.Add(-50 * time.Millisecond).Format(time.RFC3339Nano) options := container.LogsOptions{ ShowStdout: stdType&STDOUT != 0, ShowStderr: stdType&STDERR != 0, diff --git a/internal/docker/client_test.go b/internal/docker/client_test.go index ce4de01e..422304b0 100644 --- a/internal/docker/client_test.go +++ b/internal/docker/client_test.go @@ -156,7 +156,7 @@ func Test_dockerClient_ContainerLogs_happy(t *testing.T) { Follow: true, Tail: "100", Timestamps: true, - Since: "2021-01-01T00:00:00.001Z"} + Since: "2020-12-31T23:59:59.95Z"} proxy.On("ContainerLogs", mock.Anything, id, options).Return(reader, nil) client := &httpClient{proxy, filters.NewArgs(), Host{ID: "localhost"}, system.Info{}}