special case for logging factory..

Author: anna-git

tracer/src/Datadog.Trace.Manual/Datadog.Trace.Manual.csproj

@@ -26,7 +26,8 @@
     <Compile Include="..\Datadog.Trace\Ci\TestStatus.cs" Link="Ci\%(Filename)%(Extension)" />
     <Compile Include="..\Datadog.Trace\ClrProfiler\AutoInstrumentation\ManualInstrumentation\TracerSettingKeyConstants.cs"  Link="Configuration\%(Filename)%(Extension)" />
     <Compile Include="..\Datadog.Trace\ClrProfiler\AutoInstrumentation\ManualInstrumentation\IntegrationSettingsSerializationHelper.cs"  Link="Configuration\%(Filename)%(Extension)" />
-    <Compile Include="..\Datadog.Trace\Configuration\DeprecationMessages.cs" Link="Configuration\%(Filename)%(Extension)" />
+    <Compile Include="..\Datadog.Trace\Configuration\DeprecationMessages.cs" 
+             Link="Configuration\%(Filename)%(Extension)" />
     <Compile Include="..\Datadog.Trace\DuckTyping\DuckAsClassAttribute.cs" Link="DuckTyping\%(Filename)%(Extension)" />
     <Compile Include="..\Datadog.Trace\HttpHeaderNames.cs" />
     <Compile Include="..\Datadog.Trace\IDatadogOpenTracingTracer.cs" />

tracer/src/Datadog.Trace.Tools.Runner/ProcessConfiguration.cs

