chore: fix tests that fail on windows (#4878)

* Iterate on tests that fail on windows

* Update windows converter tests for promtail conversion

* only start loki wal writer after passing all error cases on NewManager

* Fix change lost in merge

* Fix some more tests

* Ensure writer is not started twice and remove unnecessary variable scoping

* skip integration tests in windows test workflow

* Try different quotes to fix windows test action

* support windows line endings for mimir test

* Revert "support windows line endings for mimir test"

This reverts commit 81446a8.

Author: dehaansa

.github/workflows/test_windows.yml

@@ -32,4 +32,4 @@ jobs:
         cache: false
     - name: Test
       run: '& "C:/Program Files/git/bin/bash.exe" -c ''go test -tags="nodocker,nonetwork,slicelabels"
-        $(go list ./... | grep -v /integration-tests/)'''
+        $(go list ./... |  grep -v -E "/integration-tests/|/integration-tests-k8s/")'''

internal/component/common/loki/client/batch_test.go

@@ -72,8 +72,6 @@ func TestBatch_add(t *testing.T) {
 	}
 
 	for testName, testData := range tests {
-		testData := testData
-
 		t.Run(testName, func(t *testing.T) {
 			b := newBatch(0)
 
@@ -122,8 +120,6 @@ func TestBatch_encode(t *testing.T) {
 	}
 
 	for testName, testData := range tests {
-		testData := testData
-
 		t.Run(testName, func(t *testing.T) {
 			t.Parallel()
 

internal/component/common/loki/client/consumer_wal.go

@@ -93,6 +93,8 @@ func NewWALConsumer(logger log.Logger, reg prometheus.Registerer, walCfg wal.Con
 		})
 	}
 
+	writer.Start(walCfg.MaxSegmentAge)
+
 	return m, nil
 }
 

internal/component/common/loki/wal/writer.go

@@ -109,11 +109,10 @@ func NewWriter(walCfg Config, logger log.Logger, reg prometheus.Registerer) (*Wr
 		_ = reg.Register(wrt.lastWrittenTimestamp)
 	}
 
-	wrt.start(walCfg.MaxSegmentAge)
 	return wrt, nil
 }
 
-func (wrt *Writer) start(maxSegmentAge time.Duration) {
+func (wrt *Writer) Start(maxSegmentAge time.Duration) {
 	// main WAL writer routine
 	wrt.wg.Go(func() {
 		for e := range wrt.entries {

internal/component/common/loki/wal/writer_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"sync"
 	"testing"
 	"time"
 
@@ -31,6 +32,7 @@ func TestWriter_EntriesAreWrittenToWAL(t *testing.T) {
 		writer.Stop()
 	}()
 	// write entries to wal and sync
+	writer.Start(time.Minute)
 
 	var testLabels = model.LabelSet{
 		"testing": "log",
@@ -84,15 +86,21 @@ func TestWriter_OldSegmentsAreCleanedUp(t *testing.T) {
 		MaxSegmentAge: maxSegmentAge,
 	}, logger, prometheus.NewRegistry())
 	require.NoError(t, err)
+	writer.Start(maxSegmentAge)
 	defer func() {
 		writer.Stop()
 	}()
 
+	notificationMutex := sync.Mutex{}
 	// add writer events subscriber. Add multiple to test fanout
 	writer.SubscribeCleanup(notifySegmentsCleanedFunc(func(num int) {
+		notificationMutex.Lock()
+		defer notificationMutex.Unlock()
 		subscriber1 = append(subscriber1, num)
 	}))
 	writer.SubscribeCleanup(notifySegmentsCleanedFunc(func(num int) {
+		notificationMutex.Lock()
+		defer notificationMutex.Unlock()
 		subscriber2 = append(subscriber2, num)
 	}))
 
@@ -144,12 +152,14 @@ func TestWriter_OldSegmentsAreCleanedUp(t *testing.T) {
 	require.Error(t, err)
 	require.ErrorIs(t, err, os.ErrNotExist, "expected file not exists error")
 
+	notificationMutex.Lock()
 	// assert all subscribers were notified
 	require.Len(t, subscriber1, 1, "expected one segment reclaimed notification in subscriber1")
 	require.Equal(t, 0, subscriber1[0])
 
 	require.Len(t, subscriber2, 1, "expected one segment reclaimed notification in subscriber2")
 	require.Equal(t, 0, subscriber2[0])
+	notificationMutex.Unlock()
 
 	// Expect last, or "head" segment to still be alive
 	_, err = os.Stat(filepath.Join(dir, "00000001"))
@@ -170,6 +180,7 @@ func TestWriter_NoSegmentIsCleanedUpIfTheresOnlyOne(t *testing.T) {
 		MaxSegmentAge: maxSegmentAge,
 	}, logger, prometheus.NewRegistry())
 	require.NoError(t, err)
+	writer.Start(maxSegmentAge)
 	defer func() {
 		writer.Stop()
 	}()
@@ -299,6 +310,7 @@ func benchWriteEntries(b *testing.B, lines, labelSetCount int) {
 		MaxSegmentAge: time.Minute,
 	}, logger, prometheus.NewRegistry())
 	require.NoError(b, err)
+	writer.Start(time.Minute)
 	defer func() {
 		writer.Stop()
 	}()

internal/component/loki/source/file/file_test.go

@@ -513,10 +513,9 @@ func TestDeleteRecreateFile(t *testing.T) {
 		defer cancel()
 
 		// Create file to log to.
-		f, err := os.Create("example")
+		dir := t.TempDir()
+		f, err := os.Create(filepath.Join(dir, "example"))
 		require.NoError(t, err)
-		defer os.Remove(f.Name())
-		defer f.Close()
 
 		ctrl, err := componenttest.NewControllerFromID(logging.NewNop(), "loki.source.file")
 		require.NoError(t, err)
@@ -542,9 +541,7 @@ func TestDeleteRecreateFile(t *testing.T) {
 
 		filename := model.LabelValue(f.Name())
 		if match.Enabled {
-			dir, err := os.Getwd()
-			require.NoError(t, err)
-			filename = model.LabelValue(filepath.Join(dir, f.Name()))
+			filename = model.LabelValue(filepath.Join(dir, "example"))
 		}
 
 		wantLabelSet := model.LabelSet{
@@ -559,10 +556,13 @@ func TestDeleteRecreateFile(t *testing.T) {
 
 		// Create a file with the same name. Use eventually because of Windows FS can deny access if this test runs too fast.
 		require.EventuallyWithT(t, func(collect *assert.CollectT) {
-			f, err = os.Create("example")
+			f, err = os.Create(filepath.Join(dir, "example"))
 			assert.NoError(collect, err)
 		}, 30*time.Second, 100*time.Millisecond)
 
+		defer os.Remove(f.Name())
+		defer f.Close()
+
 		_, err = f.Write([]byte("writing some new text\n"))
 		require.NoError(t, err)
 

internal/converter/internal/staticconvert/testdata_windows/promtail_prom.alloy

@@ -57,18 +57,18 @@ discovery.relabel "logs_name_jobName" {
 	}
 }
 
-local.file_match "logs_name_jobName" {
-	path_targets = discovery.relabel.logs_name_jobName.output
-}
-
 loki.source.file "logs_name_jobName" {
-	targets    = local.file_match.logs_name_jobName.targets
+	targets    = discovery.relabel.logs_name_jobName.output
 	forward_to = [loki.write.logs_name.receiver]
 
 	file_watch {
 		min_poll_frequency = "1s"
 		max_poll_frequency = "5s"
 	}
+
+	file_match {
+		enabled = true
+	}
 	legacy_positions_file = "\\path\\name.yml"
 }
 
@@ -109,18 +109,18 @@ discovery.relabel "logs_name2_jobName" {
 	}
 }
 
-local.file_match "logs_name2_jobName" {
-	path_targets = discovery.relabel.logs_name2_jobName.output
-}
-
 loki.source.file "logs_name2_jobName" {
-	targets    = local.file_match.logs_name2_jobName.targets
+	targets    = discovery.relabel.logs_name2_jobName.output
 	forward_to = [loki.write.logs_name2.receiver]
 
 	file_watch {
 		min_poll_frequency = "1s"
 		max_poll_frequency = "5s"
 	}
+
+	file_match {
+		enabled = true
+	}
 	legacy_positions_file = "\\path\\name2.yml"
 }