From 938c6229f8f1d62bbc73edb6828f3fadec8f8837 Mon Sep 17 00:00:00 2001 From: Amir Raminfar Date: Fri, 17 Oct 2025 08:30:47 -0700 Subject: [PATCH] fix: fixes a nil pointer that was happening in the agent (#4183) --- internal/agent/server.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/agent/server.go b/internal/agent/server.go index 931d8ad7..f5634416 100644 --- a/internal/agent/server.go +++ b/internal/agent/server.go @@ -64,9 +64,11 @@ func (s *server) StreamLogs(in *pb.StreamLogsRequest, out pb.AgentService_Stream g := container.NewEventGenerator(out.Context(), dockerReader, c) for event := range g.Events { - out.Send(&pb.StreamLogsResponse{ - Event: logEventToPb(event), - }) + if event != nil { + out.Send(&pb.StreamLogsResponse{ + Event: logEventToPb(event), + }) + } } select { @@ -93,7 +95,11 @@ func (s *server) LogsBetweenDates(in *pb.LogsBetweenDatesRequest, out pb.AgentSe for { select { - case event := <-g.Events: + case event, ok := <-g.Events: + if !ok { + // Channel closed, exit cleanly + return nil + } out.Send(&pb.StreamLogsResponse{ Event: logEventToPb(event), })