Skip to content

Commit 25e86cb

Browse files
anna-gitanna-git
committed
Adapt profiler keys
1 parent 4d67a00 commit 25e86cb

File tree

7 files changed

+37
-31
lines changed

7 files changed

+37
-31
lines changed

‎tracer/missing-nullability-files.csv‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ src/Datadog.Trace/Configuration/DeprecationMessages.cs
9292
src/Datadog.Trace/Configuration/IDynamicConfigurationManager.cs
9393
src/Datadog.Trace/Configuration/IntegrationRegistry.cs
9494
src/Datadog.Trace/Configuration/TracerSettingsConstants.cs
95-
src/Datadog.Trace/ContinuousProfiler/ConfigurationKeys.cs
9695
src/Datadog.Trace/ContinuousProfiler/ContextTracker.cs
9796
src/Datadog.Trace/ContinuousProfiler/IContextTracker.cs
9897
src/Datadog.Trace/ContinuousProfiler/IProfilerStatus.cs

‎tracer/src/Datadog.Trace.BenchmarkDotNet/DatadogExtensions.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// </copyright>
55

66
using BenchmarkDotNet.Configs;
7+
using Datadog.Trace.Configuration;
78
using Datadog.Trace.ContinuousProfiler;
89
using Datadog.Trace.ExtensionMethods;
910
using Datadog.Trace.Util;
@@ -33,14 +34,14 @@ internal static IConfig WithDatadog(this IConfig config, bool? enableProfiler)
3334
{
3435
var cfg = config.AddLogger(DatadogSessionLogger.Default);
3536

36-
enableProfiler ??= (EnvironmentHelpers.GetEnvironmentVariable(ConfigurationKeys.ProfilingEnabled) ?? string.Empty).ToBoolean() ?? false;
37+
enableProfiler ??= (EnvironmentHelpers.GetEnvironmentVariable(ConfigurationKeys.Profiler.ProfilingEnabled) ?? string.Empty).ToBoolean() ?? false;
3738
switch (enableProfiler)
3839
{
3940
case true:
4041
cfg = cfg.WithOption(ConfigOptions.KeepBenchmarkFiles, true);
4142
break;
4243
case false:
43-
EnvironmentHelpers.SetEnvironmentVariable(ConfigurationKeys.ProfilingEnabled, null);
44+
EnvironmentHelpers.SetEnvironmentVariable(ConfigurationKeys.Profiler.ProfilingEnabled, null);
4445
break;
4546
}
4647

‎tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.Profiler.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// <copyright file="ConfigurationKeys.Profiler.cs" company="Datadog">
2+
// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
3+
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
4+
// </copyright>
5+
6+
#nullable enable
7+
8+
namespace Datadog.Trace.Configuration
9+
{
10+
internal static partial class ConfigurationKeys
11+
{
12+
internal static class Profiler
13+
{
14+
public const string ProfilingEnabled = "DD_PROFILING_ENABLED";
15+
public const string CodeHotspotsEnabled = "DD_PROFILING_CODEHOTSPOTS_ENABLED";
16+
public const string EndpointProfilingEnabled = "DD_PROFILING_ENDPOINT_COLLECTION_ENABLED";
17+
public const string SsiDeployed = "DD_INJECTION_ENABLED";
18+
public const string ProfilerManagedActivationEnabled = "DD_PROFILING_MANAGED_ACTIVATION_ENABLED";
19+
}
20+
}
21+
}

‎tracer/src/Datadog.Trace/ContinuousProfiler/ConfigurationKeys.cs‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎tracer/src/Datadog.Trace/ContinuousProfiler/ContextTracker.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Runtime.CompilerServices;
88
using System.Runtime.InteropServices;
99
using System.Threading;
10+
using Datadog.Trace.Configuration;
1011
using Datadog.Trace.ExtensionMethods;
1112
using Datadog.Trace.Logging;
1213
using Datadog.Trace.Util;
@@ -43,8 +44,8 @@ internal class ContextTracker : IContextTracker
4344
public ContextTracker(IProfilerStatus status)
4445
{
4546
_status = status;
46-
_isCodeHotspotsEnabled = EnvironmentHelpers.GetEnvironmentVariable(ConfigurationKeys.CodeHotspotsEnabled)?.ToBoolean() ?? true;
47-
_isEndpointProfilingEnabled = EnvironmentHelpers.GetEnvironmentVariable(ConfigurationKeys.EndpointProfilingEnabled)?.ToBoolean() ?? true;
47+
_isCodeHotspotsEnabled = EnvironmentHelpers.GetEnvironmentVariable(ConfigurationKeys.Profiler.CodeHotspotsEnabled)?.ToBoolean() ?? true;
48+
_isEndpointProfilingEnabled = EnvironmentHelpers.GetEnvironmentVariable(ConfigurationKeys.Profiler.EndpointProfilingEnabled)?.ToBoolean() ?? true;
4849
_traceContextPtr = new ThreadLocal<IntPtr>();
4950
}
5051

‎tracer/src/Datadog.Trace/ContinuousProfiler/ProfilerSettings.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ internal ProfilerSettings(IConfigurationSource config, IConfigurationSource envC
2424
if (!IsProfilingSupported)
2525
{
2626
ProfilerState = ProfilerState.Disabled;
27-
telemetry.Record(ConfigurationKeys.ProfilingEnabled, false, ConfigurationOrigins.Calculated);
27+
telemetry.Record(ConfigurationKeys.Profiler.ProfilingEnabled, false, ConfigurationOrigins.Calculated);
2828
return;
2929
}
3030

3131
// If managed activation is enabled, we need to _just_ read from the environment variables,
3232
// as that's all that applies
3333
var envConfigBuilder = new ConfigurationBuilder(envConfig, telemetry);
3434
var managedActivationEnabled = envConfigBuilder
35-
.WithKeys(ConfigurationKeys.ProfilerManagedActivationEnabled)
35+
.WithKeys(ConfigurationKeys.Profiler.ProfilerManagedActivationEnabled)
3636
.AsBool(true);
3737

3838
// If we're using managed activation, we use the "full" config source set.
@@ -45,7 +45,7 @@ internal ProfilerSettings(IConfigurationSource config, IConfigurationSource envC
4545
// the profiler could be enabled via ContinuousProfiler.ConfigurationKeys.SsiDeployed. If it is non-empty, then the
4646
// profiler is "active", though won't begin profiling until 30 seconds have passed + at least 1 span has been generated.
4747
var profilingEnabled = profilingConfig
48-
.WithKeys(ConfigurationKeys.ProfilingEnabled)
48+
.WithKeys(ConfigurationKeys.Profiler.ProfilingEnabled)
4949
// We stick with strings here instead of using the `GetAs` method,
5050
// so that telemetry continues to store true/false/auto, instead of the enum values.
5151
.AsString(

‎tracer/test/Datadog.Trace.Tests/ContinuousProfiler/ProfilerSettingsTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public void ProfilerState_WhenPassedViaEnvironment(string profilingValue, string
5050
var values = new List<(string, string)>();
5151
if (profilingValue is not null)
5252
{
53-
values.Add((Datadog.Trace.ContinuousProfiler.ConfigurationKeys.ProfilingEnabled, profilingValue));
53+
values.Add((Datadog.Trace.Configuration.ConfigurationKeys.Profiler.ProfilingEnabled, profilingValue));
5454
}
5555

5656
if (ssiValue is not null)
5757
{
58-
values.Add((Datadog.Trace.ContinuousProfiler.ConfigurationKeys.SsiDeployed, ssiValue));
58+
values.Add((Datadog.Trace.Configuration.ConfigurationKeys.Profiler.SsiDeployed, ssiValue));
5959
}
6060

6161
var source = CreateConfigurationSource(values.ToArray());
@@ -78,13 +78,13 @@ public void ProfilerState_WhenManagedActivationIsMissingOrOnByDefault_DontReadFr
7878
var envValues = new List<(string, string)>();
7979
if (envProfilingEnabled is not null)
8080
{
81-
envValues.Add((Datadog.Trace.ContinuousProfiler.ConfigurationKeys.ProfilingEnabled, envProfilingEnabled));
81+
envValues.Add((Datadog.Trace.Configuration.ConfigurationKeys.Profiler.ProfilingEnabled, envProfilingEnabled));
8282
}
8383

8484
var otherValues = new List<(string, string)>();
8585
if (configProfilingEnabled is not null)
8686
{
87-
otherValues.Add((Datadog.Trace.ContinuousProfiler.ConfigurationKeys.ProfilingEnabled, configProfilingEnabled));
87+
otherValues.Add((Datadog.Trace.Configuration.ConfigurationKeys.Profiler.ProfilingEnabled, configProfilingEnabled));
8888
}
8989

9090
var envConfig = CreateConfigurationSource(envValues.ToArray());
@@ -109,18 +109,18 @@ public void ProfilerState_WhenManagedActivationIsDisabled_OnlyReadsFromEnvVars(s
109109
{
110110
var envValues = new List<(string, string)>
111111
{
112-
(Datadog.Trace.ContinuousProfiler.ConfigurationKeys.ProfilerManagedActivationEnabled, "0")
112+
(Datadog.Trace.Configuration.ConfigurationKeys.Profiler.ProfilerManagedActivationEnabled, "0")
113113
};
114114

115115
if (envProfilingEnabled is not null)
116116
{
117-
envValues.Add((Datadog.Trace.ContinuousProfiler.ConfigurationKeys.ProfilingEnabled, envProfilingEnabled));
117+
envValues.Add((Datadog.Trace.Configuration.ConfigurationKeys.Profiler.ProfilingEnabled, envProfilingEnabled));
118118
}
119119

120120
var otherValues = new List<(string, string)>();
121121
if (configProfilingEnabled is not null)
122122
{
123-
otherValues.Add((Datadog.Trace.ContinuousProfiler.ConfigurationKeys.ProfilingEnabled, configProfilingEnabled));
123+
otherValues.Add((Datadog.Trace.Configuration.ConfigurationKeys.Profiler.ProfilingEnabled, configProfilingEnabled));
124124
}
125125

126126
var envConfig = CreateConfigurationSource(envValues.ToArray());

0 commit comments

Comments
 (0)