Resolve the expansion bug (#5267)

* Resolve the expansion bug * use new config for upgrade tests * Fix TestConfigYamlEnvVar --------- Co-authored-by: jeffreyc-splunk <jeffreyc@splunk.com>
signalfx · Aug 20, 2024 · bdfa0fb · bdfa0fb
1 parent e587f61
commit bdfa0fb
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 682 deletions.
diff --git a/.github/workflows/win-package-test.yml b/.github/workflows/win-package-test.yml
@@ -377,6 +377,8 @@ jobs:
             if ($LASTEXITCODE -ne 0) {
               throw "choco install failed!"
             }
+            stop-service splunk-otel-collector
+            rm "$env:PROGRAMDATA\Splunk\OpenTelemetry Collector\*_config.yaml"
             Start-Sleep 30
             write-host "Upgrading $choco_file_name ..."
             choco upgrade splunk-otel-collector -s=".\dist" -y

diff --git a/internal/buildscripts/packaging/tests/package_test.py b/internal/buildscripts/packaging/tests/package_test.py
@@ -197,23 +197,20 @@ def test_collector_package_upgrade(distro, arch):
             # install an older version of the collector package
             run_container_cmd(container, install_cmd, env={"VERIFY_ACCESS_TOKEN": "false"}, timeout="10m")
 
-            time.sleep(5)
+            time.sleep(10)
 
             # verify collector service status
             assert wait_for(lambda: service_is_running(container, service_owner=SERVICE_OWNER))
 
-            # change the config
-            run_container_cmd(container, f"sh -c 'echo \"# This line should be preserved\" >> {AGENT_CONFIG_PATH}'")
-
             copy_file_into_container(container, pkg_path, f"/test/{pkg_base}")
 
             # upgrade package
             if distro in DEB_DISTROS:
-                run_container_cmd(container, f"dpkg -i --force-confold /test/{pkg_base}")
+                run_container_cmd(container, f"dpkg -i --force-confnew /test/{pkg_base}")
             elif distro in RPM_DISTROS:
                 run_container_cmd(container, f"rpm -U /test/{pkg_base}")
 
-            time.sleep(5)
+            time.sleep(10)
 
             run_container_cmd(container, f"test -d {BUNDLE_DIR}")
             run_container_cmd(container, f"test -d {BUNDLE_DIR}/run/collectd")
@@ -224,8 +221,5 @@ def test_collector_package_upgrade(distro, arch):
             # verify collector service status
             assert wait_for(lambda: service_is_running(container, service_owner=SERVICE_OWNER))
 
-            # verify changed config was preserved after upgrade
-            run_container_cmd(container, f"grep '# This line should be preserved' {AGENT_CONFIG_PATH}")
-
         finally:
             run_container_cmd(container, f"journalctl -u {SERVICE_NAME} --no-pager")
diff --git a/internal/configconverter/k8s_tagger.go b/internal/configconverter/k8s_tagger.go
diff --git a/internal/configconverter/k8s_tagger_test.go b/internal/configconverter/k8s_tagger_test.go
diff --git a/internal/configconverter/loglevel_to_verbosity.go b/internal/configconverter/loglevel_to_verbosity.go
diff --git a/internal/configconverter/loglevel_to_verbosity_test.go b/internal/configconverter/loglevel_to_verbosity_test.go
diff --git a/internal/configconverter/move_hec_tls.go b/internal/configconverter/move_hec_tls.go