- Change the environment variable name to DD_TRACE_DELAY_WCF_INSTRUMENTATION_ENABLED

- Move the DelayWcfInstrumentationEnabled to the FeatureFlags grouping of ConfigurationKeys
- Make the DelayWcfInstrumentationEnabled TracerSetting internal

Author: zacharycmontoya

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Wcf/AsyncMethodInvoker_InvokeBegin_Integration.cs

@@ -49,7 +49,7 @@ public static CallTargetState OnMethodBegin<TTarget>(TTarget instance, object in
             //
             // context.IncomingMessageProperties contains:
             // - ["httpRequest"] key to find distributed tracing headers
-            if (!Tracer.Instance.Settings.IsIntegrationEnabled(WcfCommon.IntegrationId) || !Tracer.Instance.Settings.WcfEnableNewInstrumentation || WcfCommon.GetCurrentOperationContext is null)
+            if (!Tracer.Instance.Settings.IsIntegrationEnabled(WcfCommon.IntegrationId) || !Tracer.Instance.Settings.DelayWcfInstrumentationEnabled || WcfCommon.GetCurrentOperationContext is null)
             {
                 return CallTargetState.GetDefault();
             }

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Wcf/ChannelHandlerIntegration.cs

@@ -42,7 +42,7 @@ public class ChannelHandlerIntegration
         /// <returns>Calltarget state value</returns>
         public static CallTargetState OnMethodBegin<TTarget, TRequestContext, TOperationContext>(TTarget instance, TRequestContext request, TOperationContext currentOperationContext)
         {
-            if (Tracer.Instance.Settings.WcfEnableNewInstrumentation)
+            if (Tracer.Instance.Settings.DelayWcfInstrumentationEnabled)
             {
                 return CallTargetState.GetDefault();
             }

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Wcf/SyncMethodInvokerIntegration.cs

@@ -48,7 +48,7 @@ public static CallTargetState OnMethodBegin<TTarget>(TTarget instance, object in
             //
             // context.IncomingMessageProperties contains:
             // - ["httpRequest"] key to find distributed tracing headers
-            if (!Tracer.Instance.Settings.IsIntegrationEnabled(WcfCommon.IntegrationId) || !Tracer.Instance.Settings.WcfEnableNewInstrumentation || WcfCommon.GetCurrentOperationContext is null)
+            if (!Tracer.Instance.Settings.IsIntegrationEnabled(WcfCommon.IntegrationId) || !Tracer.Instance.Settings.DelayWcfInstrumentationEnabled || WcfCommon.GetCurrentOperationContext is null)
             {
                 return CallTargetState.GetDefault();
             }

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/Wcf/TaskMethodInvokerIntegration.cs

@@ -47,7 +47,7 @@ public static CallTargetState OnMethodBegin<TTarget>(TTarget instance, object in
             //
             // context.IncomingMessageProperties contains:
             // - ["httpRequest"] key to find distributed tracing headers
-            if (!Tracer.Instance.Settings.IsIntegrationEnabled(WcfCommon.IntegrationId) || !Tracer.Instance.Settings.WcfEnableNewInstrumentation || WcfCommon.GetCurrentOperationContext is null)
+            if (!Tracer.Instance.Settings.IsIntegrationEnabled(WcfCommon.IntegrationId) || !Tracer.Instance.Settings.DelayWcfInstrumentationEnabled || WcfCommon.GetCurrentOperationContext is null)
             {
                 return CallTargetState.GetDefault();
             }

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

@@ -363,12 +363,6 @@ public static class ConfigurationKeys
         /// <seealso cref="TracerSettings.KafkaCreateConsumerScopeEnabled"/>
         public const string KafkaCreateConsumerScopeEnabled = "DD_TRACE_KAFKA_CREATE_CONSUMER_SCOPE_ENABLED";
 
-        /// <summary>
-        /// Configuration key to enable or disable the updated WCF instrumentation
-        /// </summary>
-        /// <seealso cref="TracerSettings.WcfEnableNewInstrumentation"/>
-        public const string WcfEnableNewInstrumentation = "DD_TRACE_WCF_ENABLE_NEW_INSTRUMENTATION";
-
         /// <summary>
         /// Configuration key for enabling or disabling CI Visibility.
         /// Default is value is false (disabled).
@@ -426,6 +420,13 @@ internal static class FeatureFlags
             /// Feature Flag: enables instrumenting calls to netstandard.dll (only applies to CallSite instrumentation)
             /// </summary>
             public const string NetStandardEnabled = "DD_TRACE_NETSTANDARD_ENABLED";
+
+            /// <summary>
+            /// 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.
+            /// </summary>
+            /// <seealso cref="TracerSettings.DelayWcfInstrumentationEnabled"/>
+            public const string DelayWcfInstrumentationEnabled = "DD_TRACE_DELAY_WCF_INSTRUMENTATION_ENABLED ";
         }
     }
 }

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

@@ -215,7 +215,7 @@ public TracerSettings(IConfigurationSource source)
             KafkaCreateConsumerScopeEnabled = source?.GetBool(ConfigurationKeys.KafkaCreateConsumerScopeEnabled)
                                            ?? true; // default
 
-            WcfEnableNewInstrumentation = source?.GetBool(ConfigurationKeys.WcfEnableNewInstrumentation)
+            DelayWcfInstrumentationEnabled = source?.GetBool(ConfigurationKeys.FeatureFlags.DelayWcfInstrumentationEnabled)
                                             ?? false;
         }
 
@@ -417,9 +417,10 @@ public int PartialFlushMinSpans
         public bool KafkaCreateConsumerScopeEnabled { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether to use the updated WCF instrumentation
+        /// Gets or sets a value indicating whether to enable the updated WCF instrumentation that delays execution
+        /// until later in the WCF pipeline when the WCF server exception handling is established.
         /// </summary>
-        public bool WcfEnableNewInstrumentation { get; set; }
+        internal bool DelayWcfInstrumentationEnabled { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the diagnostic log at startup is enabled