Merge branch 'main' into other/add-mongodb-3x-support

Author: jaffinito

.github/workflows/all_solutions.yml

@@ -444,7 +444,7 @@ jobs:
 
     env:
       integration_tests_shared_project: ${{ github.workspace }}/tests/Agent/IntegrationTests/Shared
-      unbounded_tests_path: ${{ github.workspace }}/tests/Agent/IntegrationTests/UnboundedIntegrationTests/bin/Release/net481
+      unbounded_tests_path: ${{ github.workspace }}/tests/Agent/IntegrationTests/UnboundedIntegrationTests/bin/Release/net9.0
       NR_DOTNET_TEST_SAVE_WORKING_DIRECTORY: 1
       # Make this variable true to enable extra data-gathering and logging to help troubleshoot test failures, at the cost of additional time and resources
       enhanced_logging: false

src/Agent/NewRelic/Agent/Core/AgentInstallConfiguration.cs

@@ -163,7 +163,7 @@ private static bool GetIsNetCore30OrAbove()
         private static string GetNewRelicHome()
         {
             var newRelicHome = EnvironmentVariableProxy.GetEnvironmentVariableFromList(NewRelicHomeEnvironmentVariables);
-            if (newRelicHome != null && DirectoryWrapper.Instance.Exists(newRelicHome)) return Path.GetFullPath(newRelicHome);
+            if (newRelicHome != null && Directory.Exists(newRelicHome)) return Path.GetFullPath(newRelicHome);
 #if NETFRAMEWORK
 			var key = Registry.LocalMachine.OpenSubKey(@"Software\New Relic\.NET Agent");
 			if (key != null) newRelicHome = (string)key.GetValue("NewRelicHome");
@@ -177,7 +177,7 @@ private static string GetNewRelicInstallPath()
             if (newRelicInstallPath != null)
             {
                 newRelicInstallPath = Path.Combine(newRelicInstallPath, RuntimeDirectoryName);
-                if (DirectoryWrapper.Instance.Exists(newRelicInstallPath)) return newRelicInstallPath;
+                if (Directory.Exists(newRelicInstallPath)) return newRelicInstallPath;
             }
 
             newRelicInstallPath = EnvironmentVariableProxy.GetEnvironmentVariableFromList(NewRelicHomeEnvironmentVariables);
@@ -194,11 +194,11 @@ public static AgentInfo GetAgentInfo()
 
             var agentInfoPath = Path.Combine(NewRelicHome, "agentinfo.json");
 
-            if (FileWrapper.Instance.Exists(agentInfoPath))
+            if (File.Exists(agentInfoPath))
             {
                 try
                 {
-                    return JsonConvert.DeserializeObject<AgentInfo>(FileWrapper.Instance.ReadAllText(agentInfoPath));
+                    return JsonConvert.DeserializeObject<AgentInfo>(File.ReadAllText(agentInfoPath));
                 }
                 catch (Exception e)
                 {

src/Agent/NewRelic/Agent/Core/Config/BootstrapConfiguration.cs

@@ -51,7 +51,7 @@ public class BootstrapConfiguration : IBootstrapConfiguration
         private BootstrapConfiguration()
         {
             _agentEnabledWithProvenance = new ValueWithProvenance<bool>(true, "Default value");
-            LogConfig = new BootstrapLogConfig(new configurationLog(), new ProcessStatic(), DirectoryWrapper.Instance.Exists, Path.GetFullPath);
+            LogConfig = new BootstrapLogConfig(new configurationLog(), new ProcessStatic(), Directory.Exists, Path.GetFullPath);
         }
 
         /// <summary>
@@ -60,7 +60,7 @@ private BootstrapConfiguration()
         /// <param name="localConfiguration">The local configuration object to use.</param>
         /// <param name="configurationFileName">The name and path of the local configuration file.</param>
         public BootstrapConfiguration(configuration localConfiguration, string configurationFileName)
-            : this(localConfiguration, configurationFileName, ConfigurationLoader.GetWebConfigAppSetting, new ConfigurationManagerStatic(), new ProcessStatic(), DirectoryWrapper.Instance.Exists, Path.GetFullPath)
+            : this(localConfiguration, configurationFileName, ConfigurationLoader.GetWebConfigAppSetting, new ConfigurationManagerStatic(), new ProcessStatic(), Directory.Exists, Path.GetFullPath)
         { }
 
         /// <summary>

src/Agent/NewRelic/Agent/Core/Config/ConfigurationLoader.cs

@@ -64,8 +64,8 @@ private static string InternalGetAppDomainName()
         public static Func<string> GetAppDomainName = InternalGetAppDomainName;
 #endif
 
-        public static Func<string, bool> FileExists = FileWrapper.Instance.Exists;
-        public static Func<string, string> FileReadAllText = FileWrapper.Instance.ReadAllText;
+        public static Func<string, bool> FileExists = File.Exists;
+        public static Func<string, string> FileReadAllText = File.ReadAllText;
 
         public static Func<string, string> PathGetDirectoryName = Path.GetDirectoryName;
         public static Func<string, string> GetEnvironmentVar = System.Environment.GetEnvironmentVariable;
@@ -217,7 +217,7 @@ private static string TryGetAgentConfigFileFromAppRoot()
                     }
                 }
 
-                var currentDirectory = DirectoryWrapper.Instance.GetCurrentDirectory();
+                var currentDirectory = Directory.GetCurrentDirectory();
                 filename = Path.Combine(currentDirectory, NewRelicConfigFileName);
                 if (FileExists(filename))
                 {

src/Agent/NewRelic/Agent/Core/Configuration/AppSettingsConfigResolveWhenUsed.cs

@@ -37,7 +37,7 @@ private static IConfigurationRoot InitializeConfiguration()
             catch (AppDomainUnloadedException)
             {
                 // Fall back to previous behavior of agents <=8.35.0
-                applicationDirectory = DirectoryWrapper.Instance.GetCurrentDirectory();
+                applicationDirectory = Directory.GetCurrentDirectory();
             }
 
             // add default appsettings.json files to config builder

src/Agent/NewRelic/Agent/Core/DataTransport/ConnectionHandler.cs

@@ -50,8 +50,9 @@ public class ConnectionHandler : ConfigurationBasedService, IConnectionHandler
         private readonly Environment _environment;
         private readonly IAgentHealthReporter _agentHealthReporter;
         private readonly IEnvironment _environmentVariableHelper;
+        private readonly IFileWrapper _fileWrapper;
 
-        public ConnectionHandler(ISerializer serializer, ICollectorWireFactory collectorWireFactory, IProcessStatic processStatic, IDnsStatic dnsStatic, ILabelsService labelsService, Environment environment, ISystemInfo systemInfo, IAgentHealthReporter agentHealthReporter, IEnvironment environmentVariableHelper, ICollectorWire dataRequestWire = null)
+        public ConnectionHandler(ISerializer serializer, ICollectorWireFactory collectorWireFactory, IProcessStatic processStatic, IDnsStatic dnsStatic, ILabelsService labelsService, Environment environment, ISystemInfo systemInfo, IAgentHealthReporter agentHealthReporter, IEnvironment environmentVariableHelper, IFileWrapper fileWrapper, ICollectorWire dataRequestWire = null)
         {
             _serializer = serializer;
             _collectorWireFactory = collectorWireFactory;
@@ -62,6 +63,7 @@ public ConnectionHandler(ISerializer serializer, ICollectorWireFactory collector
             _systemInfo = systemInfo;
             _agentHealthReporter = agentHealthReporter;
             _environmentVariableHelper = environmentVariableHelper;
+            _fileWrapper = fileWrapper;
 
             _connectionInfo = new ConnectionInfo(_configuration);
             _dataRequestWire = dataRequestWire ??  new NoOpCollectorWire();
@@ -314,7 +316,7 @@ private ConnectModel GetConnectParameters()
                 identifier,
                 _labelsService.Labels,
                 metadata ?? new Dictionary<string, string>(),
-                new UtilizationStore(_systemInfo, _dnsStatic, _configuration, _agentHealthReporter).GetUtilizationSettings(),
+                new UtilizationStore(_systemInfo, _dnsStatic, _configuration, _agentHealthReporter, _fileWrapper).GetUtilizationSettings(),
                 _configuration.CollectorSendEnvironmentInfo ? _environment : null,
                 _configuration.SecurityPoliciesTokenExists ? new SecurityPoliciesSettingsModel(_configuration) : null,
                 new EventHarvestConfigModel(_configuration),

src/Agent/NewRelic/Agent/Core/Logging/LoggerBootstrapper.cs

@@ -260,9 +260,9 @@ private static LoggerConfiguration ConfigureRollingLogSink(this LoggerConfigurat
             {
                 // Create the directory if necessary
                 var directory = Path.GetDirectoryName(fileName);
-                if (!DirectoryWrapper.Instance.Exists(directory))
-                    DirectoryWrapper.Instance.CreateDirectory(directory);
-                using (FileWrapper.Instance.Open(fileName, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Write)) { }
+                if (!Directory.Exists(directory))
+                    Directory.CreateDirectory(directory);
+                using (File.Open(fileName, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Write)) { }
             }
             catch (Exception exception)
             {

src/Agent/NewRelic/Agent/Core/RuntimeEnvironmentInfo.cs

@@ -127,9 +127,9 @@ private static DistroInfo LoadDistroInfo()
 
             try
             {
-                if (FileWrapper.Instance.Exists("/etc/os-release"))
+                if (File.Exists("/etc/os-release"))
                 {
-                    var lines = FileWrapper.Instance.ReadAllLines("/etc/os-release");
+                    var lines = File.ReadAllLines("/etc/os-release");
                     result = new DistroInfo();
                     foreach (var line in lines)
                     {

src/Agent/NewRelic/Agent/Core/Utilities/DirectoryWrapper.cs

@@ -19,8 +19,6 @@ public interface IDirectoryWrapper
     [NrExcludeFromCodeCoverage]
     public class DirectoryWrapper : IDirectoryWrapper
     {
-        public static IDirectoryWrapper Instance { get; } = new DirectoryWrapper();
-
         public bool Exists(string path) => Directory.Exists(path);
 
         public string[] GetFiles(string path, string searchPattern, SearchOption searchOption = SearchOption.TopDirectoryOnly) => Directory.GetFiles(path, searchPattern, searchOption);

src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs

@@ -158,12 +158,12 @@ public static IEnumerable<IWrapper> LoadWrappers()
 
         private static List<string> GetAssemblyFilesFromFolder(string folder)
         {
-            if (folder == null || !DirectoryWrapper.Instance.Exists(folder))
+            if (folder == null || !Directory.Exists(folder))
             {
                 return new List<string>();
             }
 
-            var assemblyPaths = DirectoryWrapper.Instance.GetFiles(folder, "*.dll", SearchOption.TopDirectoryOnly);
+            var assemblyPaths = Directory.GetFiles(folder, "*.dll", SearchOption.TopDirectoryOnly);
 
             return assemblyPaths.ToList();
         }