Container cleanup, console logging

newrelic · Jul 24, 2023 · 42ad774 · 42ad774
1 parent 1e3666e
commit 42ad774
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/...gent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerApplication.cs b/...gent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerApplication.cs
@@ -50,6 +50,8 @@ public override void CopyToRemote()
 
  public override void Start(string commandLineArguments, Dictionary<string, string> environmentVariables, bool captureStandardOutput = false, bool doProfile = true)
  {
+ CleanupContainer();
+
  var arguments = $"compose up --force-recreate";
 
  var newRelicHomeDirectoryPath = DestinationNewRelicHomeDirectoryPath;
@@ -144,7 +146,14 @@ public override void Shutdown()
  // stop and remove the container, no need to kill RemoteProcess, as it will die when this command runs
  // wait up to 5 seconds for the app to terminate gracefully before forcefully closing it
  Process.Start("docker", $"container stop {ContainerName} -t 5");
- Process.Start("docker", $"container rm {ContainerName}");
+ CleanupContainer();
+ }
+
+ private void CleanupContainer()
+ {
+ // ensure there's no stray containers or images laying around
+ Process.Start("docker", $"container rm --force {ContainerName}");
+ Process.Start("docker", $"image rm --force {ContainerName}");
  }
 
  protected virtual void WaitForAppServerToStartListening(Process process, bool captureStandardOutput)
@@ -165,6 +174,8 @@ protected virtual void WaitForAppServerToStartListening(Process process, bool ca
 
  if (!process.HasExited)
  {
+ CleanupContainer();
+
  try
  {
  //We need to attempt to clean up the process that did not successfully start.

diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/LinuxSmokeTests.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/LinuxSmokeTests.cs
@@ -22,6 +22,7 @@ protected LinuxSmokeTest(T fixture, ITestOutputHelper output) : base(fixture)
  {
  var configModifier = new NewRelicConfigModifier(_fixture.DestinationNewRelicConfigFilePath);
  configModifier.ConfigureFasterMetricsHarvestCycle(5);
+ configModifier.LogToConsole();
  },
  exerciseApplication: () =>
  {

diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/NewRelicConfigModifier.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/NewRelicConfigModifier.cs
@@ -169,6 +169,12 @@ public void SetLogLevel(string level)
  level);
  }
 
+ public void LogToConsole()
+ {
+ CommonUtils.ModifyOrCreateXmlAttributeInNewRelicConfig(_configFilePath, new[] { "configuration", "log" }, "console",
+ "true");
+ }
+
  public void SetLogDirectory(string directoryName)
  {
  CommonUtils.ModifyOrCreateXmlAttributeInNewRelicConfig(_configFilePath, new[] { "configuration", "log" }, "directory",