integration-tests: Always run down and use stable network name (grafana#4213)

* Make sure we cannot leave the containers running and use a stable network name

* Make sure unix test can pass on mac and should be skipped on windows

Author: kgeckhart

internal/cmd/integration-tests/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -42,18 +41,25 @@ func runIntegrationTests(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	compose, err := tc.NewDockerCompose("./docker-compose.yaml")
+	compose, err := tc.NewDockerComposeWith(tc.WithStackFiles("./docker-compose.yaml"), tc.StackIdentifier("alloy-integration-tests"))
 	if err != nil {
 		panic(fmt.Errorf("failed to parse the docker compose file: %v", err))
 	}
 
-	ctx := context.Background()
+	ctx := cmd.Context()
+
 	fmt.Println("Start test containers with docker compose config")
-	err = compose.Up(ctx)
-	if err != nil {
+	if err = compose.Up(ctx, tc.Wait(true), tc.RemoveOrphans(true)); err != nil {
 		panic(fmt.Errorf("could not start the docker compose: %v", err))
 	}
-	defer compose.Down(context.Background(), tc.RemoveImagesAll)
+
+	defer func() {
+		fmt.Println("Stop test containers with docker compose config")
+		err := compose.Down(ctx, tc.RemoveImagesAll)
+		if err != nil {
+			panic(fmt.Errorf("could not remove the docker compose: %v", err))
+		}
+	}()
 
 	fmt.Println("Sleep for 10 seconds to ensure that the env has time to initialize...")
 	time.Sleep(10 * time.Second)

internal/cmd/integration-tests/tests/unix/unix_metrics_test.go

@@ -1,13 +1,14 @@
 package main
 
 import (
+	"runtime"
 	"testing"
 
 	"github.com/grafana/alloy/internal/cmd/integration-tests/common"
 )
 
 func TestUnixMetrics(t *testing.T) {
-	var unixMetrics = []string{
+	var expectedMetrics = []string{
 		"node_arp_entries",
 		"node_boot_time_seconds",
 		"node_context_switches_total",
@@ -43,11 +44,6 @@ func TestUnixMetrics(t *testing.T) {
 		"node_memory_CommitLimit_bytes",
 		"node_memory_Committed_AS_bytes",
 		"node_memory_Dirty_bytes",
-		"node_memory_HugePages_Free",
-		"node_memory_HugePages_Rsvd",
-		"node_memory_HugePages_Surp",
-		"node_memory_HugePages_Total",
-		"node_memory_Hugepagesize_bytes",
 		"node_memory_Inactive_anon_bytes",
 		"node_memory_Inactive_bytes",
 		"node_memory_Inactive_file_bytes",
@@ -154,5 +150,19 @@ func TestUnixMetrics(t *testing.T) {
 		"node_vmstat_pswpin",
 		"node_vmstat_pswpout",
 	}
-	common.MimirMetricsTest(t, unixMetrics, []string{}, "unix_metrics")
+
+	switch runtime.GOOS {
+	case "windows":
+		t.Skip("Skipping Unix metrics test on Windows")
+	// darwin does not support hugepages (aka super pages on mac), so we only add them for linux
+	case "linux":
+		expectedMetrics = append(expectedMetrics,
+			"node_memory_HugePages_Free",
+			"node_memory_HugePages_Rsvd",
+			"node_memory_HugePages_Surp",
+			"node_memory_HugePages_Total",
+			"node_memory_Hugepagesize_bytes")
+	}
+
+	common.MimirMetricsTest(t, expectedMetrics, []string{}, "unix_metrics")
 }

internal/cmd/integration-tests/utils.go

@@ -14,8 +14,6 @@ import (
 	"sync"
 
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
@@ -183,14 +181,8 @@ func runSingleTest(ctx context.Context, testDir string, port int) {
 		}
 	}()
 
-	// Get network name
-	networkName, err := getTestcontainersNetworkName(ctx)
-	if err != nil {
-		panic(fmt.Sprintf("failed to get Testcontainers network name: %v", err))
-	}
-
 	// Create container request
-	req := createContainerRequest(dirName, port, networkName, containerFiles)
+	req := createContainerRequest(dirName, port, "alloy-integration-tests_integration-tests", containerFiles)
 
 	// Start container
 	alloyContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
@@ -266,7 +258,6 @@ func reportResults() {
 
 	if testsFailed > 0 {
 		fmt.Printf("%d tests failed!\n", testsFailed)
-		os.Exit(1)
 	} else {
 		fmt.Println("All integration tests passed!")
 	}
@@ -293,24 +284,3 @@ func collectFiles(root string) ([]fileInfo, error) {
 	})
 	return filesToAdd, err
 }
-
-func getTestcontainersNetworkName(ctx context.Context) (string, error) {
-	cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-	if err != nil {
-		return "", fmt.Errorf("failed to create Docker client: %v", err)
-	}
-	defer cli.Close()
-
-	networks, err := cli.NetworkList(ctx, network.ListOptions{})
-	if err != nil {
-		return "", fmt.Errorf("failed to list networks: %v", err)
-	}
-
-	for _, network := range networks {
-		if strings.HasSuffix(network.Name, "_integration-tests") {
-			return network.Name, nil
-		}
-	}
-
-	return "", fmt.Errorf("could not find Testcontainers network")
-}