Skip to content

[Config registry] Analyzers for ConfigurationBuilder, ConfigurationKeys, PlatformKeys #7575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed

[Config registry] Analyzers for ConfigurationBuilder, ConfigurationKeys, PlatformKeys #7575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eba2182
add supported configurations file and ci step
anna-git Sep 23, 2025
c829e7b
add supported configurations yaml doc file
anna-git Oct 20, 2025
153c69b
Split configuration keys in platform keys
anna-git Sep 24, 2025
867c4f8
Adapt platform keys usage in tracer
anna-git Sep 24, 2025
e099cbd
Adapt platform key usage in tests
anna-git Sep 24, 2025
4d0b30a
Source generator for ConfigurationsKeys2 (temporary) to replace Conf…
anna-git Oct 20, 2025
c879600
Add missing key for DD_TRACE_ACTIVITY_LISTENER
anna-git Sep 25, 2025
8f67671
Adapt profiler keys
anna-git Oct 2, 2025
80125eb
Source generator for ConfigurationKey switcher for aliases
anna-git Sep 25, 2025
edc382d
Handle aliases in ConfigurationBuilder.cs and remove overloads for fa…
anna-git Sep 25, 2025
0e586ce
Special case for IntegrationSettings.cs keys
anna-git Sep 25, 2025
53f9803
Adapt config tests
anna-git Oct 2, 2025
77795f8
special case for logging factory..
anna-git Oct 2, 2025
8b4e4c6
Platform key analyzer
anna-git Sep 26, 2025
89fbeb3
Add analyzer to enforce ConfigurationBuilder only with configuration …
anna-git Sep 29, 2025
23518f6
No preprocessor dirs in configurationkeys
anna-git Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,12 @@ dsm_throughput:
trigger:
include: .gitlab/benchmarks/dsm-throughput.yml
allow_failure: true


validate_supported_configurations_local_file:
stage: build
rules:
- when: on_success
extends: .validate_supported_configurations_local_file
variables:
LOCAL_JSON_PATH: "tracer/src/Datadog.Trace/Configuration/supported-configurations.json"
2 changes: 1 addition & 1 deletion .gitlab/one-pipeline.locked.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DO NOT EDIT THIS FILE MANUALLY
# This file is auto-generated by automation.
include:
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/5ad4e568659a0e385e3cd429b7845ad8e2171cfe0e27ee5b9eeb4cd4b67825f5/one-pipeline.yml
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/b8fc1b7f45e49ddd65623f217f03c38def169aff6f2518380e5b415514e4cb81/one-pipeline.yml
4 changes: 1 addition & 3 deletions tracer/missing-nullability-files.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,14 @@ 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.GCPFunction.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/DeprecationConstants.cs
src/Datadog.Trace/Configuration/IDynamicConfigurationManager.cs
src/Datadog.Trace/Configuration/IntegrationRegistry.cs
src/Datadog.Trace/Configuration/TracerSettingsConstants.cs
src/Datadog.Trace/ContinuousProfiler/ConfigurationKeys.cs
src/Datadog.Trace/ContinuousProfiler/ContextTracker.cs
src/Datadog.Trace/ContinuousProfiler/IContextTracker.cs
src/Datadog.Trace/ContinuousProfiler/IProfilerStatus.cs
Expand Down
5 changes: 3 additions & 2 deletions tracer/src/Datadog.Trace.BenchmarkDotNet/DatadogExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// </copyright>

using BenchmarkDotNet.Configs;
using Datadog.Trace.Configuration;
using Datadog.Trace.ContinuousProfiler;
using Datadog.Trace.ExtensionMethods;
using Datadog.Trace.Util;
Expand Down Expand Up @@ -33,14 +34,14 @@ internal static IConfig WithDatadog(this IConfig config, bool? enableProfiler)
{
var cfg = config.AddLogger(DatadogSessionLogger.Default);

enableProfiler ??= (EnvironmentHelpers.GetEnvironmentVariable(ConfigurationKeys.ProfilingEnabled) ?? string.Empty).ToBoolean() ?? false;
enableProfiler ??= (EnvironmentHelpers.GetEnvironmentVariable(ConfigurationKeys.Profiler.ProfilingEnabled) ?? string.Empty).ToBoolean() ?? false;
switch (enableProfiler)
{
case true:
cfg = cfg.WithOption(ConfigOptions.KeepBenchmarkFiles, true);
break;
case false:
EnvironmentHelpers.SetEnvironmentVariable(ConfigurationKeys.ProfilingEnabled, null);
EnvironmentHelpers.SetEnvironmentVariable(ConfigurationKeys.Profiler.ProfilingEnabled, null);
break;
}

Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace.Manual/Configuration/ImmutableTracerSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public bool TraceEnabled
/// </summary>
/// <seealso cref="ConfigurationKeys.GlobalAnalyticsEnabled"/>
#pragma warning restore CS1574
[Obsolete(DeprecationMessages.AppAnalytics)]
[Obsolete(DeprecationConstants.AppAnalytics)]
public bool AnalyticsEnabled
{
[Instrumented]
Expand Down
2 changes: 1 addition & 1 deletion tracer/src/Datadog.Trace.Manual/Configuration/TracerSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public string? ServiceVersion
/// <see cref="Configuration.IntegrationSettings.AnalyticsEnabled"/> on some predetermined integrations.
/// See the documentation for more details.
/// </summary>
[Obsolete(DeprecationMessages.AppAnalytics)]
[Obsolete(DeprecationConstants.AppAnalytics)]
public bool AnalyticsEnabled
{
[Instrumented]
Expand Down
3 changes: 2 additions & 1 deletion tracer/src/Datadog.Trace.Manual/Datadog.Trace.Manual.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
<Compile Include="..\Datadog.Trace\Ci\TestStatus.cs" Link="Ci\%(Filename)%(Extension)" />
<Compile Include="..\Datadog.Trace\ClrProfiler\AutoInstrumentation\ManualInstrumentation\TracerSettingKeyConstants.cs" Link="Configuration\%(Filename)%(Extension)" />
<Compile Include="..\Datadog.Trace\ClrProfiler\AutoInstrumentation\ManualInstrumentation\IntegrationSettingsSerializationHelper.cs" Link="Configuration\%(Filename)%(Extension)" />
<Compile Include="..\Datadog.Trace\Configuration\DeprecationMessages.cs" Link="Configuration\%(Filename)%(Extension)" />
<Compile Include="..\Datadog.Trace\Configuration\DeprecationConstants.cs"
Link="Configuration\%(Filename)%(Extension)" />
<Compile Include="..\Datadog.Trace\DuckTyping\DuckAsClassAttribute.cs" Link="DuckTyping\%(Filename)%(Extension)" />
<Compile Include="..\Datadog.Trace\HttpHeaderNames.cs" />
<Compile Include="..\Datadog.Trace\IDatadogOpenTracingTracer.cs" />
Expand Down
Loading