From 2e93b784c3c1c135bb308d5b5cf04d79e7a823e3 Mon Sep 17 00:00:00 2001
From: maddieford <93676569+maddieford@users.noreply.github.com>
Date: Mon, 23 Sep 2024 10:03:05 -0700
Subject: [PATCH] Log collector scenario should not pick up runs before service
 restart (#3228)

* Log collector scenario fix (#24)

* test

* test

* Rename agent log:

* Use runcommand instead of remote test
---
 tests_e2e/tests/log_collector/log_collector.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests_e2e/tests/log_collector/log_collector.py b/tests_e2e/tests/log_collector/log_collector.py
index fed8159c0..945d69c15 100755
--- a/tests_e2e/tests/log_collector/log_collector.py
+++ b/tests_e2e/tests/log_collector/log_collector.py
@@ -21,9 +21,9 @@
 
 from assertpy import fail
 
-import tests_e2e.tests.lib.logging
 from azurelinuxagent.common.utils.shellutil import CommandError
 from tests_e2e.tests.lib.agent_test import AgentVmTest
+from tests_e2e.tests.lib.logging import log
 
 
 class LogCollector(AgentVmTest):
@@ -32,7 +32,16 @@ class LogCollector(AgentVmTest):
     """
     def run(self):
         ssh_client = self._context.create_ssh_client()
-        ssh_client.run_command("update-waagent-conf Logs.Collect=y Debug.EnableCgroupV2ResourceLimiting=y Debug.LogCollectorInitialDelay=60", use_sudo=True)
+
+        # Rename the agent log file so that the test does not pick up any incomplete log collector runs that started
+        # before the config is updated
+        # Enable Cgroup v2 resource limiting and reduce log collector iniital delay via config
+        log.info("Renaming agent log file and modifying log collector conf flags")
+        setup_script = ("agent-service stop &&  mv /var/log/waagent.log /var/log/waagent.$(date --iso-8601=seconds).log && "
+            "update-waagent-conf Logs.Collect=y Debug.EnableCgroupV2ResourceLimiting=y Debug.LogCollectorInitialDelay=60")
+        ssh_client.run_command(f"sh -c '{setup_script}'", use_sudo=True)
+        log.info('Renamed log file and updated log collector config flags')
+
         # Wait for log collector to finish uploading logs
         for _ in range(3):
             time.sleep(90)
@@ -40,7 +49,7 @@ def run(self):
                 ssh_client.run_command("grep 'Successfully uploaded logs' /var/log/waagent.log")
                 break
             except CommandError:
-                tests_e2e.tests.lib.logging.log.info("The Agent has not finished log collection, will check again after a short delay")
+                log.info("The Agent has not finished log collection, will check again after a short delay")
         else:
             raise Exception("Timeout while waiting for the Agent to finish log collection")
 
@@ -70,7 +79,7 @@ def run(self):
         # Check that all expected logs exist and are in the correct order
         indent = lambda lines: "\n".join([f"        {ln}" for ln in lines])
         if len(lc_logs) == len(expected) and all([re.match(expected[i], lc_logs[i]) is not None for i in range(len(expected))]):
-            tests_e2e.tests.lib.logging.log.info("The log collector run completed as expected.\nLog messages:\n%s", indent(lc_logs))
+            log.info("The log collector run completed as expected.\nLog messages:\n%s", indent(lc_logs))
         else:
             fail(f"The log collector run did not complete as expected.\nExpected:\n{indent(expected)}\nActual:\n{indent(lc_logs)}")