Set env vars for service instead of machine

internal/buildscripts/packaging/installer/install.ps1

@@ -111,6 +111,11 @@
     For information about the public MSI properties see https://learn.microsoft.com/en-us/windows/win32/msi/property-reference#configuration-properties
     .EXAMPLE
     .\install.ps1 -access_token "ACCESSTOKEN" -msi_public_properties "ALLUSERS=1" 
+.PARAMETER config_path
+    (OPTIONAL) Specify a local path to an alternative configuration file for the Splunk OpenTelemetry Collector.
+    If specified, the -mode parameter will be ignored.
+    .EXAMPLE
+    .\install.ps1 -config_path "C:\SOME_FOLDER\my_config.yaml"
 #>
 
 param (
@@ -132,6 +137,7 @@ param (
     [ValidateSet('test','beta','release')][string]$stage = "release",
     [string]$msi_path = "",
     [string]$msi_public_properties = "",
+    [string]$config_path = "",
     [string]$collector_msi_url = "",
     [string]$fluentd_msi_url = "",
     [string]$deployment_env = "",
@@ -157,7 +163,6 @@ try {
 $old_config_path = "$program_data_path\config.yaml"
 $agent_config_path = "$program_data_path\agent_config.yaml"
 $gateway_config_path = "$program_data_path\gateway_config.yaml"
-$config_path = ""
 
 try {
     Resolve-Path $env:TEMP 2>&1>$null
@@ -578,20 +583,20 @@ if (!(Test-Path -Path "$old_config_path") -And (Test-Path -Path "$installation_p
     Copy-Item "$installation_path\config.yaml" "$old_config_path"
 }
 
-if (($mode -Eq "agent") -And (Test-Path -Path "$agent_config_path")) {
-    $config_path = $agent_config_path
-} elseif (($mode -Eq "gateway") -And (Test-Path -Path "$gateway_config_path")) {
-    $config_path = $gateway_config_path
-}
-
 if ($config_path -Eq "") {
-    if (Test-Path -Path "$old_config_path") {
+    if (($mode -Eq "agent") -And (Test-Path -Path "$agent_config_path")) {
+        $config_path = $agent_config_path
+    } elseif (($mode -Eq "gateway") -And (Test-Path -Path "$gateway_config_path")) {
+        $config_path = $gateway_config_path
+    } elseif (Test-Path -Path "$old_config_path") {
         $config_path = $old_config_path
-    } else {
-        throw "Valid Collector configuration file not found."
     }
 }
 
+if (!(Test-Path -Path "$config_path")) {
+    throw "Valid Collector configuration file not found at $config_path."
+}
+
 $collector_env_vars = @{
     "SPLUNK_ACCESS_TOKEN"     = "$access_token";
     "SPLUNK_API_URL"          = "$api_url";
@@ -604,6 +609,7 @@ $collector_env_vars = @{
     "SPLUNK_REALM"            = "$realm";
     "SPLUNK_TRACE_URL"        = "$trace_url";
 }
+
 if ($network_interface -Ne "") {
     $collector_env_vars.Add("SPLUNK_LISTEN_INTERFACE", "$network_interface")
 }

internal/buildscripts/packaging/msi/splunk-otel-collector.wxs

@@ -39,8 +39,10 @@
                      <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\splunk-otel-collector">
                         <RegistryValue Type="expandable" Name="EventMessageFile" Value="%SystemRoot%\System32\EventCreate.exe"/>
                      </RegistryKey>
-                     <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Control\Session Manager\Environment">
-                        <RegistryValue Type="string" Name="SPLUNK_CONFIG" Value="[CommonAppDataFolder]Splunk\OpenTelemetry Collector\agent_config.yaml"/>
+                     <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\splunk-otel-collector">
+                        <RegistryValue Type="multiString" Name="Environment">
+                           <MultiStringValue>SPLUNK_CONFIG=[CommonAppDataFolder]Splunk\OpenTelemetry Collector\agent_config.yaml"</MultiStringValue>
+                        </RegistryValue>
                      </RegistryKey>
                   </Component>
                </Directory>

tests/zeroconfig/windows/testdata/Dockerfile.pipeline.collector

@@ -18,10 +18,8 @@ ENV ACCESS_TOKEN_TMP=$access_token
 RUN `
     $token = $Env:ACCESS_TOKEN_TMP; `
     $collector_msi_path = (dir "c:\setup\splunk-otel-collector-*.msi").FullName; `
-    c:\setup\install.ps1 -access_token $token -msi_path $collector_msi_path -with_fluentd $false -ingest_url "http://192.0.2.1:12345" -trace_url "http://192.0.2.1:12345" -network_interface "0.0.0.0"
+    c:\setup\install.ps1 -access_token $token -msi_path $collector_msi_path -config_path "C:\setup\pipeline-collector.yaml" -with_fluentd $false -ingest_url "http://192.0.2.1:12345" -trace_url "http://192.0.2.1:12345" -network_interface "0.0.0.0"
 ENV ACCESS_TOKEN_TMP=
-RUN `
-    Set-ItemProperty -force -path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' -name 'SPLUNK_CONFIG' -value 'C:\setup\pipeline-collector.yaml'
 
 # On docker compose the entry point needs to be changed to something that keeps the container alive.
-ENTRYPOINT [ "powershell", "-Command", "Start-Sleep 1; While ($? -eq '1') { Start-Sleep 1; Invoke-WebRequest -Uri http://localhost:13133/health_check -TimeoutSec 5 -UseBasicParsing }" ]
+ENTRYPOINT [ "powershell", "-Command", "Start-Sleep 5; While ($? -eq '1') { Start-Sleep 5; Invoke-WebRequest -Uri http://localhost:13133/health_check -TimeoutSec 10 -UseBasicParsing }" ]