Skip to content

Commit 0c28972

Browse files
committed
Add missing key for DD_TRACE_ACTIVITY_LISTENER
1 parent f4033e9 commit 0c28972

File tree

13 files changed

+57
-84
lines changed

13 files changed

+57
-84
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ internal static partial class ConfigurationKeys
1717
// temporary so that ConfigurationKeys2 can resolve reference, all this is removed later
1818
public const string TraceLogPath = "DD_TRACE_LOG_PATH";
1919

20+
/// <summary>
21+
/// Configuration key to enable or disable the ActivityListener.
22+
/// </summary>
23+
public const string ActivityListenerEnabled = "DD_TRACE_ACTIVITY_LISTENER_ENABLED";
24+
2025
/// <summary>
2126
/// Configuration key to enable experimental features.
2227
/// </summary>

tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ internal static class AppSec
5858

5959
/// <summary>
6060
/// Configuration key for enabling or disabling the AppSec.
61-
/// Default is value is false (disabled).
61+
/// Default value is false (disabled).
6262
/// </summary>
6363
public const string Enabled = "DD_APPSEC_ENABLED";
6464

6565
/// <summary>
6666
/// Comma separated keys indicating the optional custom headers the user wants to send.
67-
/// Default is value is null.
67+
/// Default value is null.
6868
/// </summary>
6969
public const string ExtraHeaders = "DD_APPSEC_EXTRA_HEADERS";
7070

@@ -80,7 +80,7 @@ internal static class AppSec
8080

8181
/// <summary>
8282
/// Configuration key indicating the optional name of the custom header to take into account for the ip address.
83-
/// Default is value is null (do not override).
83+
/// Default value is null (do not override).
8484
/// </summary>
8585
public const string CustomIpHeader = "DD_APPSEC_IPHEADER";
8686

@@ -123,7 +123,7 @@ internal static class AppSec
123123

124124
/// <summary>
125125
/// Override the default rules file provided. Must be a path to a valid JSON rules file.
126-
/// Default is value is null (do not override).
126+
/// Default value is null (do not override).
127127
/// </summary>
128128
public const string Rules = "DD_APPSEC_RULES";
129129

tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ internal static class Iast
3030
/// <summary>
3131
/// Configuration key for enabling or disabling the vulnerability duplication detection.
3232
/// When enabled, a vulnerability will only be reported once in the lifetime of an app,
33-
/// instead of on every usage. Default is value is true (enabled).
33+
/// instead of on every usage. Default value is true (enabled).
3434
/// </summary>
3535
public const string IsIastDeduplicationEnabled = "DD_IAST_DEDUPLICATION_ENABLED";
3636

3737
/// <summary>
3838
/// Configuration key for enabling or disabling the IAST.
39-
/// Default is value is false (disabled).
39+
/// Default value is false (disabled).
4040
/// </summary>
4141
public const string Enabled = "DD_IAST_ENABLED";
4242

tracer/src/Datadog.Trace/Generated/net461/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal static partial class ConfigurationKeys2
5656

5757
/// <summary>
5858
/// Configuration key for enabling or disabling the generation of APM traces.
59-
/// Default is value is true (enabled).
59+
/// Default value is true (enabled).
6060
/// </summary>
6161
public const string ApmTracingEnabled = "DD_APM_TRACING_ENABLED";
6262

@@ -176,13 +176,13 @@ internal static partial class ConfigurationKeys2
176176

177177
/// <summary>
178178
/// Configuration key for enabling or disabling the Tracer's debugger mode.
179-
/// Default is value is false (disabled).
179+
/// Default value is false (disabled).
180180
/// </summary>
181181
public const string WaitForDebuggerAttach = "DD_INTERNAL_WAIT_FOR_DEBUGGER_ATTACH";
182182

