chore: improve logs by removing repeated timestamps and using same log level (#60)

Author: leoparente

runner/runner.go

@@ -161,12 +161,9 @@ func (r *Runner) Start(ctx context.Context, cancelFunc context.CancelFunc) error
 		for scanner.Scan() {
 			line := scanner.Text()
 			r.state.LastLog = line
-			attrs := append([]slog.Attr{slog.String("policy", r.policyName)}, parseCollectorLog(line)...)
-			args := make([]any, len(attrs))
-			for i, attr := range attrs {
-				args[i] = attr
-			}
-			r.logger.Info("otelcol-contrib", args...)
+			msg, level, attrs := parseCollectorLog(line)
+			attrs = append([]slog.Attr{slog.String("policy", r.policyName)}, attrs...)
+			r.logger.LogAttrs(r.ctx, level, msg, attrs...)
 			if r.cmd.Err != nil {
 				r.errChan <- r.state.LastLog
 			}
@@ -229,25 +226,24 @@ func (r *Runner) setStatus(s status) {
 	r.state.StatusText = mapStatus[s]
 }
 
-func parseCollectorLog(line string) []slog.Attr {
+func parseCollectorLog(line string) (string, slog.Level, []slog.Attr) {
+	msg := line
+	level := slog.LevelInfo
+
 	if line == "" {
-		return nil
+		return msg, level, nil
 	}
 
 	parts := strings.SplitN(line, "\t", 5)
 	if len(parts) == 1 {
-		return []slog.Attr{slog.String("log", line)}
+		return strings.TrimSpace(msg), level, nil
 	}
 
-	attrs := make([]slog.Attr, 0, len(parts))
-
-	if ts := strings.TrimSpace(parts[0]); ts != "" {
-		attrs = append(attrs, slog.String("collector_timestamp", ts))
-	}
+	attrs := make([]slog.Attr, 0, len(parts)-1)
 
 	if len(parts) > 1 {
 		if lvl := strings.TrimSpace(parts[1]); lvl != "" {
-			attrs = append(attrs, slog.String("collector_level", lvl))
+			level = mapCollectorLevel(lvl)
 		}
 	}
 	if len(parts) > 2 {
@@ -256,13 +252,13 @@ func parseCollectorLog(line string) []slog.Attr {
 		}
 	}
 	if len(parts) > 3 {
-		if msg := strings.TrimSpace(parts[3]); msg != "" {
+		if msgPart := strings.TrimSpace(parts[3]); msgPart != "" {
+			msgBytes := []byte(msgPart)
 			var structured any
-			if err := json.Unmarshal([]byte(msg), &structured); err == nil {
+			if err := json.Unmarshal(msgBytes, &structured); err == nil {
 				attrs = append(attrs, slog.Any("collector_message", structured))
-			} else {
-				attrs = append(attrs, slog.String("collector_message", msg))
 			}
+			msg = msgPart
 		}
 	}
 	if len(parts) > 4 {
@@ -277,9 +273,20 @@ func parseCollectorLog(line string) []slog.Attr {
 		}
 	}
 
-	if len(attrs) == 0 {
-		return []slog.Attr{slog.String("log", line)}
-	}
+	return strings.TrimSpace(msg), level, attrs
+}
 
-	return attrs
+func mapCollectorLevel(level string) slog.Level {
+	switch strings.ToLower(level) {
+	case "debug":
+		return slog.LevelDebug
+	case "warn", "warning":
+		return slog.LevelWarn
+	case "error", "err":
+		return slog.LevelError
+	case "fatal":
+		return slog.LevelError
+	default:
+		return slog.LevelInfo
+	}
 }