Integration tests for N1C metrics

Makefile

@@ -159,11 +159,11 @@ build-mock-management-otel-collector:
 	mkdir -p $(BUILD_DIR)/mock-management-otel-collector
 	@CGO_ENABLED=0 GOARCH=$(OSARCH) GOOS=linux $(GOBUILD) -o $(BUILD_DIR)/mock-management-otel-collector/collector test/mock/collector/mock-collector/main.go
 
-integration-test: $(SELECTED_PACKAGE) build-mock-management-plane-grpc
+integration-test: $(SELECTED_PACKAGE) build-mock-management-plane-grpc build-mock-management-otel-collector
 	TEST_ENV="Container" CONTAINER_OS_TYPE=$(CONTAINER_OS_TYPE) BUILD_TARGET="install-agent-local" CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} \
 	PACKAGES_REPO=$(OSS_PACKAGES_REPO) PACKAGE_NAME=$(PACKAGE_NAME) BASE_IMAGE=$(BASE_IMAGE) DOCKERFILE_PATH=$(DOCKERFILE_PATH) IMAGE_PATH=$(IMAGE_PATH) TAG=${IMAGE_TAG} \
 	OS_VERSION=$(OS_VERSION) OS_RELEASE=$(OS_RELEASE) \
-	go test -v ./test/integration/installuninstall ./test/integration/managementplane ./test/integration/auxiliarycommandserver ./test/integration/nginxless
+	go test -v ./test/integration/installuninstall ./test/integration/managementplane ./test/integration/auxiliarycommandserver ./test/integration/nginxless ./test/integration/metrics
 
 official-image-integration-test: $(SELECTED_PACKAGE) build-mock-management-plane-grpc
 	TEST_ENV="Container" CONTAINER_OS_TYPE=$(CONTAINER_OS_TYPE) CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} BUILD_TARGET="install" \

go.mod

@@ -36,6 +36,8 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.124.1
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.124.1
 	github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.124.1
+	github.com/prometheus/client_model v0.6.1
+	github.com/prometheus/common v0.62.0
 	github.com/shirou/gopsutil/v4 v4.25.3
 	github.com/spf13/pflag v1.0.6
 	github.com/stretchr/testify v1.10.0
@@ -202,8 +204,6 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.16.0 // indirect
 	github.com/rs/cors v1.11.1 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect

test/helpers/test_containers_utils.go

@@ -25,6 +25,13 @@ type Parameters struct {
 	LogMessage           string
 }
 