183183
/// <summary>
184184
/// Configuration key for enabling or disabling the Tracer's native debugger mode.
185-
/// Default is value is false (disabled).
185+
/// Default value is false (disabled).
186186
/// </summary>
187187
public const string WaitForNativeDebuggerAttach = "DD_INTERNAL_WAIT_FOR_NATIVE_DEBUGGER_ATTACH";
188188

@@ -369,7 +369,7 @@ internal static partial class ConfigurationKeys2
369369
/// <summary>
370370
/// Configuration key indicating the optional name of the custom header to take into account to report the ip address from.
371371
/// If this variable is set all other IP related headers should be ignored
372-
/// Default is value is null (do not override).
372+
/// Default value is null (do not override).
373373
/// </summary>
374374
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.IpHeader"/>
375375
public const string IpHeader = "DD_TRACE_CLIENT_IP_HEADER";
@@ -389,7 +389,7 @@ internal static partial class ConfigurationKeys2
389389

390390
/// <summary>
391391
/// Configuration key for enabling or disabling the Tracer's debug mode.
392-
/// Default is value is false (disabled).
392+
/// Default value is false (disabled).
393393
/// </summary>
394394
public const string DebugEnabled = "DD_TRACE_DEBUG";
395395

@@ -438,7 +438,7 @@ internal static partial class ConfigurationKeys2
438438

439439
/// <summary>
440440
/// Configuration key for enabling or disabling the Tracer.
441-
/// Default is value is true (enabled).
441+
/// Default value is true (enabled).
442442
/// </summary>
443443
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.TraceEnabled"/>
444444
public const string TraceEnabled = "DD_TRACE_ENABLED";
@@ -458,7 +458,7 @@ internal static partial class ConfigurationKeys2
458458

459459
/// <summary>
460460
/// Configuration key for enabling the tagging of every telemetry event with git metadata.
461-
/// Default is value is true (enabled).
461+
/// Default value is true (enabled).
462462
/// </summary>
463463
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.GitMetadataEnabled"/>
464464
public const string GitMetadataEnabled = "DD_TRACE_GIT_METADATA_ENABLED";
@@ -623,14 +623,6 @@ internal static partial class ConfigurationKeys2
623623
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.PropagationExtractFirstOnly"/>
624624
public const string PropagationExtractFirstOnly = "DD_TRACE_PROPAGATION_EXTRACT_FIRST";
625625

626-
/// <summary>
627-
/// Configuration key for setting the propagation style for both header injection and extraction.
628-
/// If <see cref="Datadog.Trace.Configuration.TracerSettings.PropagationStyleInject"/> or <see cref="Datadog.Trace.Configuration.TracerSettings.PropagationStyleExtract"/> are also defined,
629-
/// they will override any header injections or extraction styled defined here, respectively.
630-
/// </summary>
631-
/// <seealso cref="Datadog.Trace.Propagators.ContextPropagationHeaderStyle"/>
632-
public const string PropagationStyle = "DD_TRACE_PROPAGATION_STYLE";
633-
634626
/// <summary>
635627
/// Configuration key for setting the header extraction propagation style.
636628
/// If DD_TRACE_PROPAGATION_STYLE is also defined, this value overrides the header extraction styles.

tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ internal static class AppSec
5858

5959
/// <summary>
6060
/// Configuration key for enabling or disabling the AppSec.
61-
/// Default is value is false (disabled).
61+
/// Default value is false (disabled).
6262
/// </summary>
6363
public const string Enabled = "DD_APPSEC_ENABLED";
6464

6565
/// <summary>
6666
/// Comma separated keys indicating the optional custom headers the user wants to send.
67-
/// Default is value is null.
67+
/// Default value is null.
6868
/// </summary>
6969
public const string ExtraHeaders = "DD_APPSEC_EXTRA_HEADERS";
7070

@@ -80,7 +80,7 @@ internal static class AppSec
8080

8181
/// <summary>
8282
/// Configuration key indicating the optional name of the custom header to take into account for the ip address.
83-
/// Default is value is null (do not override).
83+
/// Default value is null (do not override).
8484
/// </summary>
8585
public const string CustomIpHeader = "DD_APPSEC_IPHEADER";
8686

