feat: Instrument OpenAsync() for SQL libraries. (#1725)

chynesNR · web-flow · commit a695ce6de7e5 · 2023-06-27T09:58:12.000-07:00
diff --git a/src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs b/src/Agent/NewRelic/Agent/Core/Utilities/ExtensionsLoader.cs
@@ -62,7 +62,9 @@ public static void Initialize(string installPathExtensionsDirectory)
                 { "DataReaderWrapperAsync",                                                                         Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.Sql.dll") },
 
                 { "OpenConnectionTracer",                                                                           Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.Sql.dll") },
+                { "OpenConnectionTracerAsync",                                                                           Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.Sql.dll") },
                 { "OpenConnectionWrapper",                                                                          Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.Sql.dll") },
+                { "OpenConnectionWrapperAsync",                                                                     Path.Combine(_installPathExtensionsDirectory, "NewRelic.Providers.Wrapper.Sql.dll") },
 
                 //The NewRelic.Providers.Wrapper.SerilogLogging.dll depends on the Serilog.dll; therefore, it should
                 //only be loaded by the agent when Serilog is used otherwise assembly load exception will occur.
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/Instrumentation.xml b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/Instrumentation.xml
@@ -368,7 +368,11 @@ SPDX-License-Identifier: Apache-2.0
       <match assemblyName="MySql.Data" className="MySql.Data.MySqlClient.MySqlConnection">
         <exactMethodMatcher methodName="Open"/>
       </match>
-
+      <!-- Up until 8.0.33, OpenAsync was not actually async -->
+      <match assemblyName="MySql.Data" className="MySql.Data.MySqlClient.MySqlConnection" maxVersion="8.0.33">
+        <exactMethodMatcher methodName="OpenAsync"/>
+      </match>
+      
       <!-- MySqlConnector 0.x -->
       <match assemblyName="MySqlConnector" className="MySql.Data.MySqlClient.MySqlConnection">
         <exactMethodMatcher methodName="Open" />
@@ -390,5 +394,45 @@ SPDX-License-Identifier: Apache-2.0
       </match>
     </tracerFactory>
 
+    <!-- DbConnection.OpenAsync() -->
+    <tracerFactory name="OpenConnectionTracerAsync">
+      <!-- built in MS SQL driver (framework) -->
+      <match assemblyName="System.Data" className="System.Data.SqlClient.SqlConnection">
+        <exactMethodMatcher methodName="OpenAsync" parameters="System.Threading.CancellationToken" />
+      </match>
+
+      <!-- built in MS SQL driver (core / nuget) -->
+      <match assemblyName="System.Data.SqlClient" className="System.Data.SqlClient.SqlConnection">
+        <exactMethodMatcher methodName="OpenAsync" parameters="System.Threading.CancellationToken" />
+      </match>
+
+      <!-- MS SQL flagship data access driver -->
+      <match assemblyName="Microsoft.Data.SqlClient" className="Microsoft.Data.SqlClient.SqlConnection">
+        <exactMethodMatcher methodName="OpenAsync" parameters="System.Threading.CancellationToken" />
+      </match>
+
+      <!-- MySql (official) driver -->
+      <!-- Up until 8.0.33, OpenAsync was not actually async -->
+      <match assemblyName="MySql.Data" className="MySql.Data.MySqlClient.MySqlConnection" minVersion="8.0.33">
+        <exactMethodMatcher methodName="OpenAsync" parameters="System.Boolean,System.Threading.CancellationToken"/>
+      </match>
+
+      <!-- MySqlConnector 0.x -->
+      <match assemblyName="MySqlConnector" className="MySql.Data.MySqlClient.MySqlConnection">
+        <exactMethodMatcher methodName="OpenAsync" parameters="System.Nullable`1[MySqlConnector.Protocol.Serialization.IOBehavior],System.Threading.CancellationToken" />
+      </match>
+
+      <!-- MySqlConnector 1.x -->
+      <match assemblyName="MySqlConnector" className="MySqlConnector.MySqlConnection">
+        <exactMethodMatcher methodName="OpenAsync" parameters="System.Nullable`1[MySqlConnector.Protocol.Serialization.IOBehavior],System.Threading.CancellationToken" />
+      </match>
+
+      <!-- Npgsql Postgres data provider -->
+      <match assemblyName="Npgsql" className="Npgsql.NpgsqlConnection">
+        <exactMethodMatcher methodName="OpenAsync" parameters="System.Threading.CancellationToken"/>
+      </match>
+    </tracerFactory>
+
+
   </instrumentation>
 </extension>
diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/OpenConnectionWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Sql/OpenConnectionWrapper.cs
@@ -5,30 +5,67 @@
 using NewRelic.Agent.Extensions.Providers.Wrapper;
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace NewRelic.Providers.Wrapper.Sql
 {
-    public class OpenConnectionWrapper : IWrapper
+    public class OpenConnectionWrapper : OpenConnectionWrapperBase
     {
-        public static readonly string[] WrapperNames =
+        private static readonly string[] _tracerNames =
         {
             "OpenConnectionTracer",
-            "OpenConnectionWrapper"
+            "OpenConnectionWrapper",
         };
 
+        public override string[] WrapperNames => _tracerNames;
+        public override bool ExecuteAsAsync => false;
+    }
+
+    public class OpenConnectionAsyncWrapper : OpenConnectionWrapperBase
+    {
+        private static readonly string[] _tracerNames =
+        {
+            "OpenConnectionTracerAsync",
+            "OpenConnectionWrapperAsync"
+        };
+        public override string[] WrapperNames => _tracerNames;
+        public override bool ExecuteAsAsync => true;
+    }
+
+
+    public abstract class OpenConnectionWrapperBase : IWrapper
+    {
+        public abstract string[] WrapperNames { get; }
+
+        public abstract bool ExecuteAsAsync { get; }
+
         public bool IsTransactionRequired => true;
 
         public CanWrapResponse CanWrap(InstrumentedMethodInfo methodInfo)
         {
-            return new CanWrapResponse(WrapperNames.Contains(methodInfo.RequestedWrapperName, StringComparer.OrdinalIgnoreCase));
+            var canWrap = WrapperNames.Contains(methodInfo.RequestedWrapperName, StringComparer.OrdinalIgnoreCase);
+            if (canWrap && ExecuteAsAsync)
+            {
+                var method = methodInfo.Method;
+                return TaskFriendlySyncContextValidator.CanWrapAsyncMethod(method.Type.Assembly.GetName().Name, method.Type.FullName, method.MethodName);
+            }
+
+            return new CanWrapResponse(canWrap);
         }
 
         public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall instrumentedMethodCall, IAgent agent, ITransaction transaction)
         {
+            if (instrumentedMethodCall.IsAsync)
+            {
+                transaction.AttachToAsync();
+            }
+
             var typeName = instrumentedMethodCall.MethodCall.Method.Type.FullName ?? "unknown";
             var segment = transaction.StartMethodSegment(instrumentedMethodCall.MethodCall, typeName, instrumentedMethodCall.MethodCall.Method.MethodName, isLeaf: true);
 
-            return Delegates.GetDelegateFor(segment);
+            return ExecuteAsAsync
+                ? Delegates.GetAsyncDelegateFor<Task>(agent, segment)
+                : Delegates.GetDelegateFor(segment);
         }
     }
 }
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs
@@ -86,7 +86,7 @@ public async Task<string> MsSqlAsync(string tableName)
 
             using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
             {
-                connection.Open();
+                await connection.OpenAsync();
 
                 using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
                 {
@@ -166,7 +166,7 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
 
             using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
             {
-                connection.Open();
+                await connection.OpenAsync();
 
                 using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
                 {
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataExerciser.cs
@@ -88,7 +88,7 @@ public async Task<string> MsSqlAsync(string tableName)
 
             using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
             {
-                connection.Open();
+                await connection.OpenAsync();
 
                 using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
                 {
@@ -169,7 +169,7 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
 
             using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
             {
-                connection.Open();
+                await connection.OpenAsync();
 
                 using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
                 {
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataSqlClientExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/SystemDataSqlClientExerciser.cs
@@ -88,7 +88,7 @@ public async Task<string> MsSqlAsync(string tableName)
 
             using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
             {
-                connection.Open();
+                await connection.OpenAsync();
 
                 using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
                 {
@@ -169,7 +169,7 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
 
             using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
             {
-                connection.Open();
+                await connection.OpenAsync();
 
                 using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
                 {
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MySql/MySqlConnectorExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MySql/MySqlConnectorExerciser.cs
@@ -215,7 +215,7 @@ private async Task<string> ExecuteCommandAsync(Func<MySqlCommand, Task<string>>
             using (var connection = new MySqlConnection(MySqlTestConfiguration.MySqlConnectionString))
             using (var command = new MySqlCommand("SELECT _date FROM dates WHERE _date LIKE '2%' ORDER BY _date DESC LIMIT 1", connection))
             {
-                connection.Open();
+                await connection.OpenAsync();
                 result = await action(command);
             }
 
diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MySql/MySqlExerciser.cs b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MySql/MySqlExerciser.cs
@@ -48,7 +48,7 @@ public async Task SingleDateQueryAsync()
             using (var connection = new MySqlConnection(MySqlTestConfiguration.MySqlConnectionString))
             using (var command = new MySqlCommand("SELECT _date FROM dates WHERE _date LIKE '2%' ORDER BY _date DESC LIMIT 10000", connection))
             {
-                connection.Open();
+                await connection.OpenAsync();
                 using (var reader = await command.ExecuteReaderAsync())
                 {
                     while (await reader.ReadAsync())
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/Controllers/OracleController.cs b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/Controllers/OracleController.cs
@@ -76,7 +76,7 @@ public async Task<string> OracleAsync(string tableName)
 
             using (var connection = new OracleConnection(connectionString))
             {
-                connection.Open();
+                await connection.OpenAsync();
 
                 using (var command = new OracleCommand("SELECT DEGREE FROM user_tables WHERE ROWNUM <= 1", connection))
                 {
diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Controllers/MicrosoftDataSqlClientController.cs b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/Controllers/MicrosoftDataSqlClientController.cs
@@ -75,7 +75,7 @@ public async Task<string> MsSqlAsync(string tableName)
 
             using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
             {
-                connection.Open();
+                await connection.OpenAsync();
 
                 using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))
                 {
@@ -153,7 +153,7 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo
 
             using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))
             {
-                connection.Open();
+                await connection.OpenAsync();
 
                 using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))
                 {
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlAsyncTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlAsyncTests.cs
@@ -22,13 +22,15 @@ public abstract class MsSqlAsyncTestsBase<TFixture> : NewRelicIntegrationTest<TF
         private readonly string _expectedTransactionName;
 
         private readonly string _tableName;
+        private readonly string _libraryName;
 
-        public MsSqlAsyncTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName) : base(fixture)
+        public MsSqlAsyncTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName, string libraryName) : base(fixture)
         {
             _fixture = fixture;
             _fixture.TestLogger = output;
             _expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlAsync";
             _tableName = Utilities.GenerateTableName();
+            _libraryName = libraryName;
 
             _fixture.AddCommand($"{excerciserName} CreateTable {_tableName}");
             _fixture.AddCommand($"{excerciserName} MsSqlAsync {_tableName}");
@@ -81,6 +83,7 @@ public void Test()
                 new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/all", callCount = expectedDatastoreCallCount },
                 new Assertions.ExpectedMetric { metricName = @"Datastore/allOther", callCount = expectedDatastoreCallCount },
 
+                new Assertions.ExpectedMetric { metricName = $"DotNet/{_libraryName}.SqlConnection/OpenAsync", callCount = 1 },
                 new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/allOther", callCount = expectedDatastoreCallCount },
                 new Assertions.ExpectedMetric { metricName = $@"Datastore/instance/MSSQL/{CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)}/default", callCount = expectedDatastoreCallCount},
                 new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 2 },
@@ -103,7 +106,10 @@ public void Test()
                 // The operation metric should not be scoped because the statement metric is scoped instead
                 new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 3, metricScope = _expectedTransactionName },
                 new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/insert", callCount = 1, metricScope = _expectedTransactionName },
-                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", callCount = 1, metricScope = _expectedTransactionName }
+                new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", callCount = 1, metricScope = _expectedTransactionName },
+
+                // Don't double count the open
+                new Assertions.ExpectedMetric { metricName = $"DotNet/{_libraryName}.SqlConnection/Open" },
             };
             var expectedTransactionTraceSegments = new List<string>
             {
@@ -187,7 +193,8 @@ public MsSqlAsyncTests_SystemData_FWLatest(ConsoleDynamicMethodFixtureFWLatest f
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "SystemDataExerciser")
+                  excerciserName: "SystemDataExerciser",
+                  libraryName: "System.Data.SqlClient")
         {
         }
     }
@@ -199,7 +206,8 @@ public MsSqlAsyncTests_SystemDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtur
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "SystemDataSqlClientExerciser")
+                  excerciserName: "SystemDataSqlClientExerciser",
+                  libraryName: "System.Data.SqlClient")
         {
         }
     }
@@ -211,7 +219,8 @@ public MsSqlAsyncTests_SystemDataSqlClient_CoreOldest(ConsoleDynamicMethodFixtur
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "SystemDataSqlClientExerciser")
+                  excerciserName: "SystemDataSqlClientExerciser",
+                  libraryName: "System.Data.SqlClient")
         {
         }
     }
@@ -223,7 +232,8 @@ public MsSqlAsyncTests_MicrosoftDataSqlClient_FWLatest(ConsoleDynamicMethodFixtu
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser")
+                  excerciserName: "MicrosoftDataSqlClientExerciser",
+                  libraryName: "Microsoft.Data.SqlClient")
         {
         }
     }
@@ -235,7 +245,8 @@ public MsSqlAsyncTests_MicrosoftDataSqlClient_FW462(ConsoleDynamicMethodFixtureF
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser")
+                  excerciserName: "MicrosoftDataSqlClientExerciser",
+                  libraryName: "Microsoft.Data.SqlClient")
         {
         }
     }
@@ -248,7 +259,8 @@ public MsSqlAsyncTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFix
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser")
+                  excerciserName: "MicrosoftDataSqlClientExerciser",
+                  libraryName: "Microsoft.Data.SqlClient")
         {
         }
     }
@@ -260,7 +272,8 @@ public MsSqlAsyncTests_MicrosoftDataSqlClient_CoreOldest(ConsoleDynamicMethodFix
             : base(
                   fixture: fixture,
                   output: output,
-                  excerciserName: "MicrosoftDataSqlClientExerciser")
+                  excerciserName: "MicrosoftDataSqlClientExerciser",
+                  libraryName: "Microsoft.Data.SqlClient")
         {
         }
     }
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlAsyncTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/MySql/MySqlAsyncTests.cs
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Postgres/PostgresExecuteScalarAsyncTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Postgres/PostgresExecuteScalarAsyncTests.cs
diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Postgres/PostgresSimpleQueryAsyncTests.cs b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/Postgres/PostgresSimpleQueryAsyncTests.cs

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public async Task<string> MsSqlAsync(string tableName)`
`86`	`86`
`87`	`87`	`using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))`
`88`	`88`	`{`
`89`		`- connection.Open();`
	`89`	`+ await connection.OpenAsync();`
`90`	`90`
`91`	`91`	`using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))`
`92`	`92`	`{`
`@@ -166,7 +166,7 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo`
`166`	`166`
`167`	`167`	`using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))`
`168`	`168`	`{`
`169`		`- connection.Open();`
	`169`	`+ await connection.OpenAsync();`
`170`	`170`
`171`	`171`	`using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))`
`172`	`172`	`{`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public async Task<string> MsSqlAsync(string tableName)`
`88`	`88`
`89`	`89`	`using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))`
`90`	`90`	`{`
`91`		`- connection.Open();`
	`91`	`+ await connection.OpenAsync();`
`92`	`92`
`93`	`93`	`using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))`
`94`	`94`	`{`
`@@ -169,7 +169,7 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo`
`169`	`169`
`170`	`170`	`using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))`
`171`	`171`	`{`
`172`		`- connection.Open();`
	`172`	`+ await connection.OpenAsync();`
`173`	`173`
`174`	`174`	`using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))`
`175`	`175`	`{`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ private async Task<string> ExecuteCommandAsync(Func<MySqlCommand, Task<string>>`
`215`	`215`	`using (var connection = new MySqlConnection(MySqlTestConfiguration.MySqlConnectionString))`
`216`	`216`	`using (var command = new MySqlCommand("SELECT _date FROM dates WHERE _date LIKE '2%' ORDER BY _date DESC LIMIT 1", connection))`
`217`	`217`	`{`
`218`		`- connection.Open();`
	`218`	`+ await connection.OpenAsync();`
`219`	`219`	`result = await action(command);`
`220`	`220`	`}`
`221`	`221`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public async Task SingleDateQueryAsync()`
`48`	`48`	`using (var connection = new MySqlConnection(MySqlTestConfiguration.MySqlConnectionString))`
`49`	`49`	`using (var command = new MySqlCommand("SELECT _date FROM dates WHERE _date LIKE '2%' ORDER BY _date DESC LIMIT 10000", connection))`
`50`	`50`	`{`
`51`		`- connection.Open();`
	`51`	`+ await connection.OpenAsync();`
`52`	`52`	`using (var reader = await command.ExecuteReaderAsync())`
`53`	`53`	`{`
`54`	`54`	`while (await reader.ReadAsync())`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public async Task<string> OracleAsync(string tableName)`
`76`	`76`
`77`	`77`	`using (var connection = new OracleConnection(connectionString))`
`78`	`78`	`{`
`79`		`- connection.Open();`
	`79`	`+ await connection.OpenAsync();`
`80`	`80`
`81`	`81`	`using (var command = new OracleCommand("SELECT DEGREE FROM user_tables WHERE ROWNUM <= 1", connection))`
`82`	`82`	`{`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public async Task<string> MsSqlAsync(string tableName)`
`75`	`75`
`76`	`76`	`using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))`
`77`	`77`	`{`
`78`		`- connection.Open();`
	`78`	`+ await connection.OpenAsync();`
`79`	`79`
`80`	`80`	`using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = 'John'", connection))`
`81`	`81`	`{`
`@@ -153,7 +153,7 @@ public async Task<string> MsSqlAsync_WithParameterizedQuery(string tableName, bo`
`153`	`153`
`154`	`154`	`using (var connection = new SqlConnection(MsSqlConfiguration.MsSqlConnectionString))`
`155`	`155`	`{`
`156`		`- connection.Open();`
	`156`	`+ await connection.OpenAsync();`
`157`	`157`
`158`	`158`	`using (var command = new SqlCommand("SELECT * FROM NewRelic.dbo.TeamMembers WHERE FirstName = @FN", connection))`
`159`	`159`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,15 @@ public abstract class MsSqlAsyncTestsBase<TFixture> : NewRelicIntegrationTest<TF`
`22`	`22`	`private readonly string _expectedTransactionName;`
`23`	`23`
`24`	`24`	`private readonly string _tableName;`
	`25`	`+ private readonly string _libraryName;`
`25`	`26`
`26`		`- public MsSqlAsyncTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName) : base(fixture)`
	`27`	`+ public MsSqlAsyncTestsBase(TFixture fixture, ITestOutputHelper output, string excerciserName, string libraryName) : base(fixture)`
`27`	`28`	`{`
`28`	`29`	`_fixture = fixture;`
`29`	`30`	`_fixture.TestLogger = output;`
`30`	`31`	`_expectedTransactionName = $"OtherTransaction/Custom/MultiFunctionApplicationHelpers.NetStandardLibraries.MsSql.{excerciserName}/MsSqlAsync";`
`31`	`32`	`_tableName = Utilities.GenerateTableName();`
	`33`	`+ _libraryName = libraryName;`
`32`	`34`
`33`	`35`	`_fixture.AddCommand($"{excerciserName} CreateTable {_tableName}");`
`34`	`36`	`_fixture.AddCommand($"{excerciserName} MsSqlAsync {_tableName}");`
`@@ -81,6 +83,7 @@ public void Test()`
`81`	`83`	`new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/all", callCount = expectedDatastoreCallCount },`
`82`	`84`	`new Assertions.ExpectedMetric { metricName = @"Datastore/allOther", callCount = expectedDatastoreCallCount },`
`83`	`85`
	`86`	`+ new Assertions.ExpectedMetric { metricName = $"DotNet/{_libraryName}.SqlConnection/OpenAsync", callCount = 1 },`
`84`	`87`	`new Assertions.ExpectedMetric { metricName = @"Datastore/MSSQL/allOther", callCount = expectedDatastoreCallCount },`
`85`	`88`	`new Assertions.ExpectedMetric { metricName = $@"Datastore/instance/MSSQL/{CommonUtils.NormalizeHostname(MsSqlConfiguration.MsSqlServer)}/default", callCount = expectedDatastoreCallCount},`
`86`	`89`	`new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 2 },`
`@@ -103,7 +106,10 @@ public void Test()`
`103`	`106`	`// The operation metric should not be scoped because the statement metric is scoped instead`
`104`	`107`	`new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/select", callCount = 3, metricScope = _expectedTransactionName },`
`105`	`108`	`new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/insert", callCount = 1, metricScope = _expectedTransactionName },`
`106`		`- new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", callCount = 1, metricScope = _expectedTransactionName }`
	`109`	`+ new Assertions.ExpectedMetric { metricName = @"Datastore/operation/MSSQL/delete", callCount = 1, metricScope = _expectedTransactionName },`
	`110`	`+`
	`111`	`+ // Don't double count the open`
	`112`	`+ new Assertions.ExpectedMetric { metricName = $"DotNet/{_libraryName}.SqlConnection/Open" },`
`107`	`113`	`};`
`108`	`114`	`var expectedTransactionTraceSegments = new List<string>`
`109`	`115`	`{`
`@@ -187,7 +193,8 @@ public MsSqlAsyncTests_SystemData_FWLatest(ConsoleDynamicMethodFixtureFWLatest f`
`187`	`193`	`: base(`
`188`	`194`	`fixture: fixture,`
`189`	`195`	`output: output,`
`190`		`- excerciserName: "SystemDataExerciser")`
	`196`	`+ excerciserName: "SystemDataExerciser",`
	`197`	`+ libraryName: "System.Data.SqlClient")`
`191`	`198`	`{`
`192`	`199`	`}`
`193`	`200`	`}`
`@@ -199,7 +206,8 @@ public MsSqlAsyncTests_SystemDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtur`
`199`	`206`	`: base(`
`200`	`207`	`fixture: fixture,`
`201`	`208`	`output: output,`
`202`		`- excerciserName: "SystemDataSqlClientExerciser")`
	`209`	`+ excerciserName: "SystemDataSqlClientExerciser",`
	`210`	`+ libraryName: "System.Data.SqlClient")`
`203`	`211`	`{`
`204`	`212`	`}`
`205`	`213`	`}`
`@@ -211,7 +219,8 @@ public MsSqlAsyncTests_SystemDataSqlClient_CoreOldest(ConsoleDynamicMethodFixtur`
`211`	`219`	`: base(`
`212`	`220`	`fixture: fixture,`
`213`	`221`	`output: output,`
`214`		`- excerciserName: "SystemDataSqlClientExerciser")`
	`222`	`+ excerciserName: "SystemDataSqlClientExerciser",`
	`223`	`+ libraryName: "System.Data.SqlClient")`
`215`	`224`	`{`
`216`	`225`	`}`
`217`	`226`	`}`
`@@ -223,7 +232,8 @@ public MsSqlAsyncTests_MicrosoftDataSqlClient_FWLatest(ConsoleDynamicMethodFixtu`
`223`	`232`	`: base(`
`224`	`233`	`fixture: fixture,`
`225`	`234`	`output: output,`
`226`		`- excerciserName: "MicrosoftDataSqlClientExerciser")`
	`235`	`+ excerciserName: "MicrosoftDataSqlClientExerciser",`
	`236`	`+ libraryName: "Microsoft.Data.SqlClient")`
`227`	`237`	`{`
`228`	`238`	`}`
`229`	`239`	`}`
`@@ -235,7 +245,8 @@ public MsSqlAsyncTests_MicrosoftDataSqlClient_FW462(ConsoleDynamicMethodFixtureF`
`235`	`245`	`: base(`
`236`	`246`	`fixture: fixture,`
`237`	`247`	`output: output,`
`238`		`- excerciserName: "MicrosoftDataSqlClientExerciser")`
	`248`	`+ excerciserName: "MicrosoftDataSqlClientExerciser",`
	`249`	`+ libraryName: "Microsoft.Data.SqlClient")`
`239`	`250`	`{`
`240`	`251`	`}`
`241`	`252`	`}`
`@@ -248,7 +259,8 @@ public MsSqlAsyncTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFix`
`248`	`259`	`: base(`
`249`	`260`	`fixture: fixture,`
`250`	`261`	`output: output,`
`251`		`- excerciserName: "MicrosoftDataSqlClientExerciser")`
	`262`	`+ excerciserName: "MicrosoftDataSqlClientExerciser",`
	`263`	`+ libraryName: "Microsoft.Data.SqlClient")`
`252`	`264`	`{`
`253`	`265`	`}`
`254`	`266`	`}`
`@@ -260,7 +272,8 @@ public MsSqlAsyncTests_MicrosoftDataSqlClient_CoreOldest(ConsoleDynamicMethodFix`
`260`	`272`	`: base(`
`261`	`273`	`fixture: fixture,`
`262`	`274`	`output: output,`
`263`		`- excerciserName: "MicrosoftDataSqlClientExerciser")`
	`275`	`+ excerciserName: "MicrosoftDataSqlClientExerciser",`
	`276`	`+ libraryName: "Microsoft.Data.SqlClient")`
`264`	`277`	`{`
`265`	`278`	`}`
`266`	`279`	`}`