From 9bb157899b21f438aefdc55655969eff1882dcb0 Mon Sep 17 00:00:00 2001
From: Chris Ventura <45495992+nrcventura@users.noreply.github.com>
Date: Thu, 20 Jul 2023 16:19:10 -0700
Subject: [PATCH] Cleanup env vars and copy correct home dir.

---
 .../ContainerFixtures/ContainerApplication.cs | 18 +-------
 .../RemoteApplication.cs                      | 42 ++++++++++++-------
 .../IntegrationTestHelpers/Utilities.cs       |  6 ++-
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerApplication.cs b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerApplication.cs
index dc010ea098..a44fdf1886 100644
--- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerApplication.cs
+++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerFixtures/ContainerApplication.cs
@@ -37,7 +37,7 @@ public ContainerApplication(string applicationDirectoryName, string distroTag) :
 
         public override void CopyToRemote()
         {
-            CopyNewRelicHomeCoreClrDirectoryToRemote();
+            CopyNewRelicHomeCoreClrLinuxDirectoryToRemote("x64");
 
             ModifyNewRelicConfig();
         }
@@ -46,7 +46,6 @@ public override void Start(string commandLineArguments, Dictionary<string, strin
         {
             var arguments = $"compose up --force-recreate";
 
-            var profilerFilePath = Path.Combine(DestinationNewRelicHomeDirectoryPath, Utilities.IsLinux ? @"libNewRelicProfiler.so" : @"NewRelic.Profiler.dll");
             var newRelicHomeDirectoryPath = DestinationNewRelicHomeDirectoryPath;
             var profilerLogDirectoryPath = DefaultLogFileDirectoryPath;
 
@@ -63,6 +62,7 @@ public override void Start(string commandLineArguments, Dictionary<string, strin
 
             Console.WriteLine($"[{DateTime.Now}] RemoteContainer.Start(): FileName=docker, Arguments={arguments}, WorkingDirectory={DestinationRootDirectoryPath}, RedirectStandardOutput={captureStandardOutput}, RedirectStandardError={captureStandardOutput}, RedirectStandardInput={RedirectStandardInput}");
 
+            // Cleanup environment variables from the system
             startInfo.EnvironmentVariables.Remove("COR_ENABLE_PROFILING");
             startInfo.EnvironmentVariables.Remove("COR_PROFILER");
             startInfo.EnvironmentVariables.Remove("COR_PROFILER_PATH");
@@ -74,25 +74,11 @@ public override void Start(string commandLineArguments, Dictionary<string, strin
             startInfo.EnvironmentVariables.Remove("NEW_RELIC_LICENSE_KEY");
             startInfo.EnvironmentVariables.Remove("NEW_RELIC_HOST");
             startInfo.EnvironmentVariables.Remove("NEWRELIC_INSTALL_PATH");
-
             startInfo.EnvironmentVariables.Remove("CORECLR_ENABLE_PROFILING");
             startInfo.EnvironmentVariables.Remove("CORECLR_PROFILER");
             startInfo.EnvironmentVariables.Remove("CORECLR_PROFILER_PATH");
             startInfo.EnvironmentVariables.Remove("CORECLR_NEWRELIC_HOME");
 
-            // configure env vars as needed for testing environment overrides
-            foreach (var envVar in environmentVariables)
-            {
-                startInfo.EnvironmentVariables.Add(envVar.Key, envVar.Value);
-            }
-
-            startInfo.EnvironmentVariables.Add("CORECLR_ENABLE_PROFILING", "1");
-            startInfo.EnvironmentVariables.Add("CORECLR_PROFILER", "{36032161-FFC0-4B61-B559-F6C5D41BAE5A}");
-            startInfo.EnvironmentVariables.Add("CORECLR_PROFILER_PATH", profilerFilePath);
-            startInfo.EnvironmentVariables.Add("CORECLR_NEWRELIC_HOME", newRelicHomeDirectoryPath);
-
-            startInfo.EnvironmentVariables.Add("NEWRELIC_PROFILER_LOG_DIRECTORY", profilerLogDirectoryPath);
-
             // Docker compose settings
             var testConfiguration = IntegrationTestConfiguration.GetIntegrationTestConfiguration("Default");
 
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplication.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplication.cs
index 0774cfc125..2c9bfc79bf 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplication.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteApplication.cs
@@ -64,22 +64,7 @@ private static string SourceNewRelicHomeCoreClrDirectoryPath
         {
             get
             {
-                if (!string.IsNullOrWhiteSpace(_sourceNewRelicHomeCoreClrDirectoryPath))
-                {
-                    return _sourceNewRelicHomeCoreClrDirectoryPath;
-                }
-
-                var homeRootPath = Environment.GetEnvironmentVariable("NR_DEV_HOMEROOT");
-
-                var homeDirName = Utilities.RuntimeHomeDirName;
-                if (!string.IsNullOrWhiteSpace(homeRootPath) && Directory.Exists(homeRootPath))
-                {
-                    _sourceNewRelicHomeCoreClrDirectoryPath = Path.Combine(homeRootPath, homeDirName);
-                    return _sourceNewRelicHomeCoreClrDirectoryPath;
-                }
-
-                _sourceNewRelicHomeCoreClrDirectoryPath = Path.Combine(RepositoryRootPath, "src", "Agent", homeDirName);
-                return _sourceNewRelicHomeCoreClrDirectoryPath;
+                return GetSourceDirectoryForHomeDir(Utilities.RuntimeHomeDirName);
             }
             set
             {
@@ -87,6 +72,25 @@ private static string SourceNewRelicHomeCoreClrDirectoryPath
             }
         }
 
+        private static string GetSourceDirectoryForHomeDir(string homeDirName)
+        {
+            if (!string.IsNullOrWhiteSpace(_sourceNewRelicHomeCoreClrDirectoryPath))
+            {
+                return _sourceNewRelicHomeCoreClrDirectoryPath;
+            }
+
+            var homeRootPath = Environment.GetEnvironmentVariable("NR_DEV_HOMEROOT");
+
+            if (!string.IsNullOrWhiteSpace(homeRootPath) && Directory.Exists(homeRootPath))
+            {
+                _sourceNewRelicHomeCoreClrDirectoryPath = Path.Combine(homeRootPath, homeDirName);
+                return _sourceNewRelicHomeCoreClrDirectoryPath;
+            }
+
+            _sourceNewRelicHomeCoreClrDirectoryPath = Path.Combine(RepositoryRootPath, "src", "Agent", homeDirName);
+            return _sourceNewRelicHomeCoreClrDirectoryPath;
+        }
+
         private static readonly string SourceApplicationLauncherProjectDirectoryPath = Path.Combine(SourceIntegrationTestsSolutionDirectoryPath, "ApplicationLauncher");
 
         private static readonly string SourceApplicationLauncherDirectoryPath = Path.Combine(SourceApplicationLauncherProjectDirectoryPath, "bin", Utilities.Configuration);
@@ -425,6 +429,12 @@ protected void CopyNewRelicHomeCoreClrDirectoryToRemote()
             CommonUtils.CopyDirectory(SourceNewRelicHomeCoreClrDirectoryPath, DestinationNewRelicHomeDirectoryPath);
         }
 
+        protected void CopyNewRelicHomeCoreClrLinuxDirectoryToRemote(string arch)
+        {
+            Directory.CreateDirectory(DestinationNewRelicHomeDirectoryPath);
+            CommonUtils.CopyDirectory(GetSourceDirectoryForHomeDir(Utilities.GetRuntimeHomeDirNameFor(arch, true)), DestinationNewRelicHomeDirectoryPath);
+        }
+
         protected void CopyApplicationDirectoryToRemote()
         {
             Directory.CreateDirectory(DestinationApplicationDirectoryPath);
diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/Utilities.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/Utilities.cs
index 873dbf1090..c201be7e72 100644
--- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/Utilities.cs
+++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/Utilities.cs
@@ -49,7 +49,11 @@ public static bool IsAlpine
 
         public static string Arch => RuntimeInformation.OSArchitecture.ToString().ToLower();
         public static string CurrentRuntime => $"{(IsLinux ? "linux" : "win")}-{(IsAlpine ? "musl-" : "")}{Arch}";
-        public static string RuntimeHomeDirName => $"newrelichome_{Arch}_coreclr{(IsLinux ? "_linux" : "")}";
+        public static string RuntimeHomeDirName => GetRuntimeHomeDirNameFor(Arch, IsLinux);
+        public static string GetRuntimeHomeDirNameFor(string arch, bool isLinux)
+        {
+            return $"newrelichome_{arch}_coreclr{(isLinux ? "_linux" : "")}";
+        }
 
         public static T ThrowIfNull<T>(T value, string valueName)
         {