@@ -123,7 +123,7 @@ internal static class AppSec
123123

124124
/// <summary>
125125
/// Override the default rules file provided. Must be a path to a valid JSON rules file.
126-
/// Default is value is null (do not override).
126+
/// Default value is null (do not override).
127127
/// </summary>
128128
public const string Rules = "DD_APPSEC_RULES";
129129

tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ internal static class Iast
3030
/// <summary>
3131
/// Configuration key for enabling or disabling the vulnerability duplication detection.
3232
/// When enabled, a vulnerability will only be reported once in the lifetime of an app,
33-
/// instead of on every usage. Default is value is true (enabled).
33+
/// instead of on every usage. Default value is true (enabled).
3434
/// </summary>
3535
public const string IsIastDeduplicationEnabled = "DD_IAST_DEDUPLICATION_ENABLED";
3636

3737
/// <summary>
3838
/// Configuration key for enabling or disabling the IAST.
39-
/// Default is value is false (disabled).
39+
/// Default value is false (disabled).
4040
/// </summary>
4141
public const string Enabled = "DD_IAST_ENABLED";
4242

tracer/src/Datadog.Trace/Generated/net6.0/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal static partial class ConfigurationKeys2
5656

5757
/// <summary>
5858
/// Configuration key for enabling or disabling the generation of APM traces.
59-
/// Default is value is true (enabled).
59+
/// Default value is true (enabled).
6060
/// </summary>
6161
public const string ApmTracingEnabled = "DD_APM_TRACING_ENABLED";
6262

@@ -176,13 +176,13 @@ internal static partial class ConfigurationKeys2
176176

177177
/// <summary>
178178
/// Configuration key for enabling or disabling the Tracer's debugger mode.
179-
/// Default is value is false (disabled).
179+
/// Default value is false (disabled).
180180
/// </summary>
181181
public const string WaitForDebuggerAttach = "DD_INTERNAL_WAIT_FOR_DEBUGGER_ATTACH";
182182

183183
/// <summary>
184184
/// Configuration key for enabling or disabling the Tracer's native debugger mode.
185-
/// Default is value is false (disabled).
185+
/// Default value is false (disabled).
186186
/// </summary>
187187
public const string WaitForNativeDebuggerAttach = "DD_INTERNAL_WAIT_FOR_NATIVE_DEBUGGER_ATTACH";
188188

@@ -369,7 +369,7 @@ internal static partial class ConfigurationKeys2
369369
/// <summary>
370370
/// Configuration key indicating the optional name of the custom header to take into account to report the ip address from.
371371
/// If this variable is set all other IP related headers should be ignored
372-
/// Default is value is null (do not override).
372+
/// Default value is null (do not override).
373373
/// </summary>
374374
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.IpHeader"/>
375375
public const string IpHeader = "DD_TRACE_CLIENT_IP_HEADER";
@@ -389,7 +389,7 @@ internal static partial class ConfigurationKeys2
389389

390390
/// <summary>
391391
/// Configuration key for enabling or disabling the Tracer's debug mode.
392-
/// Default is value is false (disabled).
392+
/// Default value is false (disabled).
393393
/// </summary>
394394
public const string DebugEnabled = "DD_TRACE_DEBUG";
395395

@@ -438,7 +438,7 @@ internal static partial class ConfigurationKeys2
438438

439439
/// <summary>
440440
/// Configuration key for enabling or disabling the Tracer.
441-
/// Default is value is true (enabled).
441+
/// Default value is true (enabled).
442442
/// </summary>
443443
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.TraceEnabled"/>
444444
public const string TraceEnabled = "DD_TRACE_ENABLED";
@@ -458,7 +458,7 @@ internal static partial class ConfigurationKeys2
458458