@@ -54,9 +54,10 @@ internal static class ProcessConfiguration
 
             if (logDirectory == null)
             {
-#pragma warning disable 618 // ProfilerLogPath is deprecated but still supported
-                var nativeLogFile = config.WithKeys(ConfigurationKeys.ProfilerLogPath).AsString();
-#pragma warning restore 618
+                // ProfilerLogPath is deprecated but still supported. For now, we bypass the WithKeys analyzer, but later we want to pull deprecations differently as part of centralized file
+#pragma warning disable DD0008, 618
+                var nativeLogFile = config.WithKeys(ConfigurationKeys.TraceLogPath).AsString();
+#pragma warning restore DD0008, 618
                 if (!string.IsNullOrEmpty(nativeLogFile))
                 {
                     logDirectory = Path.GetDirectoryName(nativeLogFile);

tracer/src/Datadog.Trace/Configuration/TracerSettings.cs

@@ -278,7 +278,7 @@ not null when string.Equals(x, "lowmemory", StringComparison.OrdinalIgnoreCase)
                                    validator: null);
 
             OtlpLogsProtocol = config
-                             .WithKeys(ConfigurationKeys.OpenTelemetry.ExporterOtlpLogsProtocol, ConfigurationKeys.OpenTelemetry.ExporterOtlpProtocol)
+                             .WithKeys(ConfigurationKeys.OpenTelemetry.ExporterOtlpLogsProtocol)
                              .GetAs(
                                   defaultValue: new(OtlpProtocol.Grpc, "grpc"),
                                   converter: x => x switch
@@ -304,14 +304,14 @@ not null when string.Equals(x, "http/protobuf", StringComparison.OrdinalIgnoreCa
                     converter: uriString => new Uri(uriString));
 
             OtlpLogsHeaders = config
-                            .WithKeys(ConfigurationKeys.OpenTelemetry.ExporterOtlpLogsHeaders, ConfigurationKeys.OpenTelemetry.ExporterOtlpHeaders)
+                            .WithKeys(ConfigurationKeys.OpenTelemetry.ExporterOtlpLogsHeaders)
                             .AsDictionaryResult(separator: '=')
                             .WithDefault(new DefaultResult<IDictionary<string, string>>(new Dictionary<string, string>(), "[]"))
                             .Where(kvp => !string.IsNullOrWhiteSpace(kvp.Key))
                             .ToDictionary(kvp => kvp.Key.Trim(), kvp => kvp.Value?.Trim() ?? string.Empty);
 
             OtlpLogsTimeoutMs = config
-                            .WithKeys(ConfigurationKeys.OpenTelemetry.ExporterOtlpLogsTimeoutMs, ConfigurationKeys.OpenTelemetry.ExporterOtlpTimeoutMs)
+                            .WithKeys(ConfigurationKeys.OpenTelemetry.ExporterOtlpLogsTimeoutMs)
                             .AsInt32(defaultValue: 10_000);
 
             var otelLogsExporter = config
@@ -1363,6 +1363,16 @@ internal static string[] TrimSplitString(string? textValues, char[] separators)
             return list.ToArray();
         }
 
+        internal bool IsErrorStatusCode(int statusCode, bool serverStatusCode)
+            => MutableSettings.IsErrorStatusCode(statusCode, serverStatusCode);
+
+        internal bool IsIntegrationEnabled(IntegrationId integration, bool defaultValue = true)
+            => MutableSettings.IsIntegrationEnabled(integration, defaultValue);
+
+        [Obsolete(DeprecationMessages.AppAnalytics)]
+        internal double? GetIntegrationAnalyticsSampleRate(IntegrationId integration, bool enabledWithGlobalSetting)
+            => MutableSettings.GetIntegrationAnalyticsSampleRate(integration, enabledWithGlobalSetting);
+
         internal string GetDefaultHttpClientExclusions()
         {
             if (IsRunningInAzureAppService)

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

@@ -170,12 +170,15 @@ internal static string GetLogDirectory(IConfigurationTelemetry telemetry)
 
     private static string GetLogDirectory(IConfigurationSource source, IConfigurationTelemetry telemetry)
     {
-        var logDirectory = new ConfigurationBuilder(source, telemetry).WithKeys(ConfigurationKeys.LogDirectory).AsString();
+        var configurationBuilder = new ConfigurationBuilder(source, telemetry);
+        var logDirectory = configurationBuilder.WithKeys(ConfigurationKeys.LogDirectory).AsString();
         if (string.IsNullOrEmpty(logDirectory))
         {
-#pragma warning disable 618 // ProfilerLogPath is deprecated but still supported
-            var nativeLogFile = new ConfigurationBuilder(source, telemetry).WithKeys(ConfigurationKeys.ProfilerLogPath).AsString();
-#pragma warning restore 618
+            // todo, handle in phase 2 with deprecations
+// ProfilerLogPath is deprecated but still supported. For now, we bypass the WithKeys analyzer, but later we want to pull deprecations differently as part of centralized file
+#pragma warning disable DD0008, 618
+            var nativeLogFile = configurationBuilder.WithKeys(ConfigurationKeys.TraceLogPath).AsString();
+#pragma warning restore DD0008, 618
 
             if (!string.IsNullOrEmpty(nativeLogFile))
             {

tracer/test/Datadog.Trace.Tests/Logging/DatadogLoggingFactoryTests.cs

@@ -32,7 +32,7 @@ public void UsesLogDirectoryWhenItExists(string obsoleteLogDirectory)
                 {
                     { ConfigurationKeys.LogDirectory, logDirectory },
 #pragma warning disable CS0618
-                    { ConfigurationKeys.ProfilerLogPath, obsoleteLogDirectory },
+                    { ConfigurationKeys.TraceLogPath, obsoleteLogDirectory },
 #pragma warning restore CS0618
                 });
 
@@ -55,7 +55,7 @@ public void UsesObsoleteLogDirectoryWhenAvailable(string logDirectory)
                 {
                     { ConfigurationKeys.LogDirectory, logDirectory },
 #pragma warning disable CS0618
-                    { ConfigurationKeys.ProfilerLogPath, obsoleteLogPath },
+                    { ConfigurationKeys.TraceLogPath, obsoleteLogPath },
 #pragma warning restore CS0618
                 });
 
@@ -76,7 +76,7 @@ public void UsesEnvironmentFallBackWhenBothNull(string logDirectory, string obso
                 {
                     { ConfigurationKeys.LogDirectory, logDirectory },
 #pragma warning disable CS0618
-                    { ConfigurationKeys.ProfilerLogPath, obsoleteLogDirectory },
+                    { ConfigurationKeys.TraceLogPath, obsoleteLogDirectory },
 #pragma warning restore CS0618
                 });