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(otlpExporterEnabled bool) {
 	logger := healthchecks.CreateHealthChecksLogger(*logsDir)
 
 	defaultLogger := logs.NewSimpleLogger()
 
-	healthCheckResults := healthchecks.HealthCheckRegistryFactory().RunAllHealthChecks(logger)
+	healthCheckResults := healthchecks.HealthCheckRegistryFactory(otlpExporterEnabled).RunAllHealthChecks(logger)
 	healthchecks.LogHealthCheckResults(healthCheckResults, defaultLogger)
 }
 
@@ -59,7 +59,6 @@ func run() error {
 	if err != nil {
 		return err
 	}
-
 	// 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 +67,7 @@ func run() error {
 
 	switch *service {
 	case "":
-		runHealthChecks()
+		runHealthChecks(uc.Global.GetOtlpExporter())
 		log.Println("Startup checks finished")
 		if *healthChecks {
 			// If healthchecks is set, stop here

cmd/ops_agent_uap_plugin/plugin.go

@@ -241,8 +241,8 @@ func writeCustomConfigToFile(req *pb.StartRequest, configPath string) error {
 	return nil
 }
 
-func runHealthChecks(healthCheckFileLogger logs.StructuredLogger) {
-	gceHealthChecks := healthchecks.HealthCheckRegistryFactory()
+func runHealthChecks(healthCheckFileLogger logs.StructuredLogger, otlpExporterEnabled bool) {
+	gceHealthChecks := healthchecks.HealthCheckRegistryFactory(otlpExporterEnabled)
 
 	// Log health check results to health-checks.log log file.
 	gceHealthChecks.RunAllHealthChecks(healthCheckFileLogger)

cmd/ops_agent_uap_plugin/service_linux.go

@@ -103,14 +103,15 @@ func (ps *OpsAgentPluginServer) Start(ctx context.Context, msg *pb.StartRequest)
 	}
 
 	// Ops Agent config validation
-	if err := validateOpsAgentConfig(pContext, OpsAgentConfigLocationLinux); err != nil {
+	uc, err := validateOpsAgentConfig(pContext, OpsAgentConfigLocationLinux)
+	if err != nil {
 		ps.cancelAndSetPluginError(&OpsAgentPluginError{Message: fmt.Sprintf("Start() failed to validate the custom Ops Agent config: %s", err), ShouldRestart: false})
 		return &pb.StartResponse{}, nil
 	}
 
 	// Trigger Healthchecks.
 	healthCheckFileLogger := healthchecks.CreateHealthChecksLogger(filepath.Join(pluginStateDir, LogsDirectory))
-	runHealthChecks(healthCheckFileLogger)
+	runHealthChecks(healthCheckFileLogger, uc.Global.GetOtlpExporter())
 
 	// Subagent config generation
 	if err := generateSubagentConfigs(pContext, ps.runCommand, pluginInstallDir, pluginStateDir); err != nil {
@@ -198,9 +199,8 @@ func runCommand(cmd *exec.Cmd) (string, error) {
 	return string(out), err
 }
 
-func validateOpsAgentConfig(ctx context.Context, opsAgentConfigLocation string) error {
-	_, err := confgenerator.MergeConfFiles(ctx, opsAgentConfigLocation)
-	return err
+func validateOpsAgentConfig(ctx context.Context, opsAgentConfigLocation string) (*confgenerator.UnifiedConfig, error) {
+	return confgenerator.MergeConfFiles(ctx, opsAgentConfigLocation)
 }
 
 func generateSubagentConfigs(ctx context.Context, runCommand RunCommandFunc, pluginInstallDirectory string, pluginStateDirectory string) error {

cmd/ops_agent_uap_plugin/service_linux_test.go

@@ -126,7 +126,7 @@ func Test_validateOpsAgentConfig(t *testing.T) {
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := context.Background()
-			err := validateOpsAgentConfig(ctx, tc.path)
+			_, err := validateOpsAgentConfig(ctx, tc.path)
 			gotSuccess := (err == nil)
 			if gotSuccess != tc.wantSuccess {
 				t.Errorf("%s: validateOpsAgentConfig() got success = %v, want %v, error: %v", tc.name, gotSuccess, tc.wantSuccess, err)

cmd/ops_agent_uap_plugin/service_windows.go

@@ -111,7 +111,8 @@ 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,
@@ -121,7 +122,7 @@ func (ps *OpsAgentPluginServer) Start(ctx context.Context, msg *pb.StartRequest)
 
 	// Trigger Healthchecks.
 	healthCheckFileLogger := healthchecks.CreateHealthChecksLogger(filepath.Join(pluginStateDir, LogsDirectory))
-	runHealthChecks(healthCheckFileLogger)
+	runHealthChecks(healthCheckFileLogger, uc.Global.GetOtlpExporter())
 
 	// Create a Windows Job object and stores its handle, to ensure that all child processes are killed when the parent process exits.
 	_, err = createWindowsJobHandle()
@@ -205,18 +206,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{
@@ -229,10 +230,10 @@ 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 createWindowsJobHandle() (windows.Handle, error) {

cmd/ops_agent_uap_plugin/service_windows_test.go

@@ -155,7 +155,7 @@ func Test_runHealthChecks_LogFileNonEmpty(t *testing.T) {
 	defer os.Remove(healthCheckLogFile.Name())
 	mockHealthCheckLogger := &mockHealthCheckLogger{logFile: healthCheckLogFile}
 
-	runHealthChecks(mockHealthCheckLogger)
+	runHealthChecks(mockHealthCheckLogger, false)
 
 	// Check if the log file has content
 	fileInfo, err := os.Stat(healthCheckLogFile.Name())
@@ -204,7 +204,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,20 @@ 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")
+			otlpExporterEnabled := false
+			uc, err := confgenerator.MergeConfFiles(ctx, configPath)
+			if err == nil {
+				otlpExporterEnabled = uc.Global.GetOtlpExporter()
+			} else {
+				log.Printf("failed to load config: %v", err)
+			}
+			healthCheckResults := getHealthCheckResults(otlpExporterEnabled)
 			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) {
@@ -141,16 +142,16 @@ func (s *service) checkForStandaloneAgents(unified *confgenerator.UnifiedConfig)
 	return nil
 }
 
-func getHealthCheckResults() []healthchecks.HealthCheckResult {
+func getHealthCheckResults(otlpExporterEnabled bool) []healthchecks.HealthCheckResult {
 	logsDir := filepath.Join(os.Getenv("PROGRAMDATA"), dataDirectory, "log")
-	gceHealthChecks := healthchecks.HealthCheckRegistryFactory()
+	gceHealthChecks := healthchecks.HealthCheckRegistryFactory(otlpExporterEnabled)
 	logger := healthchecks.CreateHealthChecksLogger(logsDir)
 
 	return gceHealthChecks.RunAllHealthChecks(logger)
 }
 
 func (srv *service) runHealthChecks() {
-	healthCheckResults := getHealthCheckResults()
+	healthCheckResults := getHealthCheckResults(srv.uc.Global.GetOtlpExporter())
 	logger := logs.WindowsServiceLogger{EventID: EngineEventID, Logger: srv.log}
 	healthchecks.LogHealthCheckResults(healthCheckResults, logger)
 	srv.log.Info(EngineEventID, "Startup checks finished")
@@ -162,6 +163,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/agentmetrics.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel"
 	"github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel/ottl"
-	"github.com/GoogleCloudPlatform/ops-agent/internal/experiments"
 )
 
 // AgentSelfMetrics provides the agent.googleapis.com/agent/ metrics.
@@ -34,6 +33,7 @@ type AgentSelfMetrics struct {
 	FluentBitPort       int
 	OtelPort            int
 	OtelRuntimeDir      string
+	OtlpExporterEnabled bool
 }
 
 // Following reference : https://github.com/googleapis/googleapis/blob/master/google/rpc/code.proto
@@ -182,7 +182,7 @@ func (r AgentSelfMetrics) OtelPipelineProcessors(ctx context.Context) []otel.Com
 		`metric.name == "` + durationCountMetric + `" and (not IsMatch(datapoint.attributes["grpc.target"], "monitoring.googleapis"))`,
 	})
 
-	expOtlpExporter := experiments.FromContext(ctx)["otlp_exporter"]
+	expOtlpExporter := r.OtlpExporterEnabled
 	var extraTransforms []map[string]interface{}
 	if expOtlpExporter {
 		durationMetric = "rpc.client.call.duration"
@@ -293,7 +293,7 @@ func (r AgentSelfMetrics) LoggingMetricsPipelineProcessors(ctx context.Context)
 		otel.AggregateLabels("sum", "response_code"),
 	)
 
-	expOtlpExporter := experiments.FromContext(ctx)["otlp_exporter"]
+	expOtlpExporter := r.OtlpExporterEnabled
 	if expOtlpExporter {
 		durationMetric = "rpc.client.call.duration"
 		durationCountMetric = "rpc.client.call.duration_count"