Add E2E test

Author: evan-bradley

cmd/opampsupervisor/e2e_test.go

@@ -617,12 +617,38 @@ func TestSupervisorConfiguresCapabilities(t *testing.T) {
 }
 
 func TestSupervisorBootstrapsCollector(t *testing.T) {
+	tests := []struct {
+		name     string
+		cfg      string
+		env      []string
+		precheck func(t *testing.T)
+	}{
+		{
+			name: "With service.AllowNoPipelines",
+			cfg:  "nocap",
+		},
+		{
+			name: "Without service.AllowNoPipelines",
+			cfg:  "no_fg",
+			env: []string{
+				"COLLECTOR_BIN=../../bin/otelcontribcol_" + runtime.GOOS + "_" + runtime.GOARCH,
+			},
+			precheck: func(t *testing.T) {
+				if runtime.GOOS == "windows" {
+					t.Skip("This test requires a shell script, which may not be supported by Windows")
+				}
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
 	agentDescription := atomic.Value{}
 
 	// Load the Supervisor config so we can get the location of
 	// the Collector that will be run.
 	var cfg config.Supervisor
-	cfgFile := getSupervisorConfig(t, "nocap", map[string]string{})
+			cfgFile := getSupervisorConfig(t, tt.cfg, map[string]string{})
 	k := koanf.New("::")
 	err := k.Load(file.Provider(cfgFile.Name()), yaml.Parser())
 	require.NoError(t, err)
@@ -637,7 +663,14 @@ func TestSupervisorBootstrapsCollector(t *testing.T) {
 	// information will be used as defaults for the telemetry
 	// attributes.
 	agentPath := cfg.Agent.Executable
-	componentsInfo, err := exec.Command(agentPath, "components").Output()
+			t.Log(agentPath)
+			wd, _ := os.Getwd()
+			t.Log(wd)
+			cmd := exec.Command(agentPath, "components")
+			for _, env := range tt.env {
+				cmd.Env = append(cmd.Env, env)
+			}
+			componentsInfo, err := cmd.Output()
 	require.NoError(t, err)
 	k = koanf.New("::")
 	err = k.Load(rawbytes.Provider(componentsInfo), yaml.Parser())
@@ -688,6 +721,8 @@ func TestSupervisorBootstrapsCollector(t *testing.T) {
 		// binary.
 		return agentName == command && agentVersion == version
 	}, 5*time.Second, 250*time.Millisecond)
+		})
+	}
 }
 
 func TestSupervisorBootstrapsCollectorAvailableComponents(t *testing.T) {

cmd/opampsupervisor/supervisor/supervisor.go

@@ -386,7 +386,8 @@ func (s *Supervisor) getFeatureGates() error {
 		return err
 	}
 
-	stdout, _, err := cmd.StartOneShot()
+	stdout, stderr, err := cmd.StartOneShot()
+	fmt.Println(stdout, stderr)
 	if err != nil {
 		return err
 	}

cmd/opampsupervisor/testdata/collector/no_pipelines_fg.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+${COLLECTOR_BIN} "$@" | grep -v "service.AllowNoPipelines"

cmd/opampsupervisor/testdata/supervisor/supervisor_no_fg.yaml

@@ -0,0 +1,20 @@
+server:
+  endpoint: ws://{{.url}}/v1/opamp
+
+capabilities:
+  reports_available_components: false
+  reports_effective_config: false
+  reports_own_metrics: false
+  reports_own_logs: false
+  reports_own_traces: false
+  reports_health: false
+  accepts_remote_config: false
+  reports_remote_config: false
+
+storage:
+  directory: '{{.storage_dir}}'
+
+agent:
+  executable: ./testdata/collector/no_pipelines_fg.sh
+  env:
+    COLLECTOR_BIN: ../../bin/otelcontribcol_{{.goos}}_{{.goarch}}{{.extension}}