From 97b8c53dff93d3ef322017ab76755d2513c46c95 Mon Sep 17 00:00:00 2001
From: "Theodor S. Midtlien" <theodor@midtlien.com>
Date: Wed, 20 May 2026 11:21:35 +0200
Subject: [PATCH] Add uncompressed logrotate files to bundle

---
 client/internal/debug/debug.go | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/client/internal/debug/debug.go b/client/internal/debug/debug.go
index 6e82d9325..a5136334b 100644
--- a/client/internal/debug/debug.go
+++ b/client/internal/debug/debug.go
@@ -1052,7 +1052,18 @@ func (g *BundleGenerator) addRotatedLogFiles(logDir string) {
 	}
 
 	if len(files) == 0 {
-		return
+		// We assume that logrotate is configured with nocompress.
+		// This regex will match plain logs rotated by logrotate on linux.
+		pattern := filepath.Join(logDir, "client*.log.*")
+		uncompressedFiles, err := filepath.Glob(pattern)
+		if err != nil {
+			log.Warnf("failed to glob rotated logs: %v", err)
+			return
+		}
+		if len(files) == 0 {
+			return
+		}
+		files = uncompressedFiles
 	}
 
 	// sort files by modification time (newest first)
@@ -1077,7 +1088,12 @@ func (g *BundleGenerator) addRotatedLogFiles(logDir string) {
 
 	for i := 0; i < maxFiles; i++ {
 		name := filepath.Base(files[i])
-		if err := g.addSingleLogFileGz(files[i], name); err != nil {
+		if strings.HasSuffix(name, ".gz") {
+			err = g.addSingleLogFileGz(files[i], name)
+		} else {
+			err = g.addSingleLogfile(files[i], name)
+		}
+		if err != nil {
 			log.Warnf("failed to add rotated log %s: %v", name, err)
 		}
 	}