Replacing ConfigurationKeys by generated ones!

Author: anna-git

tracer/missing-nullability-files.csv

@@ -79,14 +79,6 @@ src/Datadog.Trace/ClrProfiler/ManualTracer.cs
 src/Datadog.Trace/ClrProfiler/NativeCallTargetUnmanagedMemoryHelper.cs
 src/Datadog.Trace/ClrProfiler/NativeMethods.cs
 src/Datadog.Trace/ClrProfiler/ScopeFactory.cs
-src/Datadog.Trace/Configuration/ConfigurationKeys.AppSec.cs
-src/Datadog.Trace/Configuration/ConfigurationKeys.AzureAppService.cs
-src/Datadog.Trace/Configuration/ConfigurationKeys.Debugger.cs
-src/Datadog.Trace/Configuration/ConfigurationKeys.DirectLogSubmission.cs
-src/Datadog.Trace/Configuration/ConfigurationKeys.Exporter.cs
-src/Datadog.Trace/Configuration/ConfigurationKeys.Iast.cs
-src/Datadog.Trace/Configuration/ConfigurationKeys.Logging.cs
-src/Datadog.Trace/Configuration/ConfigurationKeys.Rcm.cs
 src/Datadog.Trace/Configuration/DbmPropagationLevel.cs
 src/Datadog.Trace/Configuration/DeprecationMessages.cs
 src/Datadog.Trace/Configuration/IDynamicConfigurationManager.cs

tracer/src/Datadog.Trace.SourceGenerators/Configuration/ConfigurationKeysGenerator.cs

@@ -25,7 +25,7 @@ public class ConfigurationKeysGenerator : IIncrementalGenerator
     private const string SupportedConfigurationsFileName = "supported-configurations.json";
     private const string SupportedConfigurationsDocsFileName = "supported-configurations-docs.yaml";
     private const string ConfigurationKeysMappingFileName = "configuration_keys_mapping.json";
-    private const string GeneratedClassName = "ConfigurationKeys2";
+    private const string GeneratedClassName = "ConfigurationKeys";
     private const string Namespace = "Datadog.Trace.Configuration";
 
     /// <inheritdoc />

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

@@ -54,7 +54,7 @@ internal static class ProcessConfiguration
 
             if (logDirectory == null)
             {
-                // 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
+                // LogPath 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

tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj

@@ -51,14 +51,12 @@
     from a source generator as opposed to something that is coming from some other tool. -->
     <Compile Remove="$(GeneratedFolder)/*/**/*.cs" />
     <None Include="$(GeneratedFolder)/*/**/*.cs" />
-    <Compile Update="Configuration\ConfigurationKeys.*.cs" DependentUpon="ConfigurationKeys.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <Compile Include="..\Datadog.Trace\TracerConstants.cs" Link="TracerConstants.cs" />
     <Compile Include="..\Datadog.Trace\Agent\TracesTransportType.cs" Link="TracesTransportType.cs" />
-    <Compile Include="..\Datadog.Trace\Configuration\ConfigurationKeys.cs" Link="ConfigurationKeys.cs" />
-    <Compile Include="..\Datadog.Trace\Configuration\ConfigurationKeys.Exporter.cs" Link="ConfigurationKeys.Exporter.cs" />
+    <Compile Include="..\Datadog.Trace\Generated\net6.0\**\ConfigurationKeys*.g.cs" Link="Configuration\%(RecursiveDir)%(Filename)%(Extension)" />
     <Compile Include="..\Datadog.Trace\Configuration\DeprecationMessages.cs" Link="DeprecationMessages.cs" />
     <Compile Include="..\Datadog.Trace\Configuration\ExporterSettings.Shared.cs" Link="ExporterSettings.Shared.cs" />
   </ItemGroup>