remove ENABLE_BEATS_RECEIVERS, add AGENT_MONITORING_RUNTIME_EXPERIMENTAL

Author: mauri870

internal/pkg/agent/application/application.go

@@ -163,7 +163,7 @@ func New(
 
 	var configMgr coordinator.ConfigManager
 	var managed *managedConfigManager
-	var compModifiers = []coordinator.ComponentsModifier{InjectAPMConfig, EnableBeatsReceivers()}
+	var compModifiers = []coordinator.ComponentsModifier{InjectAPMConfig}
 	var composableManaged bool
 	var isManaged bool
 	var actionAcker acker.Acker

internal/pkg/agent/application/beats_receivers_modifier.go

@@ -149,10 +149,9 @@ be used when the same credentials will be used across all the possible actions a
   ELASTIC_AGENT_TAGS - user provided tags for the agent [linux,staging]
 
 * Beats Receivers
-  This enables the Beats Receivers for supported components.
+  The following experimental environment variables can be set to enable using Beats Receivers.
 
-  ENABLE_BEATS_RECEIVERS - Set to 1 to enable the Beats Receivers for supported components in the policy.
-  ENABLE_BEATS_RECEIVERS_MONITORING - Set to 1 to enable using Beats Receivers for self-monitoring.
+  AGENT_MONITORING_RUNTIME_EXPERIMENTAL - Set to either "process" or "otel" to enable the respective runtime for the monitoring components.
 
 * Elastic-Agent event logging
   If EVENTS_TO_STDERR is set to true log entries containing event data or whole raw events will be logged to stderr alongside
@@ -827,13 +826,10 @@ func containerCfgOverrides(cfg *configuration.Configuration) {
 		cfg.Settings.EventLoggingConfig.ToStderr = true
 	}
 
-	enableBeatsReceiversMonitoringEnv := envWithDefault("false", "ENABLE_BEATS_RECEIVERS_MONITORING")
-	enableBeatsReceiversMonitoring, err := strconv.ParseBool(enableBeatsReceiversMonitoringEnv)
-	if err != nil {
-		logp.Warn("cannot parse ENABLE_BEATS_RECEIVERS_MONITORING='%s' as boolean, using default monitoring runtime", enableBeatsReceiversMonitoringEnv)
-	}
-	if enableBeatsReceiversMonitoring {
-		cfg.Settings.MonitoringConfig.RuntimeManager = string(component.OtelRuntimeManager)
+	agentMonitoringRuntimeEnv := envWithDefault("false", "AGENT_MONITORING_RUNTIME_EXPERIMENTAL")
+	switch agentMonitoringRuntimeEnv {
+	case string(monitoringCfg.OtelRuntimeManager), string(monitoringCfg.ProcessRuntimeManager):
+		cfg.Settings.MonitoringConfig.RuntimeManager = agentMonitoringRuntimeEnv
 	}
 
 	configuration.OverrideDefaultContainerGRPCPort(cfg.Settings.GRPC)

internal/pkg/agent/application/beats_receivers_modifier_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/elastic/elastic-agent/internal/pkg/agent/storage"
 	"github.com/elastic/elastic-agent/internal/pkg/cli"
 	"github.com/elastic/elastic-agent/internal/pkg/config"
+	monitoringCfg "github.com/elastic/elastic-agent/internal/pkg/core/monitoring/config"
 	"github.com/elastic/elastic-agent/internal/pkg/crypto"
 	"github.com/elastic/elastic-agent/internal/pkg/fleetapi/client"
 	"github.com/elastic/elastic-agent/internal/pkg/remote"
@@ -68,48 +69,38 @@ func TestEnvTimeout(t *testing.T) {
 	require.Equal(t, time.Second*10, res)
 }
 
-func TestContainerCfgOverrides_EnableBeatsReceiversMonitoring(t *testing.T) {
+func TestContainerCfgOverrides_AgentMonitoringRuntimeExperimental(t *testing.T) {
 	tests := []struct {
 		name     string
 		envValue string
 		expected string
 	}{
 		{
-			name:     "enabled",
-			envValue: "true",
-			expected: "otel",
+			name:     "otel",
+			envValue: "otel",
+			expected: string(monitoringCfg.OtelRuntimeManager),
 		},
 		{
-			name:     "enabled with 1",
-			envValue: "1",
-			expected: "otel",
+			name:     "process",
+			envValue: "process",
+			expected: string(monitoringCfg.ProcessRuntimeManager),
 		},
 		{
-			name:     "disabled",
-			envValue: "false",
-			expected: "",
-		},
-		{
-			name:     "disabled with 0",
-			envValue: "0",
-			expected: "",
+			name:     "invalid",
+			envValue: "invalid",
+			expected: string(monitoringCfg.DefaultRuntimeManager),
 		},
 		{
-			name:     "not set",
+			name:     "empty",
 			envValue: "",
-			expected: "",
-		},
-		{
-			name:     "invalid value",
-			envValue: "invalid",
-			expected: "",
+			expected: string(monitoringCfg.DefaultRuntimeManager),
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if tt.envValue != "" {
-				t.Setenv("ENABLE_BEATS_RECEIVERS_MONITORING", tt.envValue)
+				t.Setenv("AGENT_MONITORING_RUNTIME_EXPERIMENTAL", tt.envValue)
 			}
 
 			cfg := &configuration.Configuration{