From d9d1269cdb743f1d79c5356b04d694d4c81ac806 Mon Sep 17 00:00:00 2001 From: Anna Date: Wed, 22 Oct 2025 17:22:31 +0200 Subject: [PATCH 1/5] Replacing ConfigurationKeys by generated ones! --- tracer/missing-nullability-files.csv | 8 - .../ConfigurationKeysGenerator.cs | 2 +- .../ProcessConfiguration.cs | 2 +- .../Datadog.Trace.Tools.dd_dotnet.csproj | 4 +- .../Configuration/ConfigurationKeys.AppSec.cs | 155 --- .../ConfigurationKeys.AzureAppService.cs | 35 - .../ConfigurationKeys.Debugger.cs | 184 --- .../ConfigurationKeys.DirectLogSubmission.cs | 91 -- .../ConfigurationKeys.Exporter.cs | 105 -- .../Configuration/ConfigurationKeys.Iast.cs | 114 -- .../ConfigurationKeys.Logging.cs | 59 - .../ConfigurationKeys.OpenTelemetry.cs | 193 ---- .../ConfigurationKeys.Profiler.cs | 21 - .../Configuration/ConfigurationKeys.Rcm.cs | 34 - .../Configuration/ConfigurationKeys.cs | 1009 ----------------- .../Configuration/DeprecationMessages.cs | 7 +- .../ConfigurationKeys.AppSec.g.cs} | 2 +- .../ConfigurationKeys.AzureAppService.g.cs} | 2 +- .../ConfigurationKeys.CIVisibility.g.cs} | 2 +- ...figurationKeys.DataStreamsMonitoring.g.cs} | 2 +- .../ConfigurationKeys.Debug.g.cs} | 2 +- .../ConfigurationKeys.Debugger.g.cs} | 2 +- ...onfigurationKeys.DirectLogSubmission.g.cs} | 2 +- .../ConfigurationKeys.FeatureFlags.g.cs} | 2 +- .../ConfigurationKeys.Iast.g.cs} | 2 +- .../ConfigurationKeys.OpenTelemetry.g.cs} | 2 +- ...r.g.cs => ConfigurationKeys.Profiler.g.cs} | 2 +- .../ConfigurationKeys.Proxy.g.cs} | 2 +- .../ConfigurationKeys.Rcm.g.cs} | 2 +- .../ConfigurationKeys.TagPropagation.g.cs} | 2 +- ....g.cs => ConfigurationKeys.Telemetry.g.cs} | 2 +- .../ConfigurationKeys.g.cs} | 2 +- ...Sec.g.cs => ConfigurationKeys.AppSec.g.cs} | 2 +- .../ConfigurationKeys.AzureAppService.g.cs} | 2 +- .../ConfigurationKeys.CIVisibility.g.cs} | 2 +- ...figurationKeys.DataStreamsMonitoring.g.cs} | 2 +- .../ConfigurationKeys.Debug.g.cs} | 2 +- ...r.g.cs => ConfigurationKeys.Debugger.g.cs} | 2 +- ...onfigurationKeys.DirectLogSubmission.g.cs} | 2 +- .../ConfigurationKeys.FeatureFlags.g.cs} | 2 +- .../ConfigurationKeys.Iast.g.cs} | 2 +- .../ConfigurationKeys.OpenTelemetry.g.cs} | 2 +- .../ConfigurationKeys.Profiler.g.cs} | 2 +- .../ConfigurationKeys.Proxy.g.cs} | 2 +- .../ConfigurationKeys.Rcm.g.cs} | 2 +- .../ConfigurationKeys.TagPropagation.g.cs} | 2 +- ....g.cs => ConfigurationKeys.Telemetry.g.cs} | 2 +- .../ConfigurationKeys.g.cs} | 2 +- .../ConfigurationKeys.AppSec.g.cs} | 2 +- ...=> ConfigurationKeys.AzureAppService.g.cs} | 2 +- .../ConfigurationKeys.CIVisibility.g.cs} | 2 +- ...figurationKeys.DataStreamsMonitoring.g.cs} | 2 +- .../ConfigurationKeys.Debug.g.cs} | 2 +- .../ConfigurationKeys.Debugger.g.cs} | 2 +- ...onfigurationKeys.DirectLogSubmission.g.cs} | 2 +- .../ConfigurationKeys.FeatureFlags.g.cs} | 2 +- .../ConfigurationKeys.Iast.g.cs} | 2 +- .../ConfigurationKeys.OpenTelemetry.g.cs} | 2 +- .../ConfigurationKeys.Profiler.g.cs} | 2 +- .../ConfigurationKeys.Proxy.g.cs} | 2 +- .../ConfigurationKeys.Rcm.g.cs} | 2 +- .../ConfigurationKeys.TagPropagation.g.cs} | 2 +- ....g.cs => ConfigurationKeys.Telemetry.g.cs} | 2 +- .../ConfigurationKeys.g.cs} | 2 +- .../ConfigurationKeys.AppSec.g.cs} | 2 +- ...=> ConfigurationKeys.AzureAppService.g.cs} | 2 +- .../ConfigurationKeys.CIVisibility.g.cs} | 2 +- ...figurationKeys.DataStreamsMonitoring.g.cs} | 2 +- .../ConfigurationKeys.Debug.g.cs} | 2 +- ...r.g.cs => ConfigurationKeys.Debugger.g.cs} | 2 +- ...onfigurationKeys.DirectLogSubmission.g.cs} | 2 +- ...cs => ConfigurationKeys.FeatureFlags.g.cs} | 2 +- .../ConfigurationKeys.Iast.g.cs} | 2 +- ...s => ConfigurationKeys.OpenTelemetry.g.cs} | 2 +- ...r.g.cs => ConfigurationKeys.Profiler.g.cs} | 2 +- .../ConfigurationKeys.Proxy.g.cs} | 2 +- ...s2.Rcm.g.cs => ConfigurationKeys.Rcm.g.cs} | 2 +- .../ConfigurationKeys.TagPropagation.g.cs} | 2 +- ....g.cs => ConfigurationKeys.Telemetry.g.cs} | 2 +- .../ConfigurationKeys.g.cs} | 2 +- .../Configuration/TracerSettingsTests.cs | 8 +- .../ProfilerSettingsTests.cs | 2 +- .../ConfigurationTelemetryCollectorTests.cs | 6 +- 83 files changed, 81 insertions(+), 2086 deletions(-) delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.AppSec.cs delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.AzureAppService.cs delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Debugger.cs delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.DirectLogSubmission.cs delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Exporter.cs delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Iast.cs delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Logging.cs delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.OpenTelemetry.cs delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Profiler.cs delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Rcm.cs delete mode 100644 tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.cs rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.DataStreamsMonitoring.g.cs => ConfigurationKeys.DataStreamsMonitoring.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.Profiler.g.cs => ConfigurationKeys.Profiler.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.Telemetry.g.cs => ConfigurationKeys.Telemetry.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/{netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs => net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.AppSec.g.cs => ConfigurationKeys.AppSec.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.Debugger.g.cs => ConfigurationKeys.Debugger.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.Telemetry.g.cs => ConfigurationKeys.Telemetry.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs => net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.AzureAppService.g.cs => ConfigurationKeys.AzureAppService.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/{netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.Telemetry.g.cs => ConfigurationKeys.Telemetry.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs => netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs => netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.AzureAppService.g.cs => ConfigurationKeys.AzureAppService.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs => netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs => netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs => netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.Debugger.g.cs => ConfigurationKeys.Debugger.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.DirectLogSubmission.g.cs => ConfigurationKeys.DirectLogSubmission.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.FeatureFlags.g.cs => ConfigurationKeys.FeatureFlags.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs => netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.OpenTelemetry.g.cs => ConfigurationKeys.OpenTelemetry.g.cs} (99%) rename tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.Profiler.g.cs => ConfigurationKeys.Profiler.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/{net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs => netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.Rcm.g.cs => ConfigurationKeys.Rcm.g.cs} (96%) rename tracer/src/Datadog.Trace/Generated/{net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs => netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs} (95%) rename tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/{ConfigurationKeys2.Telemetry.g.cs => ConfigurationKeys.Telemetry.g.cs} (98%) rename tracer/src/Datadog.Trace/Generated/{netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs => netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs} (99%) diff --git a/tracer/missing-nullability-files.csv b/tracer/missing-nullability-files.csv index 32684c4f0b51..28508b6deeb1 100644 --- a/tracer/missing-nullability-files.csv +++ b/tracer/missing-nullability-files.csv @@ -77,14 +77,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 diff --git a/tracer/src/Datadog.Trace.SourceGenerators/Configuration/ConfigurationKeysGenerator.cs b/tracer/src/Datadog.Trace.SourceGenerators/Configuration/ConfigurationKeysGenerator.cs index 14fa6a0b4428..72e0c604a0c7 100644 --- a/tracer/src/Datadog.Trace.SourceGenerators/Configuration/ConfigurationKeysGenerator.cs +++ b/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"; /// diff --git a/tracer/src/Datadog.Trace.Tools.Runner/ProcessConfiguration.cs b/tracer/src/Datadog.Trace.Tools.Runner/ProcessConfiguration.cs index cd8cca66735f..4eae95833595 100644 --- a/tracer/src/Datadog.Trace.Tools.Runner/ProcessConfiguration.cs +++ b/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 diff --git a/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj b/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj index 26660f1f4bea..04cac0c8923d 100644 --- a/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj +++ b/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. --> - - - + diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.AppSec.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.AppSec.cs deleted file mode 100644 index bbfeea09ccfe..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.AppSec.cs +++ /dev/null @@ -1,155 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// - -namespace Datadog.Trace.Configuration -{ - internal partial class ConfigurationKeys - { - internal class AppSec - { - /// - /// Configuration key for enabling or disabling the AppSec. - /// Default is value is false (disabled). - /// - public const string Enabled = "DD_APPSEC_ENABLED"; - - /// - /// Override the default rules file provided. Must be a path to a valid JSON rules file. - /// Default is value is null (do not override). - /// - public const string Rules = "DD_APPSEC_RULES"; - - /// - /// Configuration key indicating the optional name of the custom header to take into account for the ip address. - /// Default is value is null (do not override). - /// - public const string CustomIpHeader = "DD_APPSEC_IPHEADER"; - - /// - /// Comma separated keys indicating the optional custom headers the user wants to send. - /// Default is value is null. - /// - public const string ExtraHeaders = "DD_APPSEC_EXTRA_HEADERS"; - - /// - /// Specifies if the AppSec traces should be explicitly kept or dropped. - /// Default is true, to keep all traces, false means drop all traces (by setting AutoReject as sampling priority). - /// For internal testing only. - /// - internal const string KeepTraces = "DD_APPSEC_KEEP_TRACES"; - - /// - /// Limits the amount of AppSec traces sent per second with an integer value, strictly positive. - /// - internal const string TraceRateLimit = "DD_APPSEC_TRACE_RATE_LIMIT"; - - /// - /// WAF timeout in microseconds of each WAF execution (the timeout value passed to ddwaf_run). - /// - internal const string WafTimeout = "DD_APPSEC_WAF_TIMEOUT"; - - /// - /// default value to true. Set to false to disable exploit prevention. - /// - internal const string RaspEnabled = "DD_APPSEC_RASP_ENABLED"; - - /// - /// with a default value of true, it allows a customer to disable the generation of stack traces, for any ASM-specific purpose such as RASP. - /// - internal const string StackTraceEnabled = "DD_APPSEC_STACK_TRACE_ENABLED"; - - /// - /// with a default value of 2, defines the maximum number of stack traces to be reported due to RASP events. 0 for unlimited. - /// - internal const string MaxStackTraces = "DD_APPSEC_MAX_STACK_TRACES"; - - /// - /// with a default value of 32, defines the maximum depth of a stack trace to be reported due to RASP events. O for unlimited. - /// - internal const string MaxStackTraceDepth = "DD_APPSEC_MAX_STACK_TRACE_DEPTH"; - - /// - /// with a default value of 75, defines the percentage of frames taken from the top of the stack when trimming. Min 0, Max 100 - /// - internal const string MaxStackTraceDepthTopPercent = "DD_APPSEC_MAX_STACK_TRACE_DEPTH_TOP_PERCENT"; - - /// - /// The regex that will be used to obfuscate possible sensitive data in keys that are highlighted WAF as potentially malicious - /// - internal const string ObfuscationParameterKeyRegex = "DD_APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP"; - - /// - /// The regex that will be used to obfuscate possible sensitive data in values that are highlighted WAF as potentially malicious - /// - internal const string ObfuscationParameterValueRegex = "DD_APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP"; - - /// - /// Blocking response template for HTML content. This template is used in combination with the status code to craft and send a response upon blocking the request. - /// - internal const string HtmlBlockedTemplate = "DD_APPSEC_HTTP_BLOCKED_TEMPLATE_HTML"; - - /// - /// Blocking response template for Json content. This template is used in combination with the status code to craft and send a response upon blocking the request. - /// - internal const string JsonBlockedTemplate = "DD_APPSEC_HTTP_BLOCKED_TEMPLATE_JSON"; - - /// - /// Deprecate. Automatic tracking of user events mode. Values can be disabled, safe or extended. - /// This config is in the process of being deprecated. Please use DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE - /// instead. - /// Values will be automatically translated: - /// disabled = disabled - /// safe = anon - /// extended = ident - /// - internal const string UserEventsAutomatedTracking = "DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING"; - - /// - /// Automatic instrumentation of user event mode. Values can be ident, disabled, anon. - /// - internal const string UserEventsAutoInstrumentationMode = "DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE"; - - /// - /// When ASM is enabled, collects in spans endpoints apis schemas analyzed by the waf, default value is true. - /// - internal const string ApiSecurityEnabled = "DD_API_SECURITY_ENABLED"; - - /// - /// Api security sample delay in seconds , should be a float. Set to 0 for testing purposes. default value of 30. - /// - internal const string ApiSecuritySampleDelay = "DD_API_SECURITY_SAMPLE_DELAY"; - - /// - /// with a default value of true, it allows a customer to disable the collection of endpoints for API Security. - /// - internal const string ApiSecurityEndpointCollectionEnabled = "DD_API_SECURITY_ENDPOINT_COLLECTION_ENABLED"; - - /// - /// with a default value of 300, it defines the maximum number of endpoints to be collected (serialized) for API Security. - /// - internal const string ApiSecurityEndpointCollectionMessageLimit = "DD_API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT"; - - /// - /// Enables the parsing of the response body in the API Security module. Defaults to true - /// - internal const string ApiSecurityParseResponseBody = "DD_API_SECURITY_PARSE_RESPONSE_BODY"; - - /// - /// Use new unsafe encoder for the waf - /// - internal const string UseUnsafeEncoder = "DD_EXPERIMENTAL_APPSEC_USE_UNSAFE_ENCODER"; - - /// - /// Activate debug logs for the WAF - /// - internal const string WafDebugEnabled = "DD_APPSEC_WAF_DEBUG"; - - /// - /// Activate SCA (Software Composition Analysis), used in the backend - /// - internal const string ScaEnabled = "DD_APPSEC_SCA_ENABLED"; - } - } -} diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.AzureAppService.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.AzureAppService.cs deleted file mode 100644 index b973d1b93974..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.AzureAppService.cs +++ /dev/null @@ -1,35 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// - -namespace Datadog.Trace.Configuration -{ - internal partial class ConfigurationKeys - { - internal class AzureAppService - { - /// - /// Configuration key which is used as a flag to tell us whether we are instrumenting an Azure App Service - /// using the AAS Site Extension. This env var is set using the applicationHost.xdt file. - /// - internal const string AzureAppServicesContextKey = "DD_AZURE_APP_SERVICES"; - - /// - /// Configuration key which has the running version of the Azure App Services Site Extension. - /// This env var is set in the applicationHost.xdt file. - /// - internal const string SiteExtensionVersionKey = "DD_AAS_DOTNET_EXTENSION_VERSION"; - - /// - /// Used to force the loader to start the trace agent (in case automatic instrumentation is disabled) - /// - public const string AasEnableCustomTracing = "DD_AAS_ENABLE_CUSTOM_TRACING"; - - /// - /// Used to force the loader to start dogstatsd (in case automatic instrumentation is disabled) - /// - public const string AasEnableCustomMetrics = "DD_AAS_ENABLE_CUSTOM_METRICS"; - } - } -} diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Debugger.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Debugger.cs deleted file mode 100644 index e4a2481167f0..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Debugger.cs +++ /dev/null @@ -1,184 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// - -using System; -using Datadog.Trace.Debugger; -using Datadog.Trace.Debugger.ExceptionAutoInstrumentation; - -namespace Datadog.Trace.Configuration -{ - internal static partial class ConfigurationKeys - { - internal static class Debugger - { - /// - /// Configuration key for enabling or disabling Dynamic Instrumentation. - /// Default value is false (disabled). - /// - /// - public const string DynamicInstrumentationEnabled = "DD_DYNAMIC_INSTRUMENTATION_ENABLED"; - - /// - /// Configuration key for the max object depth to serialize for probe snapshots. - /// Default value is 1. - /// - /// - public const string MaxDepthToSerialize = "DD_DYNAMIC_INSTRUMENTATION_MAX_DEPTH_TO_SERIALIZE"; - - /// - /// Configuration key for the maximum duration (in milliseconds) to run serialization for probe snapshots. - /// Default value is 150 ms. - /// - /// - public const string MaxTimeToSerialize = "DD_DYNAMIC_INSTRUMENTATION_MAX_TIME_TO_SERIALIZE"; - - /// - /// Configuration key for the maximum upload batch size. - /// Default value is 100. - /// - /// - public const string UploadBatchSize = "DD_DYNAMIC_INSTRUMENTATION_UPLOAD_BATCH_SIZE"; - - /// - /// Configuration key for the maximum symbol size to upload (in bytes). - /// Default value is 1 mb. - /// - /// - public const string SymbolDatabaseBatchSizeInBytes = "DD_SYMBOL_DATABASE_BATCH_SIZE_BYTES"; - - /// - /// Configuration key for allowing upload of symbol data (such as method names, parameter names, etc) to Datadog. - /// Default value is true (enabled). - /// - /// - public const string SymbolDatabaseUploadEnabled = "DD_SYMBOL_DATABASE_UPLOAD_ENABLED"; - - /// - /// Configuration key for enabling or disabling compression for symbols payload. - /// Default value is true (enabled). - /// - /// - public const string SymbolDatabaseCompressionEnabled = "DD_SYMBOL_DATABASE_COMPRESSION_ENABLED"; - - /// - /// Configuration key for a separated comma list of libraries to include in the 3rd party detection - /// Default value is empty. - /// - public const string ThirdPartyDetectionIncludes = "DD_THIRD_PARTY_DETECTION_INCLUDES"; - - /// - /// Configuration key for a separated comma list of libraries to exclude for the 3rd party detection - /// Default value is empty. - /// - public const string ThirdPartyDetectionExcludes = "DD_THIRD_PARTY_DETECTION_EXCLUDES"; - - /// - /// Configuration key for a separated comma list of libraries to include in the 3rd party detection - /// Default value is empty. - /// - public const string SymDbThirdPartyDetectionIncludes = "DD_SYMBOL_DATABASE_THIRD_PARTY_DETECTION_INCLUDES"; - - /// - /// Configuration key for a separated comma list of libraries to exclude in the 3rd party detection - /// Default value is empty. - /// - public const string SymDbThirdPartyDetectionExcludes = "DD_SYMBOL_DATABASE_THIRD_PARTY_DETECTION_EXCLUDES"; - - /// - /// Configuration key for the interval (in seconds) between sending probe statuses. - /// Default value is 3600. - /// - /// - public const string DiagnosticsInterval = "DD_DYNAMIC_INSTRUMENTATION_DIAGNOSTICS_INTERVAL"; - - /// - /// Configuration key for the interval (in milliseconds) between flushing statuses. - /// Default value is 0 (dynamic). - /// - /// - public const string UploadFlushInterval = "DD_DYNAMIC_INSTRUMENTATION_UPLOAD_FLUSH_INTERVAL"; - - /// - /// Configuration key for set of identifiers that are used in redaction decisions. - /// - /// - public const string RedactedIdentifiers = "DD_DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS"; - - /// - /// Configuration key for set of identifiers that are excluded from redaction decisions. - /// - /// - public const string RedactionExcludedIdentifiers = "DD_DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS"; - - /// - /// Configuration key for set of identifiers that are excluded from redaction decisions. - /// - /// - public const string RedactedExcludedIdentifiers = "DD_DYNAMIC_INSTRUMENTATION_REDACTED_EXCLUDED_IDENTIFIERS"; - - /// - /// Configuration key for set of types that are used in redaction decisions. - /// - /// - public const string RedactedTypes = "DD_DYNAMIC_INSTRUMENTATION_REDACTED_TYPES"; - - /// - /// The old configuration key for enabling or disabling Exception Replay. - /// Default value is false (disabled). - /// - /// - [Obsolete] - public const string ExceptionDebuggingEnabled = "DD_EXCEPTION_DEBUGGING_ENABLED"; - - /// - /// Configuration key for enabling or disabling Exception Replay. - /// Default value is false (disabled). - /// - /// - public const string ExceptionReplayEnabled = "DD_EXCEPTION_REPLAY_ENABLED"; - - /// - /// Configuration key for the maximum number of frames in a call stack we would like to capture values for. - /// - /// - public const string ExceptionReplayCaptureMaxFrames = "DD_EXCEPTION_REPLAY_CAPTURE_MAX_FRAMES"; - - /// - /// Configuration key to enable capturing the variables of all the frames in exception call stack. - /// Default value is false. - /// - /// - public const string ExceptionReplayCaptureFullCallStackEnabled = "DD_EXCEPTION_REPLAY_CAPTURE_FULL_CALLSTACK_ENABLED"; - - /// - /// Configuration key for the interval used to track exceptions - /// Default value is 1h. - /// - /// - public const string RateLimitSeconds = "DD_EXCEPTION_REPLAY_RATE_LIMIT_SECONDS"; - - /// - /// Configuration key for setting the maximum number of exceptions to be analyzed by Exception Replay within a 1-second time interval. - /// Default value is 100. - /// - /// - public const string MaxExceptionAnalysisLimit = "DD_EXCEPTION_REPLAY_MAX_EXCEPTION_ANALYSIS_LIMIT"; - - /// - /// Configuration key to enable tag code origin for span. - /// Default value is false. - /// - /// - public const string CodeOriginForSpansEnabled = "DD_CODE_ORIGIN_FOR_SPANS_ENABLED"; - - /// - /// Configuration key for setting the number of frames to be tagged in exit span code origin. - /// Default value is 8. - /// - /// - public const string CodeOriginMaxUserFrames = "DD_CODE_ORIGIN_FOR_SPANS_MAX_USER_FRAMES"; - } - } -} diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.DirectLogSubmission.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.DirectLogSubmission.cs deleted file mode 100644 index 55f4e0cd1b08..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.DirectLogSubmission.cs +++ /dev/null @@ -1,91 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// - -using Datadog.Trace.Logging.DirectSubmission; - -namespace Datadog.Trace.Configuration -{ - internal static partial class ConfigurationKeys - { - internal static class DirectLogSubmission - { - /// - /// Configuration key for a list of direct log submission integrations to enable. - /// Only selected integrations are enabled for direct log submission - /// Default is empty (direct log submission disabled). - /// Supports multiple values separated with semi-colons. - /// - /// - public const string EnabledIntegrations = "DD_LOGS_DIRECT_SUBMISSION_INTEGRATIONS"; - - /// - /// Set the name of the originating host for direct logs submission. - /// Required for direct logs submission (default is machine name). - /// - /// - public const string Host = "DD_LOGS_DIRECT_SUBMISSION_HOST"; - - /// - /// Set the originating source for direct logs submission. - /// Default is 'csharp' - /// - /// - public const string Source = "DD_LOGS_DIRECT_SUBMISSION_SOURCE"; - - /// - /// Configuration key for a list of tags to be applied globally to all logs directly submitted. - /// Supports multiple key key-value pairs which are comma-separated, and for which the key and - /// value are colon-separated. For example Key1:Value1, Key2:Value2. If not provided, - /// are used instead - /// - /// - public const string GlobalTags = "DD_LOGS_DIRECT_SUBMISSION_TAGS"; - - /// - /// Configuration key for the url to send logs to. - /// Default value uses the domain set in , so defaults to - /// https://http-intake.logs.datadoghq.com:443. - /// - /// - public const string Url = "DD_LOGS_DIRECT_SUBMISSION_URL"; - - /// - /// Configuration key for the minimum level logs should have to be sent to the intake. - /// Default value is Information. - /// Should be one of Verbose,Debug,Information,Warning,Error,Fatal - /// - /// - public const string MinimumLevel = "DD_LOGS_DIRECT_SUBMISSION_MINIMUM_LEVEL"; - - /// - /// Configuration key for the maximum number of logs to send at one time - /// Default value is 1,000, the maximum accepted by the Datadog log API - /// - /// - public const string BatchSizeLimit = "DD_LOGS_DIRECT_SUBMISSION_MAX_BATCH_SIZE"; - - /// - /// Configuration key for the maximum number of logs to hold in internal queue at any one time - /// Default value is 100,000. - /// - /// - public const string QueueSizeLimit = "DD_LOGS_DIRECT_SUBMISSION_MAX_QUEUE_SIZE"; - - /// - /// Configuration key for the time to wait between checking for batches - /// Default value is 2s. - /// - /// - public const string BatchPeriodSeconds = "DD_LOGS_DIRECT_SUBMISSION_BATCH_PERIOD_SECONDS"; - - /// - /// Configuration key to enable or disable direct log submission for Azure Functions host. - /// Default value is false. - /// - /// - public const string AzureFunctionsHostEnabled = "DD_LOGS_DIRECT_SUBMISSION_AZURE_FUNCTIONS_HOST_ENABLED"; - } - } -} diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Exporter.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Exporter.cs deleted file mode 100644 index 647269229e40..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Exporter.cs +++ /dev/null @@ -1,105 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// - -namespace Datadog.Trace.Configuration -{ - /// - /// String constants for standard Datadog configuration keys. - /// - internal static partial class ConfigurationKeys - { - /// - /// Configuration key for the Agent host where the Tracer can send traces. - /// Overridden by if present. - /// Default value is "localhost". - /// - /// - public const string AgentHost = "DD_AGENT_HOST"; - - /// - /// Configuration key for the Agent port where the Tracer can send traces. - /// Default value is 8126. - /// - /// - public const string AgentPort = "DD_TRACE_AGENT_PORT"; - - /// - /// Configuration key for the named pipe where the Tracer can send traces. - /// Default value is null. - /// - /// - public const string TracesPipeName = "DD_TRACE_PIPE_NAME"; - - /// - /// Configuration key for setting the timeout in milliseconds for named pipes communication. - /// Default value is 0. - /// - /// - public const string TracesPipeTimeoutMs = "DD_TRACE_PIPE_TIMEOUT_MS"; - - /// - /// Configuration key for the named pipe that DogStatsD binds to. - /// Default value is null. - /// - /// - public const string MetricsPipeName = "DD_DOGSTATSD_PIPE_NAME"; - - /// - /// Sibling setting for . - /// Used to force a specific port binding for the Trace Agent. - /// Default value is 8126. - /// - /// - public const string TraceAgentPortKey = "DD_APM_RECEIVER_PORT"; - - /// - /// Configuration key for the Agent URL where the Tracer can send traces. - /// Overrides values in and if present. - /// Default value is "http://localhost:8126". - /// - /// - public const string AgentUri = "DD_TRACE_AGENT_URL"; - - /// - /// Configuration key for the DogStatsd port where the Tracer can send metrics. - /// Default value is 8125. - /// - /// - public const string DogStatsdPort = "DD_DOGSTATSD_PORT"; - - /// - /// Configuration key to enable sending partial traces to the agent - /// - /// - public const string PartialFlushEnabled = "DD_TRACE_PARTIAL_FLUSH_ENABLED"; - - /// - /// Configuration key to set the minimum number of closed spans in a trace before it's partially flushed - /// - /// - public const string PartialFlushMinSpans = "DD_TRACE_PARTIAL_FLUSH_MIN_SPANS"; - - /// - /// Configuration key for the unix domain socket where the Tracer can send traces. - /// Default value is null. - /// - /// - public const string TracesUnixDomainSocketPath = "DD_APM_RECEIVER_SOCKET"; - - /// - /// Configuration key for the unix domain socket that DogStatsD binds to. - /// Default value is null. - /// - /// - public const string MetricsUnixDomainSocketPath = "DD_DOGSTATSD_SOCKET"; - - /// - /// Configuration key for the location where the Tracer can send DogStatsD metrics. - /// Default value is "udp://127.0.0.1:8125". - /// - /// - public const string MetricsUri = "DD_DOGSTATSD_URL"; - } -} diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Iast.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Iast.cs deleted file mode 100644 index 2f491bbbf0bf..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Iast.cs +++ /dev/null @@ -1,114 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// - -using Datadog.Trace.Iast.Settings; - -namespace Datadog.Trace.Configuration -{ - internal partial class ConfigurationKeys - { - internal class Iast - { - /// - /// Configuration key for enabling or disabling the IAST. - /// Default is value is false (disabled). - /// - public const string Enabled = "DD_IAST_ENABLED"; - - /// - /// Configuration key for controlling which weak hashing algorithms are reported. - /// - public const string WeakHashAlgorithms = "DD_IAST_WEAK_HASH_ALGORITHMS"; - - /// - /// Configuration key for controlling which weak cipher algorithms are reported. - /// - public const string WeakCipherAlgorithms = "DD_IAST_WEAK_CIPHER_ALGORITHMS"; - - /// - /// Configuration key for enabling or disabling the vulnerability duplication detection. - /// When enabled, a vulnerability will only be reported once in the lifetime of an app, - /// instead of on every usage. Default is value is true (enabled). - /// - public const string IsIastDeduplicationEnabled = "DD_IAST_DEDUPLICATION_ENABLED"; - - /// - /// Configuration key for controlling the percentage of requests - /// to be analyzed by IAST, between 1 and 100. Defaults to 30. - /// - public const string RequestSampling = "DD_IAST_REQUEST_SAMPLING"; - - /// - /// Configuration key for the maximum number of requests - /// to be analyzed by IAST concurrently. Defaults to 2. - /// - public const string MaxConcurrentRequests = "DD_IAST_MAX_CONCURRENT_REQUESTS"; - - /// - /// Configuration key for the maximum number of ranges - /// a tainted object can hold. Defaults to 10. - /// - public const string MaxRangeCount = "DD_IAST_MAX_RANGE_COUNT"; - - /// - /// Configuration key for the maximum number of IAST vulnerabilities to - /// detect in a request. Defaults to 2. - /// - public const string VulnerabilitiesPerRequest = "DD_IAST_VULNERABILITIES_PER_REQUEST"; - - /// - /// Configuration key for specifying a custom regex to obfuscate source keys. - /// Default value is in TracerSettings - /// - /// - public const string RedactionEnabled = "DD_IAST_REDACTION_ENABLED"; - - /// - /// Configuration key for specifying a custom regex to obfuscate source keys. - /// Default value is in TracerSettings - /// - /// - public const string RedactionKeysRegex = "DD_IAST_REDACTION_NAME_PATTERN"; - - /// - /// Configuration key for specifying a custom regex to obfuscate source values. - /// Default value is in TracerSettings - /// - /// - public const string RedactionValuesRegex = "DD_IAST_REDACTION_VALUE_PATTERN"; - - /// - /// Configuration key for specifying a timeout in milliseconds to the execution of regexes in IAST - /// Default value is 200ms - /// - /// - public const string RegexTimeout = "DD_IAST_REGEXP_TIMEOUT"; - - /// - /// Configuration key for IAST verbosity. - /// Default value is INFORMATION - /// - public const string TelemetryVerbosity = "DD_IAST_TELEMETRY_VERBOSITY"; - - /// - /// Configuration key for IAST evidence max lenght in chars. - /// Default value is 250 - /// - public const string TruncationMaxValueLength = "DD_IAST_TRUNCATION_MAX_VALUE_LENGTH"; - - /// - /// Configuration key for number of rows to taint on each Db query in IAST. - /// Default value is 1 - /// - public const string DataBaseRowsToTaint = "DD_IAST_DB_ROWS_TO_TAINT"; - - /// - /// Configuration key for number of rows to taint on each Db query in IAST. - /// Default value is 1 - /// - public const string CookieFilterRegex = "DD_IAST_COOKIE_FILTER_PATTERN"; - } - } -} diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Logging.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Logging.cs deleted file mode 100644 index b66569f3d8ff..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Logging.cs +++ /dev/null @@ -1,59 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// - -using System; - -namespace Datadog.Trace.Configuration; - -internal static partial class ConfigurationKeys -{ - /// - /// Configuration key for enabling or disabling the diagnostic log at startup - /// - /// - public const string StartupDiagnosticLogEnabled = "DD_TRACE_STARTUP_LOGS"; - - /// - /// Configuration key for setting the approximate maximum size, - /// in bytes, for Tracer log files. - /// Default value is 10 MB. - /// - public const string MaxLogFileSize = "DD_MAX_LOGFILE_SIZE"; - - /// - /// Configuration key for setting the number of seconds between, - /// identical log messages, for Tracer log files. - /// Default value is 0 and setting to 0 disables rate limiting. - /// - public const string LogRateLimit = "DD_TRACE_LOGGING_RATE"; - - /// - /// Configuration key for setting the path to the .NET Tracer native log file. - /// This also determines the output folder of the .NET Tracer managed log files. - /// Overridden by if present. - /// - [Obsolete(DeprecationMessages.LogPath)] - public const string ProfilerLogPath = "DD_TRACE_LOG_PATH"; - - /// - /// Configuration key for setting the directory of the .NET Tracer logs. - /// Overrides the value in if present. - /// Default value is "%ProgramData%"\Datadog .NET Tracer\logs\" on Windows - /// or "/var/log/datadog/dotnet/" on Linux. - /// - public const string LogDirectory = "DD_TRACE_LOG_DIRECTORY"; - - /// - /// Configuration key for setting in number of days when to delete log files based on their last writetime date. - /// - public const string LogFileRetentionDays = "DD_TRACE_LOGFILE_RETENTION_DAYS"; - - /// - /// Configuration key for locations to write internal diagnostic logs. - /// Currently only file is supported - /// Defaults to file - /// - public const string LogSinks = "DD_TRACE_LOG_SINKS"; -} diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.OpenTelemetry.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.OpenTelemetry.cs deleted file mode 100644 index 4e08fe89a446..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.OpenTelemetry.cs +++ /dev/null @@ -1,193 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// -#nullable enable - -namespace Datadog.Trace.Configuration -{ - internal partial class ConfigurationKeys - { - internal class OpenTelemetry - { - /// - /// Configuration key for disabling the OpenTelemetry API's. - /// - public const string SdkDisabled = "OTEL_SDK_DISABLED"; - - /// - /// Configuration key for a list of key-value pairs to be set as - /// resource attributes. We currently map these to span tags. - /// - public const string ResourceAttributes = "OTEL_RESOURCE_ATTRIBUTES"; - - /// - /// Configuration key for a list of tracing propagators. - /// Datadog only supports a subset of the OpenTelemetry propagators. - /// Also, the 'b3' OpenTelemetry propagator is mapped to the - /// 'b3 single header' Datadog propagator. - /// - public const string Propagators = "OTEL_PROPAGATORS"; - - /// - /// Configuration key to set the application's default service name. - /// - public const string ServiceName = "OTEL_SERVICE_NAME"; - - /// - /// Configuration key to set the log level. - /// - public const string LogLevel = "OTEL_LOG_LEVEL"; - - /// - /// Configuration key to set the exporter for traces. - /// We only recognize the value 'none', which is the - /// equivalent of setting - /// to false. - /// - public const string TracesExporter = "OTEL_TRACES_EXPORTER"; - - /// - /// Configuration key to set the sampler for traces. - /// to false. - /// - public const string TracesSampler = "OTEL_TRACES_SAMPLER"; - - /// - /// Configuration key to set an additional argument for the - /// traces sampler. - /// to false. - /// - public const string TracesSamplerArg = "OTEL_TRACES_SAMPLER_ARG"; - - /// - /// Configuration key to set the exporter for metrics. - /// We only recognize the values of 'otlp' and 'none', a value of - /// 'none' disables the emission of metrics which is the - /// equivalent of setting - /// to false. - /// - public const string MetricsExporter = "OTEL_METRICS_EXPORTER"; - - /// - /// Configuration key to set the export interval for metrics in milliseconds. - /// Specifies the time interval between the start of two export attempts. - /// Default value is 10000ms (10s) for Datadog. - /// This deviates from OpenTelemetry specification default of 60000ms (60s). - /// - public const string MetricExportIntervalMs = "OTEL_METRIC_EXPORT_INTERVAL"; - - /// - /// Configuration key to set the export timeout for metrics in milliseconds. - /// Specifies the maximum time allowed for collecting and exporting metrics. - /// Default value is 7500ms (7.5s) for Datadog. - /// This deviates from OpenTelemetry specification default of 30000ms (30s). - /// - public const string MetricExportTimeoutMs = "OTEL_METRIC_EXPORT_TIMEOUT"; - - /// - /// Configuration key to set the OTLP protocol for metrics export. - /// Takes precedence over . - /// Valid values: grpc, http/protobuf, http/json, defaults to grpc. - /// - public const string ExporterOtlpMetricsProtocol = "OTEL_EXPORTER_OTLP_METRICS_PROTOCOL"; - - /// - /// Configuration key to set the OTLP endpoint URL for metrics. - /// Takes precedence over . - /// This value typically ends with v1/metrics when using OTLP/HTTP. - /// Expects values like `unix:///path/to/socket.sock` for UDS, `\\.\pipename\` for Windows Named Pipes. - /// Default values: gRPC: http://localhost:4317, HTTP: http://localhost:4318/v1/metrics - /// - public const string ExporterOtlpMetricsEndpoint = "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT"; - - /// - /// Configuration key to set custom headers for OTLP metrics export. - /// Takes precedence over . - /// Format: api-key=key,other=value. - /// - public const string ExporterOtlpMetricsHeaders = "OTEL_EXPORTER_OTLP_METRICS_HEADERS"; - - /// - /// Configuration key to set the request timeout for OTLP metrics export in milliseconds. - /// Takes precedence over . - /// Default value is 10000ms. - /// - public const string ExporterOtlpMetricsTimeoutMs = "OTEL_EXPORTER_OTLP_METRICS_TIMEOUT"; - - /// - /// Configuration key to set the temporality preference for OTLP metrics export. - /// Supported values: delta, cumulative, lowmemory. - /// Default value is delta for Datadog. - /// This deviates from OpenTelemetry specification default of cumulative. - /// - public const string ExporterOtlpMetricsTemporalityPreference = "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE"; - - /// - /// Configuration key to set the OTLP protocol (fallback for metrics-specific protocol). - /// Used when is not set. - /// Valid values: grpc, http/protobuf, http/json, defaults to grpc. - /// - public const string ExporterOtlpProtocol = "OTEL_EXPORTER_OTLP_PROTOCOL"; - - /// - /// Configuration key to set the OTLP endpoint URL (fallback for metrics-specific endpoint). - /// Used when is not set. - /// Expects values like `unix:///path/to/socket.sock` for UDS, `\\.\pipename\` for Windows Named Pipes. - /// Default values: gRPC: http://localhost:4317, HTTP: http://localhost:4318 - /// - public const string ExporterOtlpEndpoint = "OTEL_EXPORTER_OTLP_ENDPOINT"; - - /// - /// Configuration key to set custom headers for OTLP export (fallback for metrics-specific headers). - /// Used when is not set. - /// Format: api-key=key,other=value. - /// - public const string ExporterOtlpHeaders = "OTEL_EXPORTER_OTLP_HEADERS"; - - /// - /// Configuration key to set the request timeout for OTLP export (fallback for metrics-specific timeout). - /// Used when is not set. - /// Default value is 10000ms. - /// - public const string ExporterOtlpTimeoutMs = "OTEL_EXPORTER_OTLP_TIMEOUT"; - - /// - /// Configuration key to set the exporter for logs. - /// We only recognize the values of 'otlp' and 'none', a value of - /// 'none' disables the emission of logs. - /// - public const string LogsExporter = "OTEL_LOGS_EXPORTER"; - - /// - /// Configuration key to set the OTLP protocol for logs export. - /// Takes precedence over . - /// Valid values: grpc, http/protobuf, http/json, defaults to grpc. - /// - public const string ExporterOtlpLogsProtocol = "OTEL_EXPORTER_OTLP_LOGS_PROTOCOL"; - - /// - /// Configuration key to set the OTLP endpoint URL for logs. - /// Takes precedence over . - /// This value typically ends with v1/logs when using OTLP/HTTP. - /// Expects values like `unix:///path/to/socket.sock` for UDS, `\\.\pipename\` for Windows Named Pipes. - /// Default values: gRPC: http://localhost:4317, HTTP: http://localhost:4318/v1/logs - /// - public const string ExporterOtlpLogsEndpoint = "OTEL_EXPORTER_OTLP_LOGS_ENDPOINT"; - - /// - /// Configuration key to set custom headers for OTLP logs export. - /// Takes precedence over . - /// Format: api-key=key,other=value. - /// - public const string ExporterOtlpLogsHeaders = "OTEL_EXPORTER_OTLP_LOGS_HEADERS"; - - /// - /// Configuration key to set the request timeout for OTLP logs export in milliseconds. - /// Takes precedence over . - /// Default value is 10000ms. - /// - public const string ExporterOtlpLogsTimeoutMs = "OTEL_EXPORTER_OTLP_LOGS_TIMEOUT"; - } - } -} diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Profiler.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Profiler.cs deleted file mode 100644 index 68e9d0739f9b..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Profiler.cs +++ /dev/null @@ -1,21 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// - -#nullable enable - -namespace Datadog.Trace.Configuration -{ - internal static partial class ConfigurationKeys - { - internal static class Profiler - { - public const string ProfilingEnabled = "DD_PROFILING_ENABLED"; - public const string CodeHotspotsEnabled = "DD_PROFILING_CODEHOTSPOTS_ENABLED"; - public const string EndpointProfilingEnabled = "DD_PROFILING_ENDPOINT_COLLECTION_ENABLED"; - public const string SsiDeployed = "DD_INJECTION_ENABLED"; - public const string ProfilerManagedActivationEnabled = "DD_PROFILING_MANAGED_ACTIVATION_ENABLED"; - } - } -} diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Rcm.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Rcm.cs deleted file mode 100644 index 9c43ef2c7e7a..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Rcm.cs +++ /dev/null @@ -1,34 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// - -using System; -using Datadog.Trace.RemoteConfigurationManagement; - -namespace Datadog.Trace.Configuration -{ - internal static partial class ConfigurationKeys - { - internal static class Rcm - { - /// - /// Is remote configuration management (RCM) enabled. Defaults to true. RCM requires - /// the use of the full agent, so will not always be available. This switch is primarily - /// intended for testing and for explicitly disabling RCM even though it is available. - /// - public const string RemoteConfigurationEnabled = "DD_REMOTE_CONFIGURATION_ENABLED"; - - /// - /// Configuration key for RCM poll interval (in seconds). - /// Default value is 5 s - /// Maximum value is 5 s - /// - /// - public const string PollInterval = "DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS"; - - [Obsolete("Use PollInterval instead")] - public const string PollIntervalInternal = "DD_INTERNAL_RCM_POLL_INTERVAL"; - } - } -} diff --git a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.cs b/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.cs deleted file mode 100644 index 098db81d60fe..000000000000 --- a/tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.cs +++ /dev/null @@ -1,1009 +0,0 @@ -// -// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License. -// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. -// -#nullable enable - -using System; -using Datadog.Trace.Telemetry; - -namespace Datadog.Trace.Configuration -{ - /// - /// String constants for standard Datadog configuration keys. - /// - internal static partial class ConfigurationKeys - { - // temporary so that ConfigurationKeys2 can resolve reference, all this is removed later - public const string TraceLogPath = "DD_TRACE_LOG_PATH"; - - /// - /// Configuration key to enable or disable the ActivityListener. - /// - public const string ActivityListenerEnabled = "DD_TRACE_ACTIVITY_LISTENER_ENABLED"; - - /// - /// Configuration key to enable experimental features. - /// - public const string ExperimentalFeaturesEnabled = "DD_TRACE_EXPERIMENTAL_FEATURES_ENABLED"; - - /// - /// Configuration key for the path to the configuration file. - /// Can only be set with an environment variable - /// or in the app.config/web.config file. - /// - public const string ConfigurationFileName = "DD_TRACE_CONFIG_FILE"; - - /// - /// Configuration key for the application's environment. Sets the "env" tag on every . - /// - /// - public const string Environment = "DD_ENV"; - - /// - /// Configuration key for the application's default service name. - /// Used as the service name for top-level spans, - /// and used to determine service name of some child spans. - /// - /// - public const string ServiceName = "DD_SERVICE"; - - /// - /// Configuration key for the application's version. Sets the "version" tag on every . - /// - /// - public const string ServiceVersion = "DD_VERSION"; - - /// - /// Configuration key for the application's git repo URL. Sets the "_dd.git.repository_url" tag on every . - /// - /// - public const string GitRepositoryUrl = "DD_GIT_REPOSITORY_URL"; - - /// - /// Configuration key for the application's git commit hash. Sets the "_dd.git.commit.sha" tag on every . - /// - /// - public const string GitCommitSha = "DD_GIT_COMMIT_SHA"; - - /// - /// Configuration key for enabling the tagging of every telemetry event with git metadata. - /// Default is value is true (enabled). - /// - /// - public const string GitMetadataEnabled = "DD_TRACE_GIT_METADATA_ENABLED"; - - /// - /// Configuration key for enabling or disabling the Tracer. - /// Default is value is true (enabled). - /// - /// - public const string TraceEnabled = "DD_TRACE_ENABLED"; - - /// - /// Configuration key for enabling or disabling the Tracer's debug mode. - /// Default is value is false (disabled). - /// - public const string DebugEnabled = "DD_TRACE_DEBUG"; - - /// - /// Configuration key for enabling or disabling the generation of APM traces. - /// Default is value is true (enabled). - /// - public const string ApmTracingEnabled = "DD_APM_TRACING_ENABLED"; - - /// - /// Configuration key for enabling or disabling the Tracer's debugger mode. - /// Default is value is false (disabled). - /// - public const string WaitForDebuggerAttach = "DD_INTERNAL_WAIT_FOR_DEBUGGER_ATTACH"; - - /// - /// Configuration key for enabling or disabling the Tracer's native debugger mode. - /// Default is value is false (disabled). - /// - public const string WaitForNativeDebuggerAttach = "DD_INTERNAL_WAIT_FOR_NATIVE_DEBUGGER_ATTACH"; - - /// - /// Configuration key for a list of integrations to disable. All other integrations remain enabled. - /// Default is empty (all integrations are enabled). - /// Supports multiple values separated with semi-colons. - /// - /// - public const string DisabledIntegrations = "DD_DISABLED_INTEGRATIONS"; - - /// - /// Configuration key for a list of ActivitySource names (supports globbing) that will be disabled. - /// Default is empty (all ActivitySources will be subscribed to by default). - /// Disabling ActivitySources may break distributed tracing if those Activities are used to propagate trace context. - /// - /// Supports multiple values separated with commas. - /// For example: "SomeGlob.*.PatternSource,Some.Specific.Source" - /// - /// - /// - /// - /// When the tracer doesn't subscribe to an ActivitySource, we will NOT propagate the trace context from those Activities (we don't see them anymore). - ///
This means that distributed tracing flows that rely on these Activities for context propagation - /// will break and cause disconnected traces. - /// - /// - /// Potential impact on distributed tracing: - /// - /// - /// - /// Service A -> Ignored Activity -> Service B - /// Creates a single trace with Service A as root and Service B as child - /// - /// - /// - /// - /// Service A -> Disabled Activity -> Service B - /// Creates TWO separate traces with Service A and Service B each as root spans - /// - /// - /// - /// - /// - public const string DisabledActivitySources = "DD_TRACE_DISABLED_ACTIVITY_SOURCES"; - - /// - /// Configuration key for enabling or disabling default Analytics. - /// - /// - [Obsolete(DeprecationMessages.AppAnalytics)] - public const string GlobalAnalyticsEnabled = "DD_TRACE_ANALYTICS_ENABLED"; - - /// - /// Configuration key for a list of tags to be applied globally to spans. - /// Supports multiple key key-value pairs which are comma-separated, and for which the key and - /// value are colon-separated. For example Key1:Value1, Key2:Value2 - /// - /// - public const string GlobalTags = "DD_TAGS"; - - /// - /// Configuration key for a map of header keys to tag names. - /// Automatically apply header values as tags on traces. - /// - /// - public const string HeaderTags = "DD_TRACE_HEADER_TAGS"; - - /// - /// Configuration key for a map of metadata keys to tag names. - /// Automatically apply GRPC metadata values as tags on traces. - /// - /// - public const string GrpcTags = "DD_TRACE_GRPC_TAGS"; - - /// - /// Propagate the process tags in every supported payload - /// - public const string PropagateProcessTags = "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED"; - - /// - /// Configuration key for a map of services to rename. - /// - /// - public const string ServiceNameMappings = "DD_TRACE_SERVICE_MAPPING"; - - /// - /// Configuration key for setting the size in bytes of the trace buffer - /// - public const string BufferSize = "DD_TRACE_BUFFER_SIZE"; - - /// - /// Configuration key for setting the batch interval in milliseconds for the serialization queue. - /// Set to 0 to disable. - /// - public const string SerializationBatchInterval = "DD_TRACE_BATCH_INTERVAL"; - - /// - /// Configuration key for enabling or disabling the automatic injection - /// of correlation identifiers into the logging context. - /// - /// - public const string LogsInjectionEnabled = "DD_LOGS_INJECTION"; - - /// - /// Configuration key for setting the number of traces allowed - /// to be submitted per second. - /// - /// - [Obsolete("This parameter is obsolete and should be replaced by `DD_TRACE_RATE_LIMIT`")] - public const string MaxTracesSubmittedPerSecond = "DD_MAX_TRACES_PER_SECOND"; - - /// - /// Configuration key for setting the number of traces allowed - /// to be submitted per second. - /// - /// - public const string TraceRateLimit = "DD_TRACE_RATE_LIMIT"; - - /// - /// Configuration key for setting custom sampling rules based on regular expressions. - /// Semi-colon separated list of sampling rules. - /// The rule is matched in order of specification. The first match in a list is used. - /// - /// Per entry: - /// The item "sample_rate" is required in decimal format. - /// The item "service" is optional in regular expression format, to match on service name. - /// The item "name" is optional in regular expression format, to match on operation name. - /// - /// To give a rate of 50% to any traces in a service starting with the text "cart": - /// '[{"sample_rate":0.5, "service":"cart.*"}]' - /// - /// To give a rate of 20% to any traces which have an operation name of "http.request": - /// '[{"sample_rate":0.2, "name":"http.request"}]' - /// - /// To give a rate of 100% to any traces within a service named "background" and with an operation name of "sql.query": - /// '[{"sample_rate":1.0, "service":"background", "name":"sql.query"}] - /// - /// To give a rate of 10% to all traces - /// '[{"sample_rate":0.1}]' - /// - /// To configure multiple rules, separate by semi-colon and order from most specific to least specific: - /// '[{"sample_rate":0.5, "service":"cart.*"}, {"sample_rate":0.2, "name":"http.request"}, {"sample_rate":1.0, "service":"background", "name":"sql.query"}, {"sample_rate":0.1}]' - /// - /// If no rules are specified, or none match, default internal sampling logic will be used. - /// - /// - public const string CustomSamplingRules = "DD_TRACE_SAMPLING_RULES"; - - /// - /// Configuration key for setting the format of . - /// Valid values are regex or glob. - /// If the value is not recognized, trace sampling rules are disabled. - /// - public const string CustomSamplingRulesFormat = "DD_TRACE_SAMPLING_RULES_FORMAT"; - - /// - /// Configuration key for setting custom span sampling rules based on glob patterns. - /// Comma separated list of span sampling rules. - /// The rule is matched in order of specification. The first match in a list is used. - /// The supported glob pattern characters are '*' and '?'. - /// A '*' matches any contiguous substring. - /// A '?' matches exactly one character. - /// - /// Per entry: - /// The item "service" is a glob pattern string, to match on the service name. - /// Optional and defaults to '*'. - /// The item "name" is a glob pattern string, to match on the operation name. - /// Optional and defaults to '*'. - /// The item "sample_rate" is a float and is the probability of keeping a matched span. - /// Optional and defaults to 1.0 (keep all). - /// The item "max_per_second" is a float and is the maximum number of spans that can be kept per second for the rule. - /// Optional and defaults to unlimited. - /// - /// Examples: - /// Match all spans that have a service name of "cart" and an operation name of "checkout" with a kept limit of 1000 per second. - /// "[{"service": "cart", "name": "checkout", "max_per_second": 1000}]" - /// - /// Match 50% of spans that have a service name of "cart" and an operation name of "checkout" with a kept limit of 1000 per second. - /// "[{"service": "cart", "name": "checkout", "sample_rate": 0.5, "max_per_second": 1000}]" - /// - /// Match all spans that start with "cart" without any limits and any operation name. - /// "[{"service": "cart*"}]" - /// - /// - public const string SpanSamplingRules = "DD_SPAN_SAMPLING_RULES"; - - /// - /// Configuration key for setting the global rate for the sampler. - /// - public const string GlobalSamplingRate = "DD_TRACE_SAMPLE_RATE"; - - public const string RareSamplerEnabled = "DD_APM_ENABLE_RARE_SAMPLER"; - - /// - /// Configuration key for enabling or disabling internal metrics sent to DogStatsD. - /// Default value is false (disabled). - /// - public const string TracerMetricsEnabled = "DD_TRACE_METRICS_ENABLED"; - - /// - /// Configuration key for enabling or disabling runtime metrics sent to DogStatsD. - /// Default value is false (disabled). - /// - public const string RuntimeMetricsEnabled = "DD_RUNTIME_METRICS_ENABLED"; - - /// - /// Use libdatadog data pipeline to send traces. - /// Default value is false (disabled). - /// - public const string TraceDataPipelineEnabled = "DD_TRACE_DATA_PIPELINE_ENABLED"; - - /// - /// Configuration key for when a standalone instance of the Trace Agent needs to be started. - /// - public const string TraceAgentPath = "DD_TRACE_AGENT_PATH"; - - /// - /// Configuration key for arguments to pass to the Trace Agent process. - /// - public const string TraceAgentArgs = "DD_TRACE_AGENT_ARGS"; - - /// - /// Configuration key for when a standalone instance of DogStatsD needs to be started. - /// - public const string DogStatsDPath = "DD_DOGSTATSD_PATH"; - - /// - /// Configuration key for arguments to pass to the DogStatsD process. - /// - public const string DogStatsDArgs = "DD_DOGSTATSD_ARGS"; - - /// - /// Configuration key for enabling or disabling the use of System.Diagnostics.DiagnosticSource. - /// Default value is true (enabled). - /// - public const string DiagnosticSourceEnabled = "DD_DIAGNOSTIC_SOURCE_ENABLED"; - - /// - /// Configuration key for setting the API key, used by the Agent. - /// - public const string ApiKey = "DD_API_KEY"; - - /// - /// Configuration key for setting the default Datadog destination site. - /// Defaults to "datadoghq.com". - /// - public const string Site = "DD_SITE"; - - /// - /// Configuration key for overriding which URLs are skipped by the tracer. - /// - /// - public const string HttpClientExcludedUrlSubstrings = "DD_TRACE_HTTP_CLIENT_EXCLUDED_URL_SUBSTRINGS"; - - /// - /// Configuration key for the application's server http statuses to set spans as errors by. - /// - /// - [Obsolete("This parameter is obsolete and should be replaced by `DD_TRACE_HTTP_SERVER_ERROR_STATUSES`")] - public const string DeprecatedHttpServerErrorStatusCodes = "DD_HTTP_SERVER_ERROR_STATUSES"; - - /// - /// Configuration key for the application's server http statuses to set spans as errors by. - /// - /// - public const string HttpServerErrorStatusCodes = "DD_TRACE_HTTP_SERVER_ERROR_STATUSES"; - - /// - /// Configuration key for the application's client http statuses to set spans as errors by. - /// - /// - [Obsolete("This parameter is obsolete and should be replaced by `DD_TRACE_HTTP_CLIENT_ERROR_STATUSES`")] - public const string DeprecatedHttpClientErrorStatusCodes = "DD_HTTP_CLIENT_ERROR_STATUSES"; - - /// - /// Configuration key for the application's client http statuses to set spans as errors by. - /// - /// - public const string HttpClientErrorStatusCodes = "DD_TRACE_HTTP_CLIENT_ERROR_STATUSES"; - - /// - /// Configuration key indicating the optional name of the custom header to take into account to report the ip address from. - /// If this variable is set all other IP related headers should be ignored - /// Default is value is null (do not override). - /// - /// - public const string IpHeader = "DD_TRACE_CLIENT_IP_HEADER"; - - /// - /// Configuration key indicating if the header should be collected. The default for DD_TRACE_CLIENT_IP_ENABLED is false. - /// - /// - public const string IpHeaderEnabled = "DD_TRACE_CLIENT_IP_ENABLED"; - - /// - /// Configuration key to enable or disable the creation of a span context on exiting a successful Kafka - /// Consumer.Consume() call, and closing the scope on entering Consumer.Consume(). - /// Default value is true (enabled). - /// - /// - public const string KafkaCreateConsumerScopeEnabled = "DD_TRACE_KAFKA_CREATE_CONSUMER_SCOPE_ENABLED"; - - /// - /// Configuration key to enable or disable the creation of individual message spans and span links - /// when using Azure Service Bus batch operations. - /// Default value is true (enabled). - /// - /// - public const string AzureServiceBusBatchLinksEnabled = "DD_TRACE_AZURE_SERVICEBUS_BATCH_LINKS_ENABLED"; - - /// - /// Configuration key for controlling whether route parameters in ASP.NET and ASP.NET Core resource names - /// should be expanded with their values. Only applies when - /// is enabled. - /// - /// - public const string ExpandRouteTemplatesEnabled = "DD_TRACE_EXPAND_ROUTE_TEMPLATES_ENABLED"; - - /// - /// Configuration key for enabling or disabling span links creation for Azure EventHubs batch operations. - /// When enabled, TryAdd spans are created and linked to the send span. - /// When disabled, TryAdd spans are not created, and therefore they are never linked to the send span. - /// Default value is true (enabled). - /// - /// - public const string AzureEventHubsBatchLinksEnabled = "DD_TRACE_AZURE_EVENTHUBS_BATCH_LINKS_ENABLED"; - - /// - /// Configuration key for enabling computation of stats (aka trace metrics) on the tracer side - /// - public const string StatsComputationEnabled = "DD_TRACE_STATS_COMPUTATION_ENABLED"; - - /// - /// Configuration key for configuring the interval (in seconds) for sending stats (aka trace metrics) - /// - public const string StatsComputationInterval = "_DD_TRACE_STATS_COMPUTATION_INTERVAL"; - - /// - /// Configuration key for setting the header injection propagation style. - /// If is also defined, this value overrides the header injection styles. - /// - /// - /// - public const string PropagationStyleInject = "DD_TRACE_PROPAGATION_STYLE_INJECT"; - - /// - /// Configuration key for setting the header extraction propagation style. - /// If is also defined, this value overrides the header extraction styles. - /// - /// - /// - public const string PropagationStyleExtract = "DD_TRACE_PROPAGATION_STYLE_EXTRACT"; - - /// - /// Configuration key for setting the propagation style for both header injection and extraction. - /// If or are also defined, - /// they will override any header injections or extraction styled defined here, respectively. - /// - /// - public const string PropagationStyle = "DD_TRACE_PROPAGATION_STYLE"; - - /// - /// Configuration key for setting the header extraction propagation behavior. Accepted values are: - ///
    - ///
  • continue: Extracted span context becomes the parent and baggage is propagated
    • - ///
  • restart: Extracted span context becomes a span link (a new trace is started) and baggage is propagated
    • - ///
  • ignore: We disregard the incoming trace context headers and we also disregard baggage
    • - ///
- /// Default value is continue. - /// - public const string PropagationBehaviorExtract = "DD_TRACE_PROPAGATION_BEHAVIOR_EXTRACT"; - - /// - /// Configuration key to configure if propagation should only extract the first header once a configure - /// propagator extracts a valid trace context. - /// - /// - public const string PropagationExtractFirstOnly = "DD_TRACE_PROPAGATION_EXTRACT_FIRST"; - - /// - /// Configuration key to set the maximum number of items that can be - /// injected into the baggage header when propagating to a downstream service. - /// Default value is 64 items. - /// - /// - public const string BaggageMaximumItems = "DD_TRACE_BAGGAGE_MAX_ITEMS"; - - /// - /// Configuration key to set the maximum number of bytes that can be - /// injected into the baggage header when propagating to a downstream service. - /// Default value is 8192 bytes. - /// - /// - public const string BaggageMaximumBytes = "DD_TRACE_BAGGAGE_MAX_BYTES"; - - /// - /// Configuration key for controlling which baggage keys are converted into span tags. - /// Default value is "user.id,session.id,account.id". - /// - /// Behavior options: - /// - Empty string: No baggage keys are converted into span tags (feature disabled) - /// - Comma-separated list: Only baggage keys matching exact, case-sensitive names in the list are added as span tags - /// - Wildcard (*): All baggage keys are converted into span tags - /// - /// - public const string BaggageTagKeys = "DD_TRACE_BAGGAGE_TAG_KEYS"; - - /// - /// Configuration key for enabling automatic instrumentation on specified methods. - /// Default value is "" (disabled). - /// - public const string TraceMethods = "DD_TRACE_METHODS"; - - /// - /// Configuration key for specifying a custom regex to obfuscate query strings. - /// Default value is in TracerSettingsConstants - /// WARNING: This regex cause crashes under netcoreapp2.1 / linux / arm64, dont use on manual instrumentation in this environment - /// - /// - public const string ObfuscationQueryStringRegex = "DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP"; - - /// - /// Configuration key for specifying a timeout in milliseconds to the execution of the query string obfuscation regex - /// Default value is 200ms - /// - /// - public const string ObfuscationQueryStringRegexTimeout = "DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP_TIMEOUT"; - - /// - /// Configuration key for setting the max size of the querystring to report, before obfuscation - /// Default value is 5000, 0 means that we don't limit the size. - /// - /// - public const string QueryStringReportingSize = "DD_HTTP_SERVER_TAG_QUERY_STRING_SIZE"; - - /// - /// Configuration key for enabling/disabling reporting query string - /// Default value is true - /// - /// - public const string QueryStringReportingEnabled = "DD_HTTP_SERVER_TAG_QUERY_STRING"; - - /// - /// Configuration key for setting DBM propagation mode - /// Default value is disabled, expected values are either: disabled, service or full - /// - /// - public const string DbmPropagationMode = "DD_DBM_PROPAGATION_MODE"; - - /// - /// Configuration key for setting the schema version for service naming and span attributes - /// Accepted values are: "v1", "v0" - /// Default value is "v0" - /// - public const string MetadataSchemaVersion = "DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"; - - /// - /// Configuration key for automatically populating the peer.service tag - /// from predefined precursor attributes when the span attribute schema is v0. - /// This is ignored when the span attribute schema is v1 or later. - /// Default value is false - /// - public const string PeerServiceDefaultsEnabled = "DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED"; - - /// - /// Configuration key for a map of services to rename. - /// - /// - public const string PeerServiceNameMappings = "DD_TRACE_PEER_SERVICE_MAPPING"; - - /// - /// Configuration key for unifying client service names when the span - /// attribute schema is v0. This is ignored when the span attribute - /// schema is v1 or later. - /// Default value is false - /// - public const string RemoveClientServiceNamesEnabled = "DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED"; - - /// - /// Configuration key for the comma-separated list of user disabled - /// ADO.NET CommandType names that should not have Span created for them. - /// "InterceptableDbCommand" and "ProfiledDbCommand" are always disabled by default. - /// - /// - public const string DisabledAdoNetCommandTypes = "DD_TRACE_DISABLED_ADONET_COMMAND_TYPES"; - - /// - /// Configuration key for toggling span pointers on AWS requests. - /// Default value is true - /// - public const string SpanPointersEnabled = "DD_TRACE_AWS_ADD_SPAN_POINTERS"; - - /// - /// Configuration key for specifying which GraphQL error extensions to capture. - /// A comma-separated list of extension keys to capture. Empty or not present means no extensions are captured. - /// - /// - public const string GraphQLErrorExtensions = "DD_TRACE_GRAPHQL_ERROR_EXTENSIONS"; - - /// - /// Configuration key for deactivating reading the application monitoring config file through libdatadog (hands off config). - /// True by default - /// - public const string ApplicationMonitoringConfigFileEnabled = "DD_APPLICATION_MONITORING_CONFIG_FILE_ENABLED"; - - /// - /// Configuration key to disable polling the /info endpoint in the trace agent for feature discovery. - /// Default value is true (polling enabled). - /// - /// - public const string AgentFeaturePollingEnabled = "DD_AGENT_FEATURE_POLLING_ENABLED"; - - /// - /// String constants for CI Visibility configuration keys. - /// - public static class CIVisibility - { - /// - /// An internal key used to "tell" tracer settings that we're running in CI Visibility mode - /// - public const string IsRunningInCiVisMode = "_DD_INTERNAL_IS_RUNNING_IN_CIVISIBILITY"; - - /// - /// Configuration key for enabling or disabling CI Visibility. - /// Default value is false (disabled). - /// - public const string Enabled = "DD_CIVISIBILITY_ENABLED"; - - /// - /// Configuration key for enabling or disabling Agentless in CI Visibility. - /// Default value is false (disabled). - /// - public const string AgentlessEnabled = "DD_CIVISIBILITY_AGENTLESS_ENABLED"; - - /// - /// Configuration key for setting the agentless url endpoint - /// - public const string AgentlessUrl = "DD_CIVISIBILITY_AGENTLESS_URL"; - - /// - /// Configuration key for enabling or disabling Logs direct submission. - /// Default value is false (disabled). - /// - public const string Logs = "DD_CIVISIBILITY_LOGS_ENABLED"; - - /// - /// Configuration key for enabling or disabling Code Coverage in CI Visibility. - /// - public const string CodeCoverage = "DD_CIVISIBILITY_CODE_COVERAGE_ENABLED"; - - /// - /// Configuration key for re-signing assemblies after the Code Coverage modification. - /// - public const string CodeCoverageSnkFile = "DD_CIVISIBILITY_CODE_COVERAGE_SNK_FILEPATH"; - - /// - /// Configuration key for enabling or disabling jit optimizations in the Code Coverage - /// - public const string CodeCoverageEnableJitOptimizations = "DD_CIVISIBILITY_CODE_COVERAGE_ENABLE_JIT_OPTIMIZATIONS"; - - /// - /// Configuration key for selecting the code coverage mode LineExecution or LineCallCount - /// - public const string CodeCoverageMode = "DD_CIVISIBILITY_CODE_COVERAGE_MODE"; - - /// - /// Configuration key for setting the code coverage jsons destination path. - /// - public const string CodeCoveragePath = "DD_CIVISIBILITY_CODE_COVERAGE_PATH"; - - /// - /// Configuration key for enabling or disabling Uploading Git Metadata in CI Visibility - /// Default Value is false (disabled) - /// - public const string GitUploadEnabled = "DD_CIVISIBILITY_GIT_UPLOAD_ENABLED"; - - /// - /// Configuration key for enabling or disabling Intelligent Test Runner test skipping feature in CI Visibility - /// - public const string TestsSkippingEnabled = "DD_CIVISIBILITY_TESTSSKIPPING_ENABLED"; - - /// - /// Configuration key for enabling or disabling Intelligent Test Runner in CI Visibility - /// Default Value is false (disabled) - /// - public const string IntelligentTestRunnerEnabled = "DD_CIVISIBILITY_ITR_ENABLED"; - - /// - /// Configuration key for forcing Agent's EVP Proxy - /// - public const string ForceAgentsEvpProxy = "DD_CIVISIBILITY_FORCE_AGENT_EVP_PROXY"; - - /// - /// Configuration key for setting the external code coverage file path - /// - public const string ExternalCodeCoveragePath = "DD_CIVISIBILITY_EXTERNAL_CODE_COVERAGE_PATH"; - - /// - /// Configuration key for enabling or disabling Datadog.Trace GAC installation - /// - public const string InstallDatadogTraceInGac = "DD_CIVISIBILITY_GAC_INSTALL_ENABLED"; - - /// - /// Configuration key for enabling or disabling the early flake detection feature in CI Visibility - /// - public const string EarlyFlakeDetectionEnabled = "DD_CIVISIBILITY_EARLY_FLAKE_DETECTION_ENABLED"; - - /// - /// Configuration key for enabling or disabling the known tests feature in CI Visibility - /// - public const string KnownTestsEnabled = "DD_CIVISIBILITY_KNOWN_TESTS_ENABLED"; - - /// - /// Configuration key for setting the code coverage collector path - /// - public const string CodeCoverageCollectorPath = "DD_CIVISIBILITY_CODE_COVERAGE_COLLECTORPATH"; - - /// - /// Configuration key for set the rum flushing wait in milliseconds - /// - public const string RumFlushWaitMillis = "DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS"; - - /// - /// Configuration key for set the test session name - /// - public const string TestSessionName = "DD_TEST_SESSION_NAME"; - - /// - /// Configuration key for a kill-switch that allows to explicitly disable retries even if the remote setting is enabled. - /// - public const string FlakyRetryEnabled = "DD_CIVISIBILITY_FLAKY_RETRY_ENABLED"; - - /// - /// Configuration key for the maximum number of retry attempts for a single test case. - /// - public const string FlakyRetryCount = "DD_CIVISIBILITY_FLAKY_RETRY_COUNT"; - - /// - /// Configuration key for the maximum number of retry attempts for the entire session. - /// - public const string TotalFlakyRetryCount = "DD_CIVISIBILITY_TOTAL_FLAKY_RETRY_COUNT"; - - /// - /// Configuration key for a kill-switch that allows to explicitly disable dynamic instrumentation even if the remote setting is enabled. - /// - public const string DynamicInstrumentationEnabled = "DD_CIVISIBILITY_DI_ENABLED"; - - /// - /// Configuration key for enabling Impacted Tests Detection. - /// - public const string ImpactedTestsDetectionEnabled = "DD_CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED"; - - /// - /// Configuration key for enabling or disabling the Test Management feature. - /// - public const string TestManagementEnabled = "DD_TEST_MANAGEMENT_ENABLED"; - - /// - /// Configuration key for the number of retries to fix a flaky test. - /// - public const string TestManagementAttemptToFixRetries = "DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES"; - } - - /// - /// String constants for proxy configuration keys. - /// - public static class Proxy - { - /// - /// Configuration key to set a proxy server for https requests. - /// - public const string ProxyHttps = "DD_PROXY_HTTPS"; - - /// - /// Configuration key to set a list of hosts that should bypass the proxy. - /// The list is space-separated. - /// - public const string ProxyNoProxy = "DD_PROXY_NO_PROXY"; - } - - /// - /// String constants for debug configuration keys. - /// - internal static class Debug - { - /// - /// Configuration key for forcing the automatic instrumentation to only use the mdToken method lookup mechanism. - /// - public const string ForceMdTokenLookup = "DD_TRACE_DEBUG_LOOKUP_MDTOKEN"; - - /// - /// Configuration key for forcing the automatic instrumentation to only use the fallback method lookup mechanism. - /// - public const string ForceFallbackLookup = "DD_TRACE_DEBUG_LOOKUP_FALLBACK"; - } - - internal static class FeatureFlags - { - /// - /// Feature Flag: enables updated resource names on `aspnet.request`, `aspnet-mvc.request`, - /// `aspnet-webapi.request`, and `aspnet_core.request` spans. Enables `aspnet_core_mvc.request` spans and - /// additional features on `aspnet_core.request` spans. - /// - /// - public const string RouteTemplateResourceNamesEnabled = "DD_TRACE_ROUTE_TEMPLATE_RESOURCE_NAMES_ENABLED"; - - /// - /// Configuration key to enable or disable the updated WCF instrumentation that delays execution - /// until later in the WCF pipeline when the WCF server exception handling is established. - /// - /// - public const string DelayWcfInstrumentationEnabled = "DD_TRACE_DELAY_WCF_INSTRUMENTATION_ENABLED"; - - /// - /// Configuration key to enable or disable improved template-based resource names - /// when using WCF Web HTTP. Requires be set - /// to true. Enabled by default - /// - /// - public const string WcfWebHttpResourceNamesEnabled = "DD_TRACE_WCF_WEB_HTTP_RESOURCE_NAMES_ENABLED"; - - /// - /// Feature flag to enable obfuscating the LocalPath of a WCF request that goes - /// into the resourceName of a span. - /// Note: that this only applies when the WCF action is an empty string. - /// - /// - public const string WcfObfuscationEnabled = "DD_TRACE_WCF_RESOURCE_OBFUSCATION_ENABLED"; - - /// - /// Enables a fix for header tags normalization. - /// We used to normalize tag names even if they were specified in user configuration, but we should not. - /// Default value is true. - /// - public const string HeaderTagsNormalizationFixEnabled = "DD_TRACE_HEADER_TAG_NORMALIZATION_FIX_ENABLED"; - - /// - /// Enables beta support for instrumentation via the System.Diagnostics API and the OpenTelemetry SDK. - /// - public const string OpenTelemetryEnabled = "DD_TRACE_OTEL_ENABLED"; - - /// - /// Enables experimental support for exporting OTLP metrics generated by the OpenTelemetry Metrics API. - /// This feature is only available starting with .NET 6.0, as it relies on the BCL class MeterListener - /// which is shipped in-box starting with .NET 6. - /// - public const string OpenTelemetryMetricsEnabled = "DD_METRICS_OTEL_ENABLED"; - - /// - /// Enables support for collecting and exporting logs generated by the the OpenTelemetry Logs API. - /// This feature is available starting with .NET 3.1 when using Microsoft.Extensions.Logging. - /// - public const string OpenTelemetryLogsEnabled = "DD_LOGS_OTEL_ENABLED"; - - /// - /// List of meters to add to the metrics exporter for the experimental OpenTelemetry Metrics API support. - /// - public const string OpenTelemetryMeterNames = "DD_METRICS_OTEL_METER_NAMES"; - - /// - /// Enables generating 128-bit trace ids instead of 64-bit trace ids. - /// Note that a 128-bit trace id may be received from an upstream service or from - /// an Activity even if we are not generating them ourselves. - /// Default value is true (enabled). - /// - public const string TraceId128BitGenerationEnabled = "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED"; - - /// - /// Enables injecting 128-bit trace ids into logs as a hexadecimal string. - /// If disabled, 128-bit trace ids will be truncated to the lower 64 bits, - /// and injected as decimal strings. 64-bit trace ids are - /// always injected as decimal strings, regardless of this setting. - /// If unset, this configuration will take the value of the configuration, - /// which is true by default. - /// Note: This configuration can be set independently of the configuration, - /// so it's possible to inject 128-bit trace ids into logs even if the application is only generating 64-bit trace ids, since distributed traces from upstream - /// services may contain 128-bit trace ids. - /// - public const string TraceId128BitLoggingEnabled = "DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED"; - - /// - /// Configuration key to enabling or disabling the collection of shell commands executions. - /// Default value is false (disabled). Will change in the future to true - /// when an obfuscation mechanism will be implemented in the agent. - /// - internal const string CommandsCollectionEnabled = "DD_TRACE_COMMANDS_COLLECTION_ENABLED"; - - public const string BypassHttpRequestUrlCachingEnabled = "DD_TRACE_BYPASS_HTTP_REQUEST_URL_CACHING_ENABLED"; - - /// - /// Configuration key to enable or disable the generation of an inferred span for proxy services. - /// Enabling this will create a fake span based on provided proxy headers to allow for better - /// observability when a client request routes through some proxy to an application. - /// Default value is false (disabled). - /// - internal const string InferredProxySpansEnabled = "DD_TRACE_INFERRED_PROXY_SERVICES_ENABLED"; - - /// - /// Configuration key to enable or disable the injection of the Datadog trace context into stored procedures. - /// Default value is false (enabled). - /// When enabled, Datadog trace context will be injected into individual stored procedure calls when the following requirements are met: - ///
    - ///
  • The database is Microsoft SQL Server and is set to service or full.
    • - ///
  • The stored procedure call does not have Output, InputOutput, or Return ADO.NET command parameters.
    • - ///
- /// - public const string InjectContextIntoStoredProceduresEnabled = "DD_TRACE_INJECT_CONTEXT_INTO_STORED_PROCEDURES_ENABLED"; - } - - internal static class Telemetry - { - /// - /// Configuration key for enabling or disabling internal telemetry. - /// Default value is true (enabled). - /// - public const string Enabled = "DD_INSTRUMENTATION_TELEMETRY_ENABLED"; - - /// - /// Configuration key for sending telemetry direct to telemetry intake. If enabled, and - /// is set, sends telemetry direct to intake if agent is not - /// available. Enabled by default if is available. - /// - public const string AgentlessEnabled = "DD_INSTRUMENTATION_TELEMETRY_AGENTLESS_ENABLED"; - - /// - /// Configuration key for sending telemetry via agent proxy. If enabled, sends telemetry - /// via agent proxy. Enabled by default. If disabled, or agent is not available, telemetry - /// is sent to agentless endpoint, based on setting. - /// - public const string AgentProxyEnabled = "DD_INSTRUMENTATION_TELEMETRY_AGENT_PROXY_ENABLED"; - - /// - /// Configuration key for the telemetry URL where the Tracer sends telemetry. Only applies when agentless - /// telemetry is in use (otherwise telemetry is sent to the agent using - /// instead) - /// - public const string Uri = "DD_INSTRUMENTATION_TELEMETRY_URL"; - - /// - /// Configuration key for how often telemetry should be sent, in seconds. Must be between 1 and 3600. - /// For testing purposes. Defaults to 60 - /// - /// - public const string HeartbeatIntervalSeconds = "DD_TELEMETRY_HEARTBEAT_INTERVAL"; - - /// - /// Configuration key for whether dependency data is sent via telemetry. - /// Required for some ASM features. Default value is true (enabled). - /// - /// - public const string DependencyCollectionEnabled = "DD_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED"; - - /// - /// Configuration key for whether telemetry metrics should be sent. - /// - /// - public const string MetricsEnabled = "DD_TELEMETRY_METRICS_ENABLED"; - - /// - /// Configuration key for whether to enable debug mode of telemetry. - /// - /// - public const string DebugEnabled = "DD_INTERNAL_TELEMETRY_DEBUG_ENABLED"; - - /// - /// Configuration key to allow telemetry compression. - /// - /// - public const string TelemetryCompressionMethod = "DD_INSTRUMENTATION_TELEMETRY_COMPRESSION_METHOD"; - - /// - /// Configuration key for whether to enable redacted error log collection. - /// - public const string TelemetryLogsEnabled = "DD_TELEMETRY_LOG_COLLECTION_ENABLED"; - } - - internal static class TagPropagation - { - /// - /// Configuration key for the maximum length of an outgoing propagation header's value ("x-datadog-tags") - /// when injecting it into downstream service calls. - /// - /// - /// This value is not used when extracting an incoming propagation header from an upstream service. - /// - public const string HeaderMaxLength = "DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH"; - } - - internal static class DataStreamsMonitoring - { - /// - /// Enables data streams monitoring support - /// - /// - public const string Enabled = "DD_DATA_STREAMS_ENABLED"; - - /// - /// Configuration key for enabling legacy binary headers in Data Streams Monitoring. - /// false by default if DSM is in default state, true otherwise - /// - /// - public const string LegacyHeadersEnabled = "DD_DATA_STREAMS_LEGACY_HEADERS"; - } - } -} diff --git a/tracer/src/Datadog.Trace/Configuration/DeprecationMessages.cs b/tracer/src/Datadog.Trace/Configuration/DeprecationMessages.cs index d6e015d0be5b..73eef82f15bd 100644 --- a/tracer/src/Datadog.Trace/Configuration/DeprecationMessages.cs +++ b/tracer/src/Datadog.Trace/Configuration/DeprecationMessages.cs @@ -3,11 +3,16 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. // +using System; + namespace Datadog.Trace.Configuration { internal static class DeprecationMessages { public const string AppAnalytics = "App Analytics has been replaced by Tracing without Limits. For more information see https://docs.datadoghq.com/tracing/legacy_app_analytics/"; - public const string LogPath = "DD_TRACE_LOG_PATH is deprecated. Use DD_TRACE_LOG_DIRECTORY instead"; + public const string ProfilerLogPathObsoleteMessage = "DD_TRACE_LOG_PATH is deprecated. Use DD_TRACE_LOG_DIRECTORY instead"; + + [Obsolete(ProfilerLogPathObsoleteMessage)] + public const string LogPath = "DD_TRACE_LOG_PATH"; } } diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs index 35d1950a08de..46b8dc0fed6d 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class AppSec { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs index 38658802fc64..72ce63051afe 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class AzureAppService { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs index 050fb9cac569..9ae65c5e9afa 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class CIVisibility { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs index 2c29ca80c29f..8a7a9e4bcd99 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class DataStreamsMonitoring { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs index 41d60c3ccd61..55da3ac5f616 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Debug { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs index b83f273e5822..9e687468f5a1 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Debugger { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs index ac45d3790064..2a3e6590ecaa 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class DirectLogSubmission { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs index 45544f8f1af7..054527e91bd8 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class FeatureFlags { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs index bc2e852e5af3..42e416586405 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Iast { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs index fa319f7e60c9..91117db50cab 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class OpenTelemetry { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs index 214e0fd43188..b9a599afcfcf 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Profiler { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs index e472649bb94e..40d7b58c1319 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Proxy { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs index fad55b9a2a80..4d9c18537245 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Rcm { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs index 34d2069e80b6..eca9fe1ff4cf 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class TagPropagation { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs index f6a78d67eac8..011c44b289ac 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Telemetry { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs rename to tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs index 102f8492e73a..abbdd1d9e27d 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs @@ -15,7 +15,7 @@ namespace Datadog.Trace.Configuration; /// String constants for standard Datadog configuration keys. /// Auto-generated from supported-configurations.json and supported-configurations-docs.yaml /// -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { /// /// Configuration key for configuring the interval (in seconds) for sending stats (aka trace metrics) diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs index 35d1950a08de..46b8dc0fed6d 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class AppSec { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs index 38658802fc64..72ce63051afe 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class AzureAppService { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs index 050fb9cac569..9ae65c5e9afa 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class CIVisibility { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs index 2c29ca80c29f..8a7a9e4bcd99 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class DataStreamsMonitoring { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs index 41d60c3ccd61..55da3ac5f616 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Debug { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs index b83f273e5822..9e687468f5a1 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Debugger { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs index ac45d3790064..2a3e6590ecaa 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class DirectLogSubmission { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs index 45544f8f1af7..054527e91bd8 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class FeatureFlags { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs index bc2e852e5af3..42e416586405 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Iast { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs index fa319f7e60c9..91117db50cab 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class OpenTelemetry { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs index 214e0fd43188..b9a599afcfcf 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Profiler { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs index e472649bb94e..40d7b58c1319 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Proxy { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs index fad55b9a2a80..4d9c18537245 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Rcm { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs index 34d2069e80b6..eca9fe1ff4cf 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class TagPropagation { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs index f6a78d67eac8..011c44b289ac 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Telemetry { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs rename to tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs index 102f8492e73a..abbdd1d9e27d 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs @@ -15,7 +15,7 @@ namespace Datadog.Trace.Configuration; /// String constants for standard Datadog configuration keys. /// Auto-generated from supported-configurations.json and supported-configurations-docs.yaml /// -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { /// /// Configuration key for configuring the interval (in seconds) for sending stats (aka trace metrics) diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs index 35d1950a08de..46b8dc0fed6d 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class AppSec { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs index 38658802fc64..72ce63051afe 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class AzureAppService { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs index 050fb9cac569..9ae65c5e9afa 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class CIVisibility { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs index 2c29ca80c29f..8a7a9e4bcd99 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class DataStreamsMonitoring { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs index 41d60c3ccd61..55da3ac5f616 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Debug { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs index b83f273e5822..9e687468f5a1 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Debugger { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs index ac45d3790064..2a3e6590ecaa 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class DirectLogSubmission { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs index 45544f8f1af7..054527e91bd8 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class FeatureFlags { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs index bc2e852e5af3..42e416586405 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Iast { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs index fa319f7e60c9..91117db50cab 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class OpenTelemetry { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs index 214e0fd43188..b9a599afcfcf 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Profiler { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs index e472649bb94e..40d7b58c1319 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Proxy { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs index fad55b9a2a80..4d9c18537245 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Rcm { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs index 34d2069e80b6..eca9fe1ff4cf 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class TagPropagation { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs index f6a78d67eac8..011c44b289ac 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Telemetry { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs rename to tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs index 102f8492e73a..abbdd1d9e27d 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs @@ -15,7 +15,7 @@ namespace Datadog.Trace.Configuration; /// String constants for standard Datadog configuration keys. /// Auto-generated from supported-configurations.json and supported-configurations-docs.yaml /// -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { /// /// Configuration key for configuring the interval (in seconds) for sending stats (aka trace metrics) diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs index 35d1950a08de..46b8dc0fed6d 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AppSec.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class AppSec { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs index 38658802fc64..72ce63051afe 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AzureAppService.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.AzureAppService.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class AzureAppService { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs index 050fb9cac569..9ae65c5e9afa 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.CIVisibility.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.CIVisibility.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class CIVisibility { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs index 2c29ca80c29f..8a7a9e4bcd99 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DataStreamsMonitoring.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DataStreamsMonitoring.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class DataStreamsMonitoring { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs index 41d60c3ccd61..55da3ac5f616 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debug.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debug.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Debug { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs index b83f273e5822..9e687468f5a1 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Debugger.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Debugger.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Debugger { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs index ac45d3790064..2a3e6590ecaa 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.DirectLogSubmission.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.DirectLogSubmission.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class DirectLogSubmission { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs index 45544f8f1af7..054527e91bd8 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.FeatureFlags.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.FeatureFlags.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class FeatureFlags { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs index bc2e852e5af3..42e416586405 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Iast.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Iast { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs index fa319f7e60c9..91117db50cab 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.OpenTelemetry.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.OpenTelemetry.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class OpenTelemetry { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs index 214e0fd43188..b9a599afcfcf 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Profiler.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Profiler.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Profiler { diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs index e472649bb94e..40d7b58c1319 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Proxy.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Proxy.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Proxy { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs similarity index 96% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs index fad55b9a2a80..4d9c18537245 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Rcm.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Rcm.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Rcm { diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs similarity index 95% rename from tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs index 34d2069e80b6..eca9fe1ff4cf 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.TagPropagation.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.TagPropagation.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class TagPropagation { diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs similarity index 98% rename from tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs index f6a78d67eac8..011c44b289ac 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Telemetry.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.Telemetry.g.cs @@ -11,7 +11,7 @@ // NOTE: If you remove keys/products from the JSON, run 'dotnet clean' and remove old generated files. namespace Datadog.Trace.Configuration; -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { internal static class Telemetry { diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs similarity index 99% rename from tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs rename to tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs index 102f8492e73a..abbdd1d9e27d 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs @@ -15,7 +15,7 @@ namespace Datadog.Trace.Configuration; /// String constants for standard Datadog configuration keys. /// Auto-generated from supported-configurations.json and supported-configurations-docs.yaml /// -internal static partial class ConfigurationKeys2 +internal static partial class ConfigurationKeys { /// /// Configuration key for configuring the interval (in seconds) for sending stats (aka trace metrics) diff --git a/tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs b/tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs index 25f8a5348cbf..f8da64a8af2c 100644 --- a/tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs +++ b/tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs @@ -423,7 +423,7 @@ public void PropagationStyleInject(string value, string legacyValue, string fall var source = CreateConfigurationSource( (ConfigurationKeys.PropagationStyleInject, value), (legacyKey, legacyValue), - (ConfigurationKeys.PropagationStyle, fallbackValue), + ("DD_TRACE_PROPAGATION_STYLE", fallbackValue), (otelKey, otelValue), (ConfigurationKeys.FeatureFlags.OpenTelemetryEnabled, isActivityListenerEnabled ? "1" : "0")); @@ -439,7 +439,7 @@ public void PropagationStyleInject(string value, string legacyValue, string fall _ => null, }; - errorLog.ShouldHaveExpectedOtelMetric(metric, ConfigurationKeys.OpenTelemetry.Propagators.ToLowerInvariant(), ConfigurationKeys.PropagationStyle.ToLowerInvariant()); + errorLog.ShouldHaveExpectedOtelMetric(metric, ConfigurationKeys.OpenTelemetry.Propagators.ToLowerInvariant(), "DD_TRACE_PROPAGATION_STYLE".ToLowerInvariant()); } } @@ -463,7 +463,7 @@ public void PropagationStyleExtract(string value, string legacyValue, string fal var source = CreateConfigurationSource( (ConfigurationKeys.PropagationStyleExtract, value), (legacyKey, legacyValue), - (ConfigurationKeys.PropagationStyle, fallbackValue), + ("DD_TRACE_PROPAGATION_STYLE", fallbackValue), (otelKey, otelValue), (ConfigurationKeys.FeatureFlags.OpenTelemetryEnabled, isActivityListenerEnabled ? "1" : "0")); @@ -479,7 +479,7 @@ public void PropagationStyleExtract(string value, string legacyValue, string fal _ => null, }; - errorLog.ShouldHaveExpectedOtelMetric(metric, ConfigurationKeys.OpenTelemetry.Propagators.ToLowerInvariant(), ConfigurationKeys.PropagationStyle.ToLowerInvariant()); + errorLog.ShouldHaveExpectedOtelMetric(metric, ConfigurationKeys.OpenTelemetry.Propagators.ToLowerInvariant(), "DD_TRACE_PROPAGATION_STYLE".ToLowerInvariant()); } } diff --git a/tracer/test/Datadog.Trace.Tests/ContinuousProfiler/ProfilerSettingsTests.cs b/tracer/test/Datadog.Trace.Tests/ContinuousProfiler/ProfilerSettingsTests.cs index 008d866f9d82..b8dac79c257b 100644 --- a/tracer/test/Datadog.Trace.Tests/ContinuousProfiler/ProfilerSettingsTests.cs +++ b/tracer/test/Datadog.Trace.Tests/ContinuousProfiler/ProfilerSettingsTests.cs @@ -55,7 +55,7 @@ public void ProfilerState_WhenPassedViaEnvironment(string profilingValue, string if (ssiValue is not null) { - values.Add((Datadog.Trace.Configuration.ConfigurationKeys.Profiler.SsiDeployed, ssiValue)); + values.Add((Datadog.Trace.Configuration.ConfigurationKeys.SsiDeployed, ssiValue)); } var source = CreateConfigurationSource(values.ToArray()); diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/Collectors/ConfigurationTelemetryCollectorTests.cs b/tracer/test/Datadog.Trace.Tests/Telemetry/Collectors/ConfigurationTelemetryCollectorTests.cs index c6b6efa361e3..4b46daf11006 100644 --- a/tracer/test/Datadog.Trace.Tests/Telemetry/Collectors/ConfigurationTelemetryCollectorTests.cs +++ b/tracer/test/Datadog.Trace.Tests/Telemetry/Collectors/ConfigurationTelemetryCollectorTests.cs @@ -198,7 +198,7 @@ public void ConfigurationDataShouldIncludeExpectedPropagationValues(string propa { { ConfigurationKeys.PropagationStyleExtract, propagationStyleExtract }, { ConfigurationKeys.PropagationStyleInject, propagationStyleInject }, - { ConfigurationKeys.PropagationStyle, propagationStyle }, + { "DD_TRACE_PROPAGATION_STYLE", propagationStyle }, { ConfigurationKeys.FeatureFlags.OpenTelemetryEnabled, activityListenerEnabled }, }; @@ -210,14 +210,14 @@ public void ConfigurationDataShouldIncludeExpectedPropagationValues(string propa var (extractKey, extractValue) = (propagationStyleExtract, propagationStyle) switch { (not null, _) => (ConfigurationKeys.PropagationStyleExtract, propagationStyleExtract), - (null, not null) => (ConfigurationKeys.PropagationStyle, propagationStyle), + (null, not null) => ("DD_TRACE_PROPAGATION_STYLE", propagationStyle), (null, null) => (ConfigurationKeys.PropagationStyleExtract, "Datadog,tracecontext,baggage"), }; var (injectKey, injectValue) = (propagationStyleInject, propagationStyle) switch { (not null, _) => (ConfigurationKeys.PropagationStyleInject, propagationStyleInject), - (null, not null) => (ConfigurationKeys.PropagationStyle, propagationStyle), + (null, not null) => ("DD_TRACE_PROPAGATION_STYLE", propagationStyle), (null, null) => (ConfigurationKeys.PropagationStyleInject, "Datadog,tracecontext,baggage"), }; From 9588030756c909a2f808a7215d3878001cdc070e Mon Sep 17 00:00:00 2001 From: Anna Date: Thu, 23 Oct 2025 14:01:06 +0200 Subject: [PATCH 2/5] Small adaptations --- .../src/Datadog.Trace.Tools.Runner/ProcessConfiguration.cs | 2 +- .../Datadog.Trace.Tools.dd_dotnet.csproj | 4 +++- .../src/Datadog.Trace/Configuration/DeprecationMessages.cs | 7 +------ .../InstrumentationVerification.cs | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tracer/src/Datadog.Trace.Tools.Runner/ProcessConfiguration.cs b/tracer/src/Datadog.Trace.Tools.Runner/ProcessConfiguration.cs index 4eae95833595..cd8cca66735f 100644 --- a/tracer/src/Datadog.Trace.Tools.Runner/ProcessConfiguration.cs +++ b/tracer/src/Datadog.Trace.Tools.Runner/ProcessConfiguration.cs @@ -54,7 +54,7 @@ internal static class ProcessConfiguration if (logDirectory == null) { - // 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 + // 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 diff --git a/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj b/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj index 04cac0c8923d..5aa1beef57a4 100644 --- a/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj +++ b/tracer/src/Datadog.Trace.Tools.dd_dotnet/Datadog.Trace.Tools.dd_dotnet.csproj @@ -56,9 +56,11 @@ - + + + diff --git a/tracer/src/Datadog.Trace/Configuration/DeprecationMessages.cs b/tracer/src/Datadog.Trace/Configuration/DeprecationMessages.cs index 73eef82f15bd..d6e015d0be5b 100644 --- a/tracer/src/Datadog.Trace/Configuration/DeprecationMessages.cs +++ b/tracer/src/Datadog.Trace/Configuration/DeprecationMessages.cs @@ -3,16 +3,11 @@ // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc. // -using System; - namespace Datadog.Trace.Configuration { internal static class DeprecationMessages { public const string AppAnalytics = "App Analytics has been replaced by Tracing without Limits. For more information see https://docs.datadoghq.com/tracing/legacy_app_analytics/"; - public const string ProfilerLogPathObsoleteMessage = "DD_TRACE_LOG_PATH is deprecated. Use DD_TRACE_LOG_DIRECTORY instead"; - - [Obsolete(ProfilerLogPathObsoleteMessage)] - public const string LogPath = "DD_TRACE_LOG_PATH"; + public const string LogPath = "DD_TRACE_LOG_PATH is deprecated. Use DD_TRACE_LOG_DIRECTORY instead"; } } diff --git a/tracer/test/Datadog.Trace.TestHelpers.AutoInstrumentation/InstrumentationVerification.cs b/tracer/test/Datadog.Trace.TestHelpers.AutoInstrumentation/InstrumentationVerification.cs index e0d6133d0fcd..3b193b5dfa12 100644 --- a/tracer/test/Datadog.Trace.TestHelpers.AutoInstrumentation/InstrumentationVerification.cs +++ b/tracer/test/Datadog.Trace.TestHelpers.AutoInstrumentation/InstrumentationVerification.cs @@ -25,7 +25,7 @@ public static class InstrumentationVerification /// /// Configuration key for enabling or disabling the copying original modules to disk so we can do offline investigation. - /// Default is value is disabled. + /// Default value is disabled. /// public const string CopyingOriginalModulesEnabled = "DD_COPY_ORIGINALS_MODULES_TO_DISK"; From b91f5090512c26e91ce562418db99a62462e223a Mon Sep 17 00:00:00 2001 From: Anna Date: Thu, 23 Oct 2025 14:02:01 +0200 Subject: [PATCH 3/5] Adapt generator tests to ConfigurationKeys2 > ConfigurationKeys --- .../ConfigurationKeysGeneratorTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tracer/test/Datadog.Trace.SourceGenerators.Tests/ConfigurationKeysGeneratorTests.cs b/tracer/test/Datadog.Trace.SourceGenerators.Tests/ConfigurationKeysGeneratorTests.cs index 5083f332eb29..55b469de3487 100644 --- a/tracer/test/Datadog.Trace.SourceGenerators.Tests/ConfigurationKeysGeneratorTests.cs +++ b/tracer/test/Datadog.Trace.SourceGenerators.Tests/ConfigurationKeysGeneratorTests.cs @@ -466,7 +466,7 @@ Enables or disables the tracer. /// String constants for standard Datadog configuration keys. /// Auto-generated from supported-configurations.json and supported-configurations-docs.yaml /// - internal static partial class ConfigurationKeys2 + internal static partial class ConfigurationKeys { /// /// Configuration key for the maximum number of traces to submit per second. From 8739a39df9f9fe5b2b799f177bbb74d0b96d7300 Mon Sep 17 00:00:00 2001 From: Anna Date: Thu, 30 Oct 2025 14:41:45 -0400 Subject: [PATCH 4/5] Add missing key since new commits on master --- .../Configuration/configuration_keys_mapping.json | 4 ++++ .../Configuration/supported-configurations.json | 5 +++++ .../ConfigurationKeysGenerator/ConfigurationKeys.g.cs | 2 ++ .../ConfigurationKeysGenerator/ConfigurationKeys.g.cs | 2 ++ .../ConfigurationKeysGenerator/ConfigurationKeys.g.cs | 2 ++ .../ConfigurationKeysGenerator/ConfigurationKeys.g.cs | 2 ++ 6 files changed, 17 insertions(+) diff --git a/tracer/src/Datadog.Trace/Configuration/configuration_keys_mapping.json b/tracer/src/Datadog.Trace/Configuration/configuration_keys_mapping.json index 6ae75a077385..3feeb5979b85 100644 --- a/tracer/src/Datadog.Trace/Configuration/configuration_keys_mapping.json +++ b/tracer/src/Datadog.Trace/Configuration/configuration_keys_mapping.json @@ -368,6 +368,10 @@ "env_var": "DD_EXPERIMENTAL_APPSEC_USE_UNSAFE_ENCODER", "const_name": "UseUnsafeEncoder" }, + { + "env_var": "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED", + "const_name": "PropagateProcessTags" + }, { "env_var": "DD_GIT_COMMIT_SHA", "const_name": "GitCommitSha" diff --git a/tracer/src/Datadog.Trace/Configuration/supported-configurations.json b/tracer/src/Datadog.Trace/Configuration/supported-configurations.json index ba3888ef62f8..f869fa4f23d7 100644 --- a/tracer/src/Datadog.Trace/Configuration/supported-configurations.json +++ b/tracer/src/Datadog.Trace/Configuration/supported-configurations.json @@ -528,6 +528,11 @@ ], "product": "AppSec" }, + "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": { + "version": [ + "A" + ] + }, "DD_GIT_COMMIT_SHA": { "version": [ "A" diff --git a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs index abbdd1d9e27d..90d0da9eb9ee 100644 --- a/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs @@ -138,6 +138,8 @@ internal static partial class ConfigurationKeys /// public const string Environment = "DD_ENV"; + public const string PropagateProcessTags = "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED"; + /// /// Configuration key for the application's git commit hash. Sets the "_dd.git.commit.sha" tag on every . /// diff --git a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs index abbdd1d9e27d..90d0da9eb9ee 100644 --- a/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs +++ b/tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs @@ -138,6 +138,8 @@ internal static partial class ConfigurationKeys /// public const string Environment = "DD_ENV"; + public const string PropagateProcessTags = "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED"; + /// /// Configuration key for the application's git commit hash. Sets the "_dd.git.commit.sha" tag on every . /// diff --git a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs index abbdd1d9e27d..90d0da9eb9ee 100644 --- a/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs @@ -138,6 +138,8 @@ internal static partial class ConfigurationKeys /// public const string Environment = "DD_ENV"; + public const string PropagateProcessTags = "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED"; + /// /// Configuration key for the application's git commit hash. Sets the "_dd.git.commit.sha" tag on every . /// diff --git a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs index abbdd1d9e27d..90d0da9eb9ee 100644 --- a/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs +++ b/tracer/src/Datadog.Trace/Generated/netstandard2.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys.g.cs @@ -138,6 +138,8 @@ internal static partial class ConfigurationKeys /// public const string Environment = "DD_ENV"; + public const string PropagateProcessTags = "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED"; + /// /// Configuration key for the application's git commit hash. Sets the "_dd.git.commit.sha" tag on every . /// From 2bba95fd9eed49136aa6c90227120262c98d8486 Mon Sep 17 00:00:00 2001 From: Anna Date: Thu, 23 Oct 2025 16:38:07 +0200 Subject: [PATCH 5/5] Adding documentation --- .../Configuration/AddingConfigurationKeys.md | 352 ++++++++++++++++++ 1 file changed, 352 insertions(+) create mode 100644 docs/development/Configuration/AddingConfigurationKeys.md diff --git a/docs/development/Configuration/AddingConfigurationKeys.md b/docs/development/Configuration/AddingConfigurationKeys.md new file mode 100644 index 000000000000..738d42adc595 --- /dev/null +++ b/docs/development/Configuration/AddingConfigurationKeys.md @@ -0,0 +1,352 @@ +# Adding New Configuration Keys + +This guide explains how to add new configuration keys to the .NET Tracer. Configuration keys are automatically generated from JSON and YAML source files using source generators. + +## Table of Contents + +- [Overview](#overview) +- [Step-by-Step Guide](#step-by-step-guide) + - [1. Add the Configuration Key Definition](#1-add-the-configuration-key-definition) + - [2. Add Documentation](#2-add-documentation) + - [3. (Optional) Add Fallback Keys](#3-optional-add-fallback-keys-aliases) + - [4. (Optional) Override Constant Name](#4-optional-override-constant-name) + - [5. Build to Generate Code](#5-build-to-generate-code) + - [6. Use the Generated Key](#6-use-the-generated-key) + - [7. Add to Telemetry Normalization Rules](#7-add-to-telemetry-normalization-rules) + - [8. Test Your Changes](#8-test-your-changes) +- [Configuration Key Organization](#configuration-key-organization) +- [Examples](#examples) +- [Troubleshooting](#troubleshooting) + +## Overview + +Configuration keys in the .NET Tracer are defined in two source files: + +- **`tracer/src/Datadog.Trace/Configuration/supported-configurations.json`** - Defines the configuration keys, their environment variable names, and fallback chains +- **`tracer/src/Datadog.Trace/Configuration/supported-configurations-docs.yaml`** - Contains XML documentation for each key + +Two source generators read these files at build time: + +1. **`ConfigurationKeysGenerator`** - Generates the configuration key constants: + - `ConfigurationKeys.g.cs` - Main configuration keys class with all constants + - `ConfigurationKeys..g.cs` - Product-specific partial classes (e.g., `ConfigurationKeys.OpenTelemetry.g.cs`) + +2. **`ConfigurationKeyMatcherGenerator`** - Generates the fallback/alias resolution logic: + - `ConfigurationKeyMatcher.g.cs` - Handles key lookups with fallback chain support + +## Step-by-Step Guide + +### 1. Add the Configuration Key Definition + +Add your new configuration key to `tracer/src/Datadog.Trace/Configuration/supported-configurations.json`. + +**Example:** +```json +{ + "supportedConfigurations": { + "DD_TRACE_SAMPLE_RATE": { + "version": ["A"] + }, + "OTEL_EXPORTER_OTLP_TIMEOUT": { + "version": ["A"], + "product": "OpenTelemetry" + } + } +} +``` + +This generates: +- `ConfigurationKeys.TraceSampleRate` (no product) +- `ConfigurationKeys.OpenTelemetry.ExporterOtlpTimeout` (with product) + +### 2. Add Documentation + +Add XML documentation for your key in `tracer/src/Datadog.Trace/Configuration/supported-configurations-docs.yaml`. + +**Format:** +```yaml +OTEL_EXPORTER_OTLP_LOGS_TIMEOUT: | + Configuration key for the timeout in milliseconds for OTLP logs export. + Falls back to if not set. + Default value is 10000ms (10 seconds). + +``` + +**Important Notes:** +- The YAML key must **exactly match** the JSON key (environment variable name) +- **Do NOT include `` tags** - the source generator automatically wraps your documentation in `` tags +- You can include `` and `` tags directly in the content - the source generator will extract `` tags and place them outside the `` section as needed + +### 3. (Optional) Add Fallback Keys (Aliases) + +Configuration keys can have **fallback keys** (also called aliases) that are checked in order of appearance when the primary key is not found. Add them to the `fallbacks` section in `supported-configurations.json`: + +```json +{ + "fallbacks": { + "OTEL_EXPORTER_OTLP_LOGS_TIMEOUT": [ + "OTEL_EXPORTER_OTLP_TIMEOUT" + ] + } +} +``` + +**How it works:** +1. The configuration system first looks for `OTEL_EXPORTER_OTLP_LOGS_TIMEOUT` +2. If not found, it checks `OTEL_EXPORTER_OTLP_TIMEOUT` (the fallback) +3. If still not found, it uses the default value + +**Use cases:** +- **Specific → General fallback:** A specific key (e.g., logs timeout) falls back to a general key (e.g., overall timeout) +- **Backward compatibility:** Renamed keys can fall back to their old names to maintain compatibility +- **Hierarchical configuration:** More specific settings fall back to broader settings + +### 4. (Optional) Override Constant Name + +By default, the source generator automatically converts environment variable names to PascalCase constant names: +- `DD_TRACE_ENABLED` → `TraceEnabled` +- `OTEL_EXPORTER_OTLP_TIMEOUT` → `ExporterOtlpTimeout` + +If you need to explicitly control the constant name (e.g., for backward compatibility), add an entry to `tracer/src/Datadog.Trace/Configuration/configuration_keys_mapping.json`: + +```json +{ + "DD_YOUR_CUSTOM_KEY": "YourPreferredConstantName" +} +``` + +**Note:** This mapping file exists primarily for backward compatibility with existing constant names. For new keys, it's recommended to let the generator automatically deduce the name from the environment variable. + +### 5. Build to Generate Code + +Build the `Datadog.Trace` project to run the source generator: + +```bash +# From repository root +dotnet build tracer/src/Datadog.Trace/Datadog.Trace.csproj +``` + +The generator will create/update files in: +- `tracer/src/Datadog.Trace/Generated//Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/` + +**Generated files:** +- `ConfigurationKeys.g.cs` - Main file with all keys +- `ConfigurationKeys..g.cs` - Product-specific partial classes (if using `product` field) + +### 6. Use the Generated Key + +After building, you can use the generated constant in your code: + +```csharp +// Without product grouping +var enabled = source.GetBool(ConfigurationKeys.TraceEnabled); + +// With product grouping +var timeout = source.GetInt32(ConfigurationKeys.OpenTelemetry.ExporterOtlpLogsTimeout); +``` + +**Note:** The generated constants are in the `Datadog.Trace.Configuration` namespace. + +### 7. Add to Telemetry Normalization Rules + +Configuration keys are reported in telemetry with normalized names. Add your key to the normalization rules: + +**File:** `tracer/test/Datadog.Trace.Tests/Telemetry/config_norm_rules.json` + +```json +{ + "YOUR_ENV_VAR_NAME": "normalized_telemetry_name" +} +``` + +**Example:** +```json +{ + "OTEL_EXPORTER_OTLP_LOGS_TIMEOUT": "otel_exporter_otlp_logs_timeout" +} +``` + +**Important:** The `config_norm_rules.json` file is a copy from the [dd-go repository](https://github.com/DataDog/dd-go). After updating this file locally, you must also submit a PR to update the canonical version in the dd-go repository to keep the normalization rules synchronized across all Datadog tracers. + +### 8. Test Your Changes + +1. **Verify generation:** Check that your key appears in the generated files +2. **Telemetry tests:** Ensure telemetry normalization tests pass in `tracer/test/Datadog.Trace.Tests/Telemetry/` +3. **Integration tests:** Test the configuration key in real scenarios where it's used + +## Configuration Key Organization + +### Product Grouping + +Use the `product` field to organize related keys into nested classes: + +```json +{ + "OTEL_EXPORTER_OTLP_ENDPOINT": { + "product": "OpenTelemetry" + } +} +``` + +Generates: `ConfigurationKeys.OpenTelemetry.ExporterOtlpEndpoint` + +**Common products:** +- `OpenTelemetry` - OpenTelemetry-related keys +- `CIVisibility` - CI Visibility keys +- `Telemetry` - Telemetry configuration +- `AppSec` - Application Security +- `Debugger` - Dynamic Instrumentation +- `Iast` - Interactive Application Security Testing +- `FeatureFlags` - Feature flag toggles +- `Proxy` - Proxy configuration +- `Debug` - Debug/diagnostic keys + +## Examples + +### Example 1: Simple Configuration Key + +**supported-configurations.json:** +```json +{ + "supportedConfigurations": { + "DD_TRACE_SAMPLE_RATE": { + "version": ["A"] + } + } +} +``` + +**supported-configurations-docs.yaml:** +```yaml +DD_TRACE_SAMPLE_RATE: | + Configuration key for setting the global sampling rate. + Value should be between 0.0 and 1.0. + Default value is 1.0 (100% sampling). + +``` + +**Usage:** +```csharp +var rate = source.GetDouble(ConfigurationKeys.GlobalSamplingRate); +``` + +### Example 2: Configuration Key with Fallback + +**supported-configurations.json:** +```json +{ + "supportedConfigurations": { + "OTEL_EXPORTER_OTLP_LOGS_TIMEOUT": { + "version": ["A"], + "product": "OpenTelemetry" + }, + "OTEL_EXPORTER_OTLP_TIMEOUT": { + "version": ["A"], + "product": "OpenTelemetry" + } + }, + "fallbacks": { + "OTEL_EXPORTER_OTLP_LOGS_TIMEOUT": [ + "OTEL_EXPORTER_OTLP_TIMEOUT" + ] + } +} +``` + +**supported-configurations-docs.yaml:** +```yaml +OTEL_EXPORTER_OTLP_LOGS_TIMEOUT: | + Configuration key for the timeout in milliseconds for OTLP logs export. + Falls back to if not set. + Default value is 10000ms. + + +OTEL_EXPORTER_OTLP_TIMEOUT: | + Configuration key for the general OTLP export timeout in milliseconds. + Used as fallback for specific timeout configurations. + Default value is 10000ms. +``` + +**Usage:** +```csharp +// Reads OTEL_EXPORTER_OTLP_LOGS_TIMEOUT, falls back to OTEL_EXPORTER_OTLP_TIMEOUT +var timeout = source.GetInt32( + ConfigurationKeys.OpenTelemetry.ExporterOtlpLogsTimeout, + ConfigurationKeys.OpenTelemetry.ExporterOtlpTimeout); +``` + +### Example 3: Feature Flag + +**supported-configurations.json:** +```json +{ + "supportedConfigurations": { + "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED": { + "version": ["A"], + "product": "FeatureFlags" + } + } +} +``` + +**supported-configurations-docs.yaml:** +```yaml +DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED: | + Enables generating 128-bit trace ids instead of 64-bit trace ids. + Note that a 128-bit trace id may be received from an upstream service or from + an Activity even if we are not generating them ourselves. + Default value is true (enabled). +``` + +**Usage:** +```csharp +var enabled = source.GetBool(ConfigurationKeys.FeatureFlags.TraceId128BitGenerationEnabled); +``` + +## Troubleshooting + +### Generated files are not updated + +**Solution:** Clean and rebuild: +```bash +dotnet clean tracer/src/Datadog.Trace/Datadog.Trace.csproj +dotnet build tracer/src/Datadog.Trace/Datadog.Trace.csproj +``` + +### Key not found in generated code + +**Check:** +1. JSON key matches YAML key exactly (case-sensitive) +2. JSON is valid (no trailing commas, proper escaping) +3. Build succeeded without errors +4. Looking in the correct namespace/product class + +### Telemetry tests failing + +**Check:** +1. Added key to `config_norm_rules.json` +2. Normalized name matches `telemetry_name` in JSON +3. All tests in `tracer/test/Datadog.Trace.Tests/Telemetry/` pass + +### Documentation not appearing + +**Check:** +1. YAML key exactly matches JSON key +2. YAML syntax is correct (proper indentation, pipe `|` for multi-line) +3. XML tags are properly closed +4. Rebuild after YAML changes + +### Fallback not working + +**Check:** +1. Fallback key is defined in `configurations` section +2. Fallback array is in correct order (first fallback is tried first) +3. Using the correct overload of `GetXxx()` method that accepts fallback keys + +## Related Files + +- **Source generator:** `tracer/src/Datadog.Trace.SourceGenerators/Configuration/ConfigurationKeysGenerator.cs` +- **Configuration source:** `tracer/src/Datadog.Trace/Configuration/supported-configurations.json` +- **Documentation source:** `tracer/src/Datadog.Trace/Configuration/supported-configurations-docs.yaml` +- **Telemetry rules:** `tracer/test/Datadog.Trace.Tests/Telemetry/config_norm_rules.json` +- **Generated output:** `tracer/src/Datadog.Trace/Generated//Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/`