From b32a3e845cdf01c616bf564cb017209355ef6854 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 7 Jun 2023 15:04:39 +0200 Subject: [PATCH 1/2] Skipped malformed docker-compose log lines --- internal/stack/parselogs.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/stack/parselogs.go b/internal/stack/parselogs.go index 6b8557e2f0..a34e544995 100644 --- a/internal/stack/parselogs.go +++ b/internal/stack/parselogs.go @@ -7,10 +7,11 @@ package stack import ( "bufio" "encoding/json" - "fmt" "os" "strings" "time" + + "github.com/elastic/elastic-package/internal/logger" ) type ParseLogsOptions struct { @@ -41,7 +42,8 @@ func ParseLogs(options ParseLogsOptions, process func(log LogLine) error) error messageSlice := strings.SplitN(line, "|", 2) if len(messageSlice) != 2 { - return fmt.Errorf("malformed docker-compose log line") + logger.Debugf("skipped malformed docker-compose log line: %s", line) + continue } messageLog := messageSlice[1] From 76a357e6d7465782cfa8382ab4dc9fd84d96643c Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Thu, 8 Jun 2023 11:59:00 +0200 Subject: [PATCH 2/2] Add more context to comment --- internal/stack/parselogs.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/stack/parselogs.go b/internal/stack/parselogs.go index a34e544995..81c5ecff54 100644 --- a/internal/stack/parselogs.go +++ b/internal/stack/parselogs.go @@ -56,6 +56,8 @@ func ParseLogs(options ParseLogsOptions, process func(log LogLine) error) error } // There could be valid messages with just plain text without timestamp + // and therefore not processed, cannot be ensured in which timestamp they + // were generated if !startProcessing && log.Timestamp.Before(options.StartTime) { continue }