Integrate googlecloudopsagent confmap.Provider into Ops Agent

cmd/ops_agent_uap_plugin/service_linux.go

@@ -137,7 +137,10 @@ func runSubagents(ctx context.Context, cancelAndSetError CancelContextAndSetPlug
 	// Starting Otel
 	runOtelCmd := exec.CommandContext(ctx,
 		path.Join(pluginInstallDirectory, OtelBinary),
-		"--config", path.Join(pluginStateDirectory, OtelRuntimeDirectory, "otel.yaml"),
+		"--config", fmt.Sprintf("googlecloudopsagent:%s?platform=linux&state_dir=%s&out_dir=%s",
+			OpsAgentConfigLocationLinux,
+			path.Join(pluginStateDirectory, OtelStateDiectory),
+			path.Join(pluginStateDirectory, OtelRuntimeDirectory)),
 	)
 	wg.Add(1)
 	go runSubAgentCommand(ctx, cancelAndSetError, runOtelCmd, runCommand, &wg)

cmd/ops_agent_windows/main_windows.go

@@ -136,7 +136,10 @@ func initServices() error {
 			fmt.Sprintf("%s - Metrics Agent", serviceDisplayName),
 			filepath.Join(base, "google-cloud-metrics-agent_windows_amd64.exe"),
 			[]string{
-				"--config=" + filepath.Join(configOutDir, `otel\otel.yaml`),
+				fmt.Sprintf("--config=googlecloudopsagent:%s?platform=windows&state_dir=%s&out_dir=%s",
+					filepath.Join(base, "../config/config.yaml"),
+					filepath.Join(os.Getenv("PROGRAMDATA"), dataDirectory, "run"),
+					configOutDir),
 			},
 		},
 		{

confgenerator/files.go

@@ -59,13 +59,8 @@ func (uc *UnifiedConfig) GenerateFilesFromConfig(ctx context.Context, service, l
 			}
 		}
 	case "otel":
-		otelConfig, err := uc.GenerateOtelConfig(ctx, outDir, stateDir)
-		if err != nil {
-			return fmt.Errorf("can't parse configuration: %w", err)
-		}
-		if err = WriteConfigFile([]byte(otelConfig), filepath.Join(outDir, "otel.yaml")); err != nil {
-			return err
-		}
+		// No-op. otelopscol now uses the googlecloudopsagent provider to translate config on the fly.
+		return nil
 	default:
 		return fmt.Errorf("unknown service %q", service)
 	}

systemd/google-cloud-ops-agent-opentelemetry-collector.service

@@ -24,7 +24,7 @@ StateDirectory=google-cloud-ops-agent/opentelemetry-collector
 LogsDirectory=google-cloud-ops-agent
 Type=simple
 ExecStartPre=@PREFIX@/libexec/google_cloud_ops_agent_engine -service=otel -in @SYSCONFDIR@/google-cloud-ops-agent/config.yaml -logs ${LOGS_DIRECTORY} -state ${STATE_DIRECTORY}
-ExecStart=@PREFIX@/subagents/opentelemetry-collector/otelopscol --config=${RUNTIME_DIRECTORY}/otel.yaml
+ExecStart=@PREFIX@/subagents/opentelemetry-collector/otelopscol --config=googlecloudopsagent:@SYSCONFDIR@/google-cloud-ops-agent/config.yaml?platform=linux&state_dir=${STATE_DIRECTORY}&out_dir=${RUNTIME_DIRECTORY}
 Restart=always
 # For debugging:
 RuntimeDirectoryPreserve=yes