Cleanup

newrelic · Oct 7, 2024 · cd3e2f1 · cd3e2f1
1 parent d997d13
commit cd3e2f1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 1 deletion.
diff --git a/build/Linux/build/deb/postinst b/build/Linux/build/deb/postinst
@@ -2,7 +2,7 @@
 
 PACKAGE_NAME='newrelic-dotnet-agent'
 OBSOLETE_PACKAGE_NAME='newrelic-netcore20-agent'
-NEWR_ELIC_HOME=/usr/local/${PACKAGE_NAME}
+NEW_RELIC_HOME=/usr/local/${PACKAGE_NAME}
 OBSOLETE_NEW_RELIC_HOME=/usr/local/${OBSOLETE_PACKAGE_NAME}
 
 # create logs dir

diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/AzureFuncTool.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/AzureFuncTool.cs
@@ -72,6 +72,15 @@ public override void Start(string commandLineArguments, Dictionary<string, strin
             startInfo.EnvironmentVariables.Remove("CORECLR_PROFILER_PATH");
             startInfo.EnvironmentVariables.Remove("CORECLR_NEW_RELIC_HOME");
 
+            // TODO: remove in v11
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_HOME");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_PROFILER_LOG_DIRECTORY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LOG_DIRECTORY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LOG_LEVEL");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LICENSEKEY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_INSTALL_PATH");
+            startInfo.EnvironmentVariables.Remove("CORECLR_NEWRELIC_HOME");
+
             // configure env vars as needed for testing environment overrides
             foreach (var envVar in environmentVariables)
             {

diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/DotnetTool.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/DotnetTool.cs
@@ -133,6 +133,14 @@ public override void Start(string commandLineArguments, Dictionary<string, strin
             startInfo.EnvironmentVariables.Remove("CORECLR_PROFILER_PATH");
             startInfo.EnvironmentVariables.Remove("CORECLR_NEW_RELIC_HOME");
 
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_HOME");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_PROFILER_LOG_DIRECTORY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LOG_DIRECTORY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LOG_LEVEL");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LICENSEKEY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_INSTALL_PATH");
+            startInfo.EnvironmentVariables.Remove("CORECLR_NEWRELIC_HOME");
+
             // configure env vars as needed for testing environment overrides
             foreach (var envVar in environmentVariables)
             {

diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs
@@ -229,6 +229,15 @@ public override void Start(string commandLineArguments, Dictionary<string, strin
             startInfo.EnvironmentVariables.Remove("CORECLR_PROFILER_PATH");
             startInfo.EnvironmentVariables.Remove("CORECLR_NEW_RELIC_HOME");
 
+            // TODO: Remove in v11
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_HOME");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_PROFILER_LOG_DIRECTORY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LOG_DIRECTORY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LOG_LEVEL");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LICENSEKEY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_INSTALL_PATH");
+            startInfo.EnvironmentVariables.Remove("CORECLR_NEWRELIC_HOME");
+
             // configure env vars as needed for testing environment overrides
             foreach (var envVar in environmentVariables)
             {

diff --git a/...ent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteWebApplication.cs b/...ent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteWebApplication.cs
@@ -83,6 +83,15 @@ public override void Start(string commandLineArguments, Dictionary<string, strin
             startInfo.EnvironmentVariables.Remove("NEW_RELIC_LOG_DIRECTORY");
             startInfo.EnvironmentVariables.Remove("NEW_RELIC_LOG_LEVEL");
 
+            // TODO: Remove in v11
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_INSTALL_PATH");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LICENSEKEY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_HOME");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_PROFILER_LOG_DIRECTORY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LOG_DIRECTORY");
+            startInfo.EnvironmentVariables.Remove("NEWRELIC_LOG_LEVEL");
+
+
             // configure env vars as needed for testing environment overrides
             foreach (var envVar in environmentVariables)
             {