+type MockCollectorContainers struct {
+	AgentPlus  testcontainers.Container
+	AgentOSS   testcontainers.Container
+	Otel       testcontainers.Container
+	Prometheus testcontainers.Container
+}
+
 func StartContainer(
 	ctx context.Context,
 	tb testing.TB,
@@ -296,6 +303,161 @@ func StartAuxiliaryMockManagementPlaneGrpcContainer(ctx context.Context, tb test
 	return container
 }
 
+func StartMockCollectorStack(ctx context.Context, tb testing.TB,
+	containerNetwork *testcontainers.DockerNetwork, agentConfig string,
+) *MockCollectorContainers {
+	tb.Helper()
+
+	packageName := Env(tb, "PACKAGE_NAME")
+	packageRepo := Env(tb, "PACKAGES_REPO")
+	baseImage := Env(tb, "BASE_IMAGE")
+	osRelease := Env(tb, "OS_RELEASE")
+	osVersion := Env(tb, "OS_VERSION")
+	buildTarget := Env(tb, "BUILD_TARGET")
+	dockerfilePath := Env(tb, "DOCKERFILE_PATH")
+	containerRegistry := Env(tb, "CONTAINER_NGINX_IMAGE_REGISTRY")
+	tag := Env(tb, "TAG")
+	imagePath := Env(tb, "IMAGE_PATH")
+
+	agentPlus, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
+		ContainerRequest: testcontainers.ContainerRequest{
+			FromDockerfile: testcontainers.FromDockerfile{
+				Context:       "../../../",
+				Dockerfile:    "./test/docker/nginx-plus/deb/Dockerfile",
+				KeepImage:     false,
+				PrintBuildLog: true,
+				BuildArgs: map[string]*string{
+					"PACKAGE_NAME":                   ToPtr(packageName),
+					"PACKAGES_REPO":                  ToPtr(packageRepo),
+					"BASE_IMAGE":                     ToPtr(baseImage),
+					"OS_RELEASE":                     ToPtr(osRelease),
+					"OS_VERSION":                     ToPtr(osVersion),
+					"ENTRY_POINT":                    ToPtr("./test/docker/entrypoint.sh"),
+					"CONTAINER_NGINX_IMAGE_REGISTRY": ToPtr(containerRegistry),
+					"IMAGE_PATH":                     ToPtr(imagePath),
+					"TAG":                            ToPtr(tag),
+				},
+				BuildOptionsModifier: func(buildOptions *types.ImageBuildOptions) {
+					buildOptions.Target = "install-nginx"
+				},
+			},
+			Name:     "agent-with-nginx-plus",
+			Networks: []string{containerNetwork.Name},
+			Files: []testcontainers.ContainerFile{
+				{
+					HostFilePath:      agentConfig,
+					ContainerFilePath: "/etc/nginx-agent/nginx-agent.conf",
+					FileMode:          configFilePermissions,
+				},
+				{
+					HostFilePath:      "../../mock/collector/nginx-plus/nginx.conf",
+					ContainerFilePath: "/etc/nginx/nginx.conf",
+					FileMode:          configFilePermissions,
+				},
+				{
+					HostFilePath:      "../../mock/collector/nginx-plus/conf.d/default.conf",
+					ContainerFilePath: "/etc/nginx/conf.d/default.conf",
+					FileMode:          configFilePermissions,
+				},
+			},
+		},
+		Started: true,
+	})
+	require.NoError(tb, err)
+
+	agentOSS, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
+		ContainerRequest: testcontainers.ContainerRequest{
+			FromDockerfile: testcontainers.FromDockerfile{
+				Context:       "../../../",
+				Dockerfile:    dockerfilePath,
+				KeepImage:     false,
+				PrintBuildLog: true,
+				BuildArgs: map[string]*string{
+					"PACKAGE_NAME":  ToPtr(packageName),
+					"PACKAGES_REPO": ToPtr(packageRepo),
+					"BASE_IMAGE":    ToPtr(baseImage),
+					"ENTRY_POINT":   ToPtr("./test/docker/entrypoint.sh"),
+				},
+				BuildOptionsModifier: func(buildOptions *types.ImageBuildOptions) {
+					buildOptions.Target = buildTarget
+				},
+			},
+			Name:     "agent-with-nginx-oss",
+			Networks: []string{containerNetwork.Name},
+			Files: []testcontainers.ContainerFile{
+				{
+					HostFilePath:      agentConfig,
+					ContainerFilePath: "/etc/nginx-agent/nginx-agent.conf",
+					FileMode:          configFilePermissions,
+				},
+				{
+					HostFilePath:      "../../mock/collector/nginx-oss/nginx.conf",
+					ContainerFilePath: "/etc/nginx/nginx.conf",
+					FileMode:          configFilePermissions,
+				},
+				{
+					HostFilePath:      "../../mock/collector/nginx-oss/conf.d/default.conf",
+					ContainerFilePath: "/etc/nginx/conf.d/default.conf",
+					FileMode:          configFilePermissions,
+				},
+			},
+		},
+		Started: true,
+	})
+	require.NoError(tb, err)
+
+	otel, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
+		ContainerRequest: testcontainers.ContainerRequest{
+			FromDockerfile: testcontainers.FromDockerfile{
+				Context:       "../../../",
+				Dockerfile:    "./test/mock/collector/mock-collector/Dockerfile",
+				KeepImage:     false,
+				PrintBuildLog: true,
+			},
+			Name:         "otel-collector",
+			ExposedPorts: []string{"4317/tcp", "9090/tcp", "9775/tcp"},
+			Networks:     []string{containerNetwork.Name},
+			Files: []testcontainers.ContainerFile{
+				{
+					HostFilePath:      "../../mock/collector/otel-collector.yaml",
+					ContainerFilePath: "/etc/otel-collector.yaml",
+					FileMode:          configFilePermissions,
+				},
+			},
+			WaitingFor: wait.ForLog("Everything is ready. Begin running and processing data."),
+		},
+		Started: true,
+	})
+	require.NoError(tb, err)
+
+	prometheus, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
+		ContainerRequest: testcontainers.ContainerRequest{
+			Image:        "prom/prometheus:latest",
+			Name:         "prometheus",
+			ExposedPorts: []string{"9090/tcp"},
+			Networks:     []string{containerNetwork.Name},
+			Files: []testcontainers.ContainerFile{
+				{
+					HostFilePath:      "../../mock/collector/prometheus.yaml",
+					ContainerFilePath: "/etc/prometheus/prometheus.yaml",
+					FileMode:          configFilePermissions,
+				},
+			},
+			Cmd:        []string{"--config.file=/etc/prometheus/prometheus.yml"},
+			WaitingFor: wait.ForLog("Server is ready to receive web requests."),
+		},
+		Started: true,
+	})
+	require.NoError(tb, err)
+
+	return &MockCollectorContainers{
+		AgentPlus:  agentPlus,
+		AgentOSS:   agentOSS,
+		Otel:       otel,
+		Prometheus: prometheus,
+	}
+}
+
 func ToPtr[T any](value T) *T {
 	return &value
 }
@@ -359,3 +521,34 @@ func LogAndTerminateContainers(
 		require.NoError(tb, err)
 	}
 }
+
+func LogAndTerminateStack(ctx context.Context, tb testing.TB,
+	containers *MockCollectorContainers,
+) {
+	tb.Helper()
+
+	logAndTerminate := func(name string, container testcontainers.Container) {
+		if container == nil {
+			tb.Logf("Skipping log collection for %s: container is nil", name)
+			return
+		}
+
+		tb.Logf("======================== Logging %s Container Logs ========================", name)
+		logReader, err := container.Logs(ctx)
+		require.NoError(tb, err)
+
+		buf, err := io.ReadAll(logReader)
+		require.NoError(tb, err)
+		logs := string(buf)
+
+		tb.Log(logs)
+
+		err = container.Terminate(ctx)
+		require.NoError(tb, err)
+	}
+
+	logAndTerminate("agent-plus", containers.AgentPlus)
+	logAndTerminate("agent-oss", containers.AgentOSS)
+	logAndTerminate("otel", containers.Otel)
+	logAndTerminate("prometheus", containers.Prometheus)
+}