459459
/// <summary>
460460
/// Configuration key for enabling the tagging of every telemetry event with git metadata.
461-
/// Default is value is true (enabled).
461+
/// Default value is true (enabled).
462462
/// </summary>
463463
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.GitMetadataEnabled"/>
464464
public const string GitMetadataEnabled = "DD_TRACE_GIT_METADATA_ENABLED";
@@ -623,14 +623,6 @@ internal static partial class ConfigurationKeys2
623623
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.PropagationExtractFirstOnly"/>
624624
public const string PropagationExtractFirstOnly = "DD_TRACE_PROPAGATION_EXTRACT_FIRST";
625625

626-
/// <summary>
627-
/// Configuration key for setting the propagation style for both header injection and extraction.
628-
/// If <see cref="Datadog.Trace.Configuration.TracerSettings.PropagationStyleInject"/> or <see cref="Datadog.Trace.Configuration.TracerSettings.PropagationStyleExtract"/> are also defined,
629-
/// they will override any header injections or extraction styled defined here, respectively.
630-
/// </summary>
631-
/// <seealso cref="Datadog.Trace.Propagators.ContextPropagationHeaderStyle"/>
632-
public const string PropagationStyle = "DD_TRACE_PROPAGATION_STYLE";
633-
634626
/// <summary>
635627
/// Configuration key for setting the header extraction propagation style.
636628
/// If DD_TRACE_PROPAGATION_STYLE is also defined, this value overrides the header extraction styles.

tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.AppSec.g.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ internal static class AppSec
5858

5959
/// <summary>
6060
/// Configuration key for enabling or disabling the AppSec.
61-
/// Default is value is false (disabled).
61+
/// Default value is false (disabled).
6262
/// </summary>
6363
public const string Enabled = "DD_APPSEC_ENABLED";
6464

6565
/// <summary>
6666
/// Comma separated keys indicating the optional custom headers the user wants to send.
67-
/// Default is value is null.
67+
/// Default value is null.
6868
/// </summary>
6969
public const string ExtraHeaders = "DD_APPSEC_EXTRA_HEADERS";
7070

@@ -80,7 +80,7 @@ internal static class AppSec
8080

8181
/// <summary>
8282
/// Configuration key indicating the optional name of the custom header to take into account for the ip address.
83-
/// Default is value is null (do not override).
83+
/// Default value is null (do not override).
8484
/// </summary>
8585
public const string CustomIpHeader = "DD_APPSEC_IPHEADER";
8686

@@ -123,7 +123,7 @@ internal static class AppSec
123123

124124
/// <summary>
125125
/// Override the default rules file provided. Must be a path to a valid JSON rules file.
126-
/// Default is value is null (do not override).
126+
/// Default value is null (do not override).
127127
/// </summary>
128128
public const string Rules = "DD_APPSEC_RULES";
129129

tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.Iast.g.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ internal static class Iast
3030
/// <summary>
3131
/// Configuration key for enabling or disabling the vulnerability duplication detection.
3232
/// When enabled, a vulnerability will only be reported once in the lifetime of an app,
33-
/// instead of on every usage. Default is value is true (enabled).
33+
/// instead of on every usage. Default value is true (enabled).
3434
/// </summary>
3535
public const string IsIastDeduplicationEnabled = "DD_IAST_DEDUPLICATION_ENABLED";
3636

3737
/// <summary>
3838
/// Configuration key for enabling or disabling the IAST.
39-
/// Default is value is false (disabled).
39+
/// Default value is false (disabled).
4040
/// </summary>
4141
public const string Enabled = "DD_IAST_ENABLED";
4242

tracer/src/Datadog.Trace/Generated/netcoreapp3.1/Datadog.Trace.SourceGenerators/ConfigurationKeysGenerator/ConfigurationKeys2.g.cs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ internal static partial class ConfigurationKeys2
5656

5757
/// <summary>
5858
/// Configuration key for enabling or disabling the generation of APM traces.
59-
/// Default is value is true (enabled).
59+
/// Default value is true (enabled).
6060
/// </summary>
6161
public const string ApmTracingEnabled = "DD_APM_TRACING_ENABLED";
6262

