Adding global config to enable otlp_exporter

cmd/google_cloud_ops_agent_engine/main.go

@@ -36,12 +36,12 @@ var (
 	healthChecks = flag.Bool("healthchecks", false, "run health checks and exit")
 )
 
-func runHealthChecks() {
+func runHealthChecks(ctx context.Context) {
 	logger := healthchecks.CreateHealthChecksLogger(*logsDir)
 
 	defaultLogger := logs.NewSimpleLogger()
 
-	healthCheckResults := healthchecks.HealthCheckRegistryFactory().RunAllHealthChecks(logger)
+	healthCheckResults := healthchecks.HealthCheckRegistryFactory(ctx).RunAllHealthChecks(logger)
 	healthchecks.LogHealthCheckResults(healthCheckResults, defaultLogger)
 }
 
@@ -60,6 +60,8 @@ func run() error {
 		return err
 	}
 
+	ctx = uc.ContextWithExperiments(ctx)
+
 	// Log the built-in and merged config files to STDOUT. These are then written
 	// by journald to var/log/syslog and so to Cloud Logging once the ops-agent is
 	// running.
@@ -68,7 +70,7 @@ func run() error {
 
 	switch *service {
 	case "":
-		runHealthChecks()
+		runHealthChecks(ctx)
 		log.Println("Startup checks finished")
 		if *healthChecks {
 			// If healthchecks is set, stop here

cmd/ops_agent_uap_plugin/service_windows.go

@@ -112,17 +112,20 @@ func (ps *OpsAgentPluginServer) Start(ctx context.Context, msg *pb.StartRequest)
 	}
 
 	// Subagents config validation and generation.
-	if err := generateSubAgentConfigs(ctx, OpsAgentConfigLocationWindows, pluginStateDir); err != nil {
+	uc, err := generateSubAgentConfigs(ctx, OpsAgentConfigLocationWindows, pluginStateDir)
+	if err != nil {
 		ps.cancelAndSetPluginError(&OpsAgentPluginError{
 			Message:       fmt.Sprintf("Start() failed to validate the custom Ops Agent config, and generate sub-agents config: %s", err),
 			ShouldRestart: false,
 		})
 		return &pb.StartResponse{}, nil
 	}
 
+	ctx = uc.ContextWithExperiments(ctx)
+
 	// Trigger Healthchecks.
 	healthCheckFileLogger := healthchecks.CreateHealthChecksLogger(filepath.Join(pluginStateDir, LogsDirectory))
-	runHealthChecks(healthCheckFileLogger)
+	runHealthChecks(ctx, healthCheckFileLogger)
 
 	// Create a Windows Job object and stores its handle, to ensure that all child processes are killed when the parent process exits.
 	_, err = createWindowsJobHandle()
@@ -206,18 +209,18 @@ func findPreExistentAgents(mgr serviceManager, agentWindowsServiceNames []string
 	return alreadyInstalledAgentServiceNames, nil
 }
 
-func generateSubAgentConfigs(ctx context.Context, userConfigPath string, pluginStateDir string) error {
+func generateSubAgentConfigs(ctx context.Context, userConfigPath string, pluginStateDir string) (*confgenerator.UnifiedConfig, error) {
 	uc, err := confgenerator.MergeConfFiles(ctx, userConfigPath)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	log.Printf("Built-in config:\n%s\n", confgenerator.BuiltInConfStructs["windows"])
 	log.Printf("Merged config:\n%s\n", uc)
 
 	// The generated otlp metric json files are used only by the otel service.
 	if err = self_metrics.GenerateOpsAgentSelfMetricsOTLPJSON(ctx, userConfigPath, filepath.Join(pluginStateDir, GeneratedConfigsOutDir, "otel")); err != nil {
-		return err
+		return nil, err
 	}
 
 	for _, subagent := range []string{
@@ -230,14 +233,14 @@ func generateSubAgentConfigs(ctx context.Context, userConfigPath string, pluginS
 			filepath.Join(pluginStateDir, LogsDirectory),
 			filepath.Join(pluginStateDir, RuntimeDirectory),
 			filepath.Join(pluginStateDir, GeneratedConfigsOutDir, subagent)); err != nil {
-			return err
+			return nil, err
 		}
 	}
-	return nil
+	return uc, nil
 }
 
-func runHealthChecks(healthCheckFileLogger logs.StructuredLogger) {
-	gceHealthChecks := healthchecks.HealthCheckRegistryFactory()
+func runHealthChecks(ctx context.Context, healthCheckFileLogger logs.StructuredLogger) {
+	gceHealthChecks := healthchecks.HealthCheckRegistryFactory(ctx)
 
 	// Log health check results to health-checks.log log file.
 	gceHealthChecks.RunAllHealthChecks(healthCheckFileLogger)

cmd/ops_agent_uap_plugin/service_windows_test.go

@@ -155,7 +155,8 @@ func Test_runHealthChecks_LogFileNonEmpty(t *testing.T) {
 	defer os.Remove(healthCheckLogFile.Name())
 	mockHealthCheckLogger := &mockHealthCheckLogger{logFile: healthCheckLogFile}
 
-	runHealthChecks(mockHealthCheckLogger)
+	ctx := context.Background()
+	runHealthChecks(ctx, mockHealthCheckLogger)
 
 	// Check if the log file has content
 	fileInfo, err := os.Stat(healthCheckLogFile.Name())
@@ -204,7 +205,7 @@ func Test_generateSubAgentConfigs(t *testing.T) {
 			}
 			userConfigFile.Close()
 
-			err = generateSubAgentConfigs(ctx, userConfigFile.Name(), tc.pluginStateDir)
+			_, err = generateSubAgentConfigs(ctx, userConfigFile.Name(), tc.pluginStateDir)
 			if (err != nil) != tc.wantError {
 				t.Errorf("generateSubAgentConfigs() returned error: %v, want error: %v", err, tc.wantError)
 			}

cmd/ops_agent_windows/main_windows.go

@@ -15,12 +15,14 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"log"
 	"os"
 	"path/filepath"
 
+	"github.com/GoogleCloudPlatform/ops-agent/confgenerator"
 	"github.com/GoogleCloudPlatform/ops-agent/internal/healthchecks"
 	"github.com/GoogleCloudPlatform/ops-agent/internal/logs"
 	"github.com/kardianos/osext"
@@ -63,7 +65,19 @@ func main() {
 			}
 			infoLog.Printf("uninstalled services")
 		} else if *healthChecks {
-			healthCheckResults := getHealthCheckResults()
+			ctx := context.Background()
+			base, err := osext.ExecutableFolder()
+			if err != nil {
+				log.Fatalf("failed to determine executable folder: %v", err)
+			}
+			configPath := filepath.Join(base, "../config/config.yaml")
+			uc, err := confgenerator.MergeConfFiles(ctx, configPath)
+			if err == nil {
+				ctx = uc.ContextWithExperiments(ctx)
+			} else {
+				log.Printf("failed to load config (using default experiments): %v", err)
+			}
+			healthCheckResults := getHealthCheckResults(ctx)
 			healthchecks.LogHealthCheckResults(healthCheckResults, infoLog)
 			infoLog.Println("Health checks finished")
 		} else {

cmd/ops_agent_windows/run_windows.go

@@ -53,6 +53,7 @@ type service struct {
 	log          debug.Log
 	userConf     string
 	outDirectory string
+	uc           *confgenerator.UnifiedConfig
 }
 
 func (s *service) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
@@ -75,7 +76,8 @@ func (s *service) Execute(args []string, r <-chan svc.ChangeRequest, changes cha
 		return false, 2
 	}
 	s.log.Info(EngineEventID, "generated configuration files")
-	s.runHealthChecks()
+	ctx = s.uc.ContextWithExperiments(ctx)
+	s.runHealthChecks(ctx)
 
 	changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
 	if err := s.startSubagents(); err != nil {
@@ -141,16 +143,16 @@ func (s *service) checkForStandaloneAgents(unified *confgenerator.UnifiedConfig)
 	return nil
 }
 
-func getHealthCheckResults() []healthchecks.HealthCheckResult {
+func getHealthCheckResults(ctx context.Context) []healthchecks.HealthCheckResult {
 	logsDir := filepath.Join(os.Getenv("PROGRAMDATA"), dataDirectory, "log")
-	gceHealthChecks := healthchecks.HealthCheckRegistryFactory()
+	gceHealthChecks := healthchecks.HealthCheckRegistryFactory(ctx)
 	logger := healthchecks.CreateHealthChecksLogger(logsDir)
 
 	return gceHealthChecks.RunAllHealthChecks(logger)
 }
 
-func (srv *service) runHealthChecks() {
-	healthCheckResults := getHealthCheckResults()
+func (srv *service) runHealthChecks(ctx context.Context) {
+	healthCheckResults := getHealthCheckResults(ctx)
 	logger := logs.WindowsServiceLogger{EventID: EngineEventID, Logger: srv.log}
 	healthchecks.LogHealthCheckResults(healthCheckResults, logger)
 	srv.log.Info(EngineEventID, "Startup checks finished")
@@ -162,6 +164,7 @@ func (s *service) generateConfigs(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+	s.uc = uc
 
 	s.log.Info(EngineEventID, fmt.Sprintf("Built-in config:\n%s\n", confgenerator.BuiltInConfStructs["windows"]))
 	s.log.Info(EngineEventID, fmt.Sprintf("Merged config:\n%s\n", uc))

confgenerator/confgenerator.go

@@ -207,7 +207,9 @@ func fileStorageExtension(stateDir string) otel.Component {
 }
 
 func (uc *UnifiedConfig) GenerateOtelConfig(ctx context.Context, outDir, stateDir string) (string, error) {
+	ctx = uc.ContextWithExperiments(ctx)
 	p := platform.FromContext(ctx)
+
 	userAgent, _ := p.UserAgent("Google-Cloud-Ops-Agent-Metrics")
 	metricVersionLabel, _ := p.VersionLabel("google-cloud-ops-agent-metrics")
 	loggingVersionLabel, _ := p.VersionLabel("google-cloud-ops-agent-logging")
@@ -495,7 +497,9 @@ func (uc *UnifiedConfig) generateOtelPipelines(ctx context.Context) (map[string]
 // GenerateFluentBitConfigs generates configuration file(s) for Fluent Bit.
 // It returns a map of filenames to file contents.
 func (uc *UnifiedConfig) GenerateFluentBitConfigs(ctx context.Context, logsDir string, stateDir string) (map[string]string, error) {
+	ctx = uc.ContextWithExperiments(ctx)
 	userAgent, _ := platform.FromContext(ctx).UserAgent("Google-Cloud-Ops-Agent-Logging")
+
 	components, err := uc.generateFluentbitComponents(ctx, userAgent)
 	if err != nil {
 		return nil, err

confgenerator/config.go

@@ -72,6 +72,21 @@ func (uc *UnifiedConfig) HasCombined() bool {
 	return uc.Combined != nil
 }
 
+func (uc *UnifiedConfig) ContextWithExperiments(ctx context.Context) context.Context {
+	if uc == nil {
+		return ctx
+	}
+	enabledExperiments := experiments.FromContext(ctx)
+	newExperiments := map[string]bool{}
+	for k, v := range enabledExperiments {
+		newExperiments[k] = v
+	}
+	if uc.Global.GetOtlpExporter() {
+		newExperiments["otlp_exporter"] = true
+	}
+	return experiments.ContextWithExperiments(ctx, newExperiments)
+}
+
 const (
 	ExperimentalFluentBitMetricsPortEnv = "EXPERIMENTAL_OPS_AGENT_FLUENT_BIT_METRICS_PORT"
 	ExperimentalOtelMetricsPortEnv      = "EXPERIMENTAL_OPS_AGENT_OTEL_METRICS_PORT"
@@ -875,7 +890,9 @@ type TracesService struct {
 }
 
 func (uc *UnifiedConfig) Validate(ctx context.Context) error {
+	ctx = uc.ContextWithExperiments(ctx)
 	if uc.Logging != nil {
+
 		if err := uc.ValidateLogging(); err != nil {
 			return err
 		}

confgenerator/config_global.go

@@ -17,6 +17,14 @@ package confgenerator
 type Global struct {
 	DefaultSelfLogFileCollection *bool            `yaml:"default_self_log_file_collection,omitempty"`
 	DefaultLogFileRotation       *LogFileRotation `yaml:"default_self_log_file_rotation,omitempty"`
+	OtlpExporter                 *bool            `yaml:"otlp_exporter,omitempty"`
+}
+
+func (g *Global) GetOtlpExporter() bool {
+	if g != nil && g.OtlpExporter != nil {
+		return *g.OtlpExporter
+	}
+	return false
 }
 
 // Get whether self log collection should be enabled. Defaults to true if unset.

confgenerator/confmerger.go

@@ -42,13 +42,16 @@ func MergeConfFiles(ctx context.Context, userConfPath string) (*UnifiedConfig, e
 		mergeConfigs(result, overrides)
 	}
 
+	ctx = result.ContextWithExperiments(ctx)
+
 	if err := result.Validate(ctx); err != nil {
 		return nil, err
 	}
 
 	// Ensure the merged config struct fields are valid.
 	v := newValidator()
 	if err := v.StructCtx(ctx, result); err != nil {
+
 		log.Fatalf("merged config failed to validate: %v", err)
 	}
 	return result, nil

confgenerator/feature_tracking.go

@@ -75,7 +75,9 @@ type CustomFeatures interface {
 // Automatic collection of bool or int fields. Any value that exists on tracking
 // tag will be used instead of value from UnifiedConfig.
 func ExtractFeatures(ctx context.Context, userUc, mergedUc *UnifiedConfig) ([]Feature, error) {
+	ctx = mergedUc.ContextWithExperiments(ctx)
 	allFeatures := getOverriddenDefaultPipelines(userUc)
+
 	allFeatures = append(allFeatures, getSelfLogCollection(userUc))
 	allFeatures = append(allFeatures, getOTelLoggingSupportedConfig(ctx, mergedUc))
 	allFeatures = append(allFeatures, getOtlpExporterExperimentConfig(ctx)...)

confgenerator/files.go

@@ -45,7 +45,9 @@ func ReadUnifiedConfigFromFile(ctx context.Context, path string) (*UnifiedConfig
 }
 
 func (uc *UnifiedConfig) GenerateFilesFromConfig(ctx context.Context, service, logsDir, stateDir, outDir string) error {
+	ctx = uc.ContextWithExperiments(ctx)
 	switch service {
+
 	case "": // Validate-only.
 		return nil
 	case "fluentbit":

confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/EXPERIMENTAL_FEATURES

@@ -1 +1 @@
-otlp_exporter,otlp_logging,otel_logging
+otlp_logging,otel_logging

confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/input.yaml

@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+global:
+  otlp_exporter: true
 combined:
+
   receivers:
     otlp:
       type: otlp

confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/EXPERIMENTAL_FEATURES

@@ -1 +1 @@
-otlp_exporter,otlp_logging
+otlp_logging

confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/input.yaml

@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+global:
+  otlp_exporter: true
 combined:
+
   receivers:
     otlp:
       type: otlp

confgenerator/testdata/goldens/invalid-metrics-exporter_otlphttp_invalid_processor/input.yaml

@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+global:
+  otlp_exporter: true
 metrics:
+
   processors:
     metrics_filter:
       type: exclude_metrics

confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/input.yaml

@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+global:
+  otlp_exporter: true
 metrics:
+
   receivers:
     prometheus:
         type: prometheus

confgenerator/testdata/goldens/otlp_exporter_global_config/golden/linux-gpu/0f15dbe303dc7122d43443c9a4c31632.lua

@@ -0,0 +1,28 @@
+
+function process(tag, timestamp, record)
+local v = "ops-agent";
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["agent.googleapis.com/health/agentKind"] = value
+end)(v)
+local v = "latest";
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["agent.googleapis.com/health/agentVersion"] = value
+end)(v)
+local v = "v1";
+(function(value)
+if record["logging.googleapis.com/labels"] == nil
+then
+record["logging.googleapis.com/labels"] = {}
+end
+record["logging.googleapis.com/labels"]["agent.googleapis.com/health/schemaVersion"] = value
+end)(v)
+return 2, timestamp, record
+end