fix bad merge

Author: lucaspimentel

tracer/src/Datadog.Trace/Logging/Internal/DatadogLoggingFactory.cs

@@ -171,10 +171,12 @@ internal static string GetLogDirectory(IConfigurationTelemetry telemetry)
 
     private static string GetLogDirectory(IConfigurationSource source, IConfigurationTelemetry telemetry)
     {
+        // try reading from DD_TRACE_LOG_DIRECTORY
         var logDirectory = new ConfigurationBuilder(source, telemetry).WithKeys(ConfigurationKeys.LogDirectory).AsString();
 
         if (string.IsNullOrEmpty(logDirectory))
         {
+            // fallback #1: try getting the directory from DD_TRACE_LOG_PATH
 #pragma warning disable 618 // ProfilerLogPath is deprecated but still supported
             var nativeLogFile = new ConfigurationBuilder(source, telemetry).WithKeys(ConfigurationKeys.ProfilerLogPath).AsString();
 #pragma warning restore 618
@@ -187,9 +189,11 @@ private static string GetLogDirectory(IConfigurationSource source, IConfiguratio
 
         if (string.IsNullOrEmpty(logDirectory))
         {
+            // fallback #2: use the default log directory
             logDirectory = GetDefaultLogDirectory(source, telemetry);
         }
 
+        // try creating the directory if it doesn't exist
         if (logDirectory != null && (Directory.Exists(logDirectory) || TryCreateLogDirectory(logDirectory)))
         {
             return logDirectory;
@@ -207,48 +211,35 @@ private static string GetDefaultLogDirectory(IConfigurationSource source, IConfi
         //   - Directory.CreateDirectory
         //   - Environment.GetFolderPath
         //   - Path.GetTempPath
-        string logDirectory;
         var isWindows = FrameworkDescription.Instance.IsWindows();
 
         if (ImmutableAzureAppServiceSettings.IsRunningInAzureAppServices(source, telemetry))
         {
-            var isWindows = FrameworkDescription.Instance.IsWindows();
+            return isWindows ? @"C:\home\LogFiles\datadog" : "/home/LogFiles/datadog";
+        }
 
-            if (ImmutableAzureAppServiceSettings.IsRunningInAzureAppServices(source, telemetry) ||
-                ImmutableAzureAppServiceSettings.IsRunningInAzureFunctions(source, telemetry))
-            {
-                return isWindows ? @"C:\home\LogFiles\datadog" : "/home/LogFiles/datadog";
-            }
+        string logDirectory;
 
-            if (isWindows)
+        if (isWindows)
+        {
+            // On Nano Server, this returns "", so we fall back to reading from the env var set in the base image instead
+            // - https://github.com/dotnet/runtime/issues/22690
+            // - https://github.com/dotnet/runtime/issues/21430
+            // - https://github.com/dotnet/runtime/pull/109673
+            // If _that_ fails, we just hard code it to "C:\ProgramData", which is what the native components do anyway
+            var programData = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
+            if (string.IsNullOrEmpty(programData))
             {
-                // On Nano Server, this returns "", so we fallback to reading from the env var set in the base image instead
-                // - https://github.com/dotnet/runtime/issues/22690
-                // - https://github.com/dotnet/runtime/issues/21430
-                // - https://github.com/dotnet/runtime/pull/109673
-                // If _that_ fails, we just hard code it to "C:\ProgramData", which is what the native components do anyway
-                var programData = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
+                // fallback #1: try reading from the env var
+                programData = Environment.GetEnvironmentVariable("ProgramData");
                 if (string.IsNullOrEmpty(programData))
                 {
-                    programData = Environment.GetEnvironmentVariable("ProgramData");
-                    if (string.IsNullOrEmpty(programData))
-                    {
-                        programData = @"C:\ProgramData";
-                    }
+                    // fallback #2: hard-coded
+                    programData = @"C:\ProgramData";
                 }
-
-                logDirectory = Path.Combine(programData, "Datadog .NET Tracer", "logs");
-            }
-            else
-            {
-                logDirectory = "/var/log/datadog/dotnet";
             }
-        }
 
-        if (isWindows)
-        {
-            var commonApplicationDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
-            logDirectory = Path.Combine(commonApplicationDataFolder, "Datadog .NET Tracer", "logs");
+            logDirectory = Path.Combine(programData, "Datadog .NET Tracer", "logs");
         }
         else
         {