Make tracer changes to accept the new DD_TRACE_WCF_ENABLE_NEW_INSTRUMENTATION setting, disable original WCF instrumentation when DD_TRACE_WCF_ENABLE_NEW_INSTRUMENTATION=true, and update tests/snapshots

Author: zacharycmontoya

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

@@ -42,6 +42,11 @@ 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)
+            {
+                return CallTargetState.GetDefault();
+            }
+
             return new CallTargetState(WcfIntegration.CreateScope(request));
         }
 

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

@@ -363,6 +363,12 @@ 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).

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

@@ -214,6 +214,9 @@ public TracerSettings(IConfigurationSource source)
 
             KafkaCreateConsumerScopeEnabled = source?.GetBool(ConfigurationKeys.KafkaCreateConsumerScopeEnabled)
                                            ?? true; // default
+
+            WcfEnableNewInstrumentation = source?.GetBool(ConfigurationKeys.WcfEnableNewInstrumentation)
+                                            ?? false;
         }
 
         /// <summary>
@@ -413,6 +416,11 @@ public int PartialFlushMinSpans
         /// <seealso cref="ConfigurationKeys.KafkaCreateConsumerScopeEnabled"/>
         public bool KafkaCreateConsumerScopeEnabled { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to use the updated WCF instrumentation
+        /// </summary>
+        public bool WcfEnableNewInstrumentation { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether the diagnostic log at startup is enabled
         /// </summary>

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/WcfTests.cs

@@ -39,8 +39,17 @@ public static IEnumerable<object[]> GetData()
         {
             foreach (var binding in Bindings)
             {
+                // When using the binding example, it is expected that CallSite or CallTarget w/ Old WCF fails,
+                // so only include CallTarget w/ New WCF
+                if (binding == "Custom")
+                {
+                    yield return new object[] { binding, true, true };
+                    continue;
+                }
+
                 yield return new object[] { binding, false, false };
                 yield return new object[] { binding, true, false };
+                yield return new object[] { binding, true, true };
             }
         }
 

tracer/test/snapshots/WcfTests.__binding=BasicHttpBinding_enableCallTarget=True_enableNewWcfInstrumentation=True.verified.txt

@@ -0,0 +1 @@
+[]

tracer/test/snapshots/WcfTests.__binding=Custom_enableCallTarget=True_enableNewWcfInstrumentation=True.verified.txt

@@ -0,0 +1 @@
+[]

tracer/test/snapshots/WcfTests.__binding=NetTcpBinding_enableCallTarget=True_enableNewWcfInstrumentation=True.verified.txt

@@ -0,0 +1 @@
+[]

tracer/test/snapshots/WcfTests.__binding=WSHttpBinding_enableCallTarget=True_enableNewWcfInstrumentation=True.verified.txt

@@ -0,0 +1 @@
+[]