[2.0] Split integration id AdoNet into individual ids per db type (#2008)

Co-authored-by: Zach Montoya <zach.montoya@datadoghq.com>

Author: lucaspimentel

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetClientInstrumentMethodAttribute.cs

@@ -4,6 +4,7 @@
 // </copyright>
 
 using System;
+using Datadog.Trace.Configuration;
 
 namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet
 {
@@ -17,7 +18,10 @@ public AdoNetClientInstrumentMethodAttribute(Type adoNetClientDataType)
             TypeName = AdoNetClientData.SqlCommandType;
             MinimumVersion = AdoNetClientData.MinimumVersion;
             MaximumVersion = AdoNetClientData.MaximumVersion;
-            IntegrationName = AdoNetConstants.IntegrationName;
+
+            // Not used for ADO.NET integration.
+            // Integration name is determined by type of DbCommand in DbScopeFactory
+            IntegrationName = null;
         }
 
         protected IAdoNetClientData AdoNetClientData { get; }

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetConstants.cs

@@ -3,18 +3,15 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
 
-using System;
-using Datadog.Trace.Configuration;
-
 namespace Datadog.Trace.ClrProfiler.AutoInstrumentation.AdoNet
 {
     internal static class AdoNetConstants
     {
-        internal const string IntegrationName = nameof(Configuration.IntegrationId.AdoNet);
-        internal const IntegrationId IntegrationId = Configuration.IntegrationId.AdoNet;
-
         internal struct SystemDataClientData : IAdoNetClientData
         {
+            // note: not a real integration id, cannot be used for configuration
+            public string IntegrationName => "AdoNet";
+
             public string AssemblyName => "System.Data";
 
             public string SqlCommandType => "System.Data.Common.DbCommand";
@@ -23,13 +20,16 @@ internal struct SystemDataClientData : IAdoNetClientData
 
             public string MaximumVersion => "4.*.*";
 
-            public string DataReaderType => AdoNet.AdoNetConstants.TypeNames.DbDataReaderType;
+            public string DataReaderType => TypeNames.DbDataReaderType;
 
-            public string DataReaderTaskType => AdoNet.AdoNetConstants.TypeNames.DbDataReaderTaskType;
+            public string DataReaderTaskType => TypeNames.DbDataReaderTaskType;
         }
 
         internal struct SystemDataCommonClientData : IAdoNetClientData
         {
+            // note: not a real integration id, cannot be used for configuration
+            public string IntegrationName => "AdoNet";
+
             public string AssemblyName => "System.Data.Common";
 
             public string SqlCommandType => "System.Data.Common.DbCommand";
@@ -38,9 +38,9 @@ internal struct SystemDataCommonClientData : IAdoNetClientData
 
             public string MaximumVersion => "6.*.*";
 
-            public string DataReaderType => AdoNet.AdoNetConstants.TypeNames.DbDataReaderType;
+            public string DataReaderType => TypeNames.DbDataReaderType;
 
-            public string DataReaderTaskType => AdoNet.AdoNetConstants.TypeNames.DbDataReaderTaskType;
+            public string DataReaderTaskType => TypeNames.DbDataReaderTaskType;
         }
 
         public static class TypeNames

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/AdoNetDefinitions.cs

@@ -10,22 +10,22 @@
  * Task<int> .ExecuteNonQueryAsync(CancellationToken)
  ********************************************************************************/
 
-// Task<int> System.Data.Common.DBCommand.ExecuteNonQueryAsync(CancellationToken)
+// Task<int> System.Data.Common.DbCommand.ExecuteNonQueryAsync(CancellationToken)
 [assembly: CommandExecuteNonQueryAsync(typeof(SystemDataClientData))]
 [assembly: CommandExecuteNonQueryAsync(typeof(SystemDataCommonClientData))]
 
 /********************************************************************************
  * Task<DbDataReader> .ExecuteDbDataReaderAsync(CommandBehavior, CancellationToken)
  ********************************************************************************/
 
-// Task<DbDataReader> System.Data.Common.DBCommand.ExecuteDbDataReaderAsync(CommandBehavior, CancellationToken)
+// Task<DbDataReader> System.Data.Common.DbCommand.ExecuteDbDataReaderAsync(CommandBehavior, CancellationToken)
 [assembly: CommandExecuteDbDataReaderWithBehaviorAndCancellationAsync(typeof(SystemDataClientData))]
 [assembly: CommandExecuteDbDataReaderWithBehaviorAndCancellationAsync(typeof(SystemDataCommonClientData))]
 
 /********************************************************************************
  * Task<object> .ExecuteScalarAsync(CancellationToken)
  ********************************************************************************/
 
-// Task<object> System.Data.Common.DBCommand.ExecuteScalarAsync(CancellationToken)
+// Task<object> System.Data.Common.DbCommand.ExecuteScalarAsync(CancellationToken)
 [assembly: CommandExecuteScalarAsync(typeof(SystemDataClientData))]
 [assembly: CommandExecuteScalarAsync(typeof(SystemDataCommonClientData))]

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/CommandExecuteNonQueryAsyncIntegration.cs

@@ -28,7 +28,7 @@ public class CommandExecuteNonQueryAsyncIntegration
         /// <returns>Calltarget state value</returns>
         public static CallTargetState OnMethodBegin<TTarget>(TTarget instance, CancellationToken cancellationToken)
         {
-            return new CallTargetState(ScopeDBFactory<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
+            return new CallTargetState(DbScopeFactory.Cache<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
         }
 
         /// <summary>

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/CommandExecuteNonQueryIntegration.cs

@@ -26,7 +26,7 @@ public class CommandExecuteNonQueryIntegration
         /// <returns>Calltarget state value</returns>
         public static CallTargetState OnMethodBegin<TTarget>(TTarget instance)
         {
-            return new CallTargetState(ScopeDBFactory<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
+            return new CallTargetState(DbScopeFactory.Cache<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
         }
 
         /// <summary>

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/CommandExecuteNonQueryWithBehaviorIntegration.cs

@@ -28,7 +28,7 @@ public class CommandExecuteNonQueryWithBehaviorIntegration
         /// <returns>Calltarget state value</returns>
         public static CallTargetState OnMethodBegin<TTarget, TBehavior>(TTarget instance, TBehavior commandBehavior)
         {
-            return new CallTargetState(ScopeDBFactory<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
+            return new CallTargetState(DbScopeFactory.Cache<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
         }
 
         /// <summary>

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/CommandExecuteReaderAsyncIntegration.cs

@@ -27,7 +27,7 @@ public class CommandExecuteReaderAsyncIntegration
         /// <returns>Calltarget state value</returns>
         public static CallTargetState OnMethodBegin<TTarget>(TTarget instance)
         {
-            return new CallTargetState(ScopeDBFactory<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
+            return new CallTargetState(DbScopeFactory.Cache<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
         }
 
         /// <summary>

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/CommandExecuteReaderIntegration.cs

@@ -26,7 +26,7 @@ public class CommandExecuteReaderIntegration
         /// <returns>Calltarget state value</returns>
         public static CallTargetState OnMethodBegin<TTarget>(TTarget instance)
         {
-            return new CallTargetState(ScopeDBFactory<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
+            return new CallTargetState(DbScopeFactory.Cache<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
         }
 
         /// <summary>

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration.cs

@@ -31,7 +31,7 @@ public class CommandExecuteReaderWithBehaviorAndCancellationAsyncIntegration
         /// <returns>Calltarget state value</returns>
         public static CallTargetState OnMethodBegin<TTarget, TBehavior>(TTarget instance, TBehavior commandBehavior, CancellationToken cancellationToken)
         {
-            return new CallTargetState(ScopeDBFactory<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
+            return new CallTargetState(DbScopeFactory.Cache<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
         }
 
         /// <summary>

tracer/src/Datadog.Trace/ClrProfiler/AutoInstrumentation/AdoNet/CommandExecuteReaderWithBehaviorAsyncIntegration.cs

@@ -28,7 +28,7 @@ public class CommandExecuteReaderWithBehaviorAsyncIntegration
         /// <returns>Calltarget state value</returns>
         public static CallTargetState OnMethodBegin<TTarget, TBehavior>(TTarget instance, TBehavior commandBehavior)
         {
-            return new CallTargetState(ScopeDBFactory<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
+            return new CallTargetState(DbScopeFactory.Cache<TTarget>.CreateDbCommandScope(Tracer.Instance, (IDbCommand)instance));
         }
 
         /// <summary>