@@ -176,13 +176,13 @@ internal static partial class ConfigurationKeys2
176176

177177
/// <summary>
178178
/// Configuration key for enabling or disabling the Tracer's debugger mode.
179-
/// Default is value is false (disabled).
179+
/// Default value is false (disabled).
180180
/// </summary>
181181
public const string WaitForDebuggerAttach = "DD_INTERNAL_WAIT_FOR_DEBUGGER_ATTACH";
182182

183183
/// <summary>
184184
/// Configuration key for enabling or disabling the Tracer's native debugger mode.
185-
/// Default is value is false (disabled).
185+
/// Default value is false (disabled).
186186
/// </summary>
187187
public const string WaitForNativeDebuggerAttach = "DD_INTERNAL_WAIT_FOR_NATIVE_DEBUGGER_ATTACH";
188188

@@ -369,7 +369,7 @@ internal static partial class ConfigurationKeys2
369369
/// <summary>
370370
/// Configuration key indicating the optional name of the custom header to take into account to report the ip address from.
371371
/// If this variable is set all other IP related headers should be ignored
372-
/// Default is value is null (do not override).
372+
/// Default value is null (do not override).
373373
/// </summary>
374374
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.IpHeader"/>
375375
public const string IpHeader = "DD_TRACE_CLIENT_IP_HEADER";
@@ -389,7 +389,7 @@ internal static partial class ConfigurationKeys2
389389

390390
/// <summary>
391391
/// Configuration key for enabling or disabling the Tracer's debug mode.
392-
/// Default is value is false (disabled).
392+
/// Default value is false (disabled).
393393
/// </summary>
394394
public const string DebugEnabled = "DD_TRACE_DEBUG";
395395

@@ -438,7 +438,7 @@ internal static partial class ConfigurationKeys2
438438

439439
/// <summary>
440440
/// Configuration key for enabling or disabling the Tracer.
441-
/// Default is value is true (enabled).
441+
/// Default value is true (enabled).
442442
/// </summary>
443443
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.TraceEnabled"/>
444444
public const string TraceEnabled = "DD_TRACE_ENABLED";
@@ -458,7 +458,7 @@ internal static partial class ConfigurationKeys2
458458

459459
/// <summary>
460460
/// Configuration key for enabling the tagging of every telemetry event with git metadata.
461-
/// Default is value is true (enabled).
461+
/// Default value is true (enabled).
462462
/// </summary>
463463
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.GitMetadataEnabled"/>
464464
public const string GitMetadataEnabled = "DD_TRACE_GIT_METADATA_ENABLED";
@@ -623,14 +623,6 @@ internal static partial class ConfigurationKeys2
623623
/// <seealso cref="Datadog.Trace.Configuration.TracerSettings.PropagationExtractFirstOnly"/>
624624
public const string PropagationExtractFirstOnly = "DD_TRACE_PROPAGATION_EXTRACT_FIRST";
625625

626-
/// <summary>
627-
/// Configuration key for setting the propagation style for both header injection and extraction.
628-
/// If <see cref="Datadog.Trace.Configuration.TracerSettings.PropagationStyleInject"/> or <see cref="Datadog.Trace.Configuration.TracerSettings.PropagationStyleExtract"/> are also defined,
629-
/// they will override any header injections or extraction styled defined here, respectively.
630-
/// </summary>
631-
/// <seealso cref="Datadog.Trace.Propagators.ContextPropagationHeaderStyle"/>
632-
public const string PropagationStyle = "DD_TRACE_PROPAGATION_STYLE";
633-
634626
/// <summary>
635627
/// Configuration key for setting the header extraction propagation style.
636628
/// If DD_TRACE_PROPAGATION_STYLE is also defined, this value overrides the header extraction styles.

0 commit comments

Comments
 (0)