From 7d95d9bb23259ecdb8eb266772612ba2cfb56c3d Mon Sep 17 00:00:00 2001
From: Bradley Grainger <bgrainger@gmail.com>
Date: Wed, 21 Sep 2016 10:50:17 -0700
Subject: [PATCH] Adjust New Relic custom instrumentation.

Try to remove "DEBUG" warnings from the New Relic log with the previous file under .NET Agent 6.0.0.0.
---
 contrib/NewRelic/MySqlConnector.xml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/contrib/NewRelic/MySqlConnector.xml b/contrib/NewRelic/MySqlConnector.xml
index 612aa8420..2f700da0b 100644
--- a/contrib/NewRelic/MySqlConnector.xml
+++ b/contrib/NewRelic/MySqlConnector.xml
@@ -13,11 +13,8 @@
 			<!-- MySqlConnector -->
 			<match assemblyName="MySqlConnector" className="MySql.Data.MySqlClient.MySqlCommand">
 				<exactMethodMatcher methodName="ExecuteReader" parameters="System.Data.CommandBehavior" />
-				<exactMethodMatcher methodName="ExecuteReaderAsync" parameters="System.Data.CommandBehavior,System.Threading.CancellationToken" />
 				<exactMethodMatcher methodName="ExecuteNonQuery" />
-				<exactMethodMatcher methodName="ExecuteNonQueryAsync" />
 				<exactMethodMatcher methodName="ExecuteScalar" />
-				<exactMethodMatcher methodName="ExecuteScalarAsync" />
 			</match>
 
 		</tracerFactory>
@@ -28,9 +25,7 @@
 			<!-- MySqlConnector -->
 			<match assemblyName="MySqlConnector" className="MySql.Data.MySqlClient.MySqlDataReader">
 				<exactMethodMatcher methodName="NextResult" />
-				<exactMethodMatcher methodName="NextResultAsync" />
 				<exactMethodMatcher methodName="Read" />
-				<exactMethodMatcher methodName="ReadAsync" />
 			</match>
 
 		</tracerFactory>
@@ -46,5 +41,20 @@
 
 		</tracerFactory>
 
+		<tracerFactory name="NewRelic.Providers.Wrapper.CustomInstrumentationAsync.DefaultWrapperAsync">
+
+			<match assemblyName="MySqlConnector" className="MySql.Data.MySqlClient.MySqlCommand">
+				<exactMethodMatcher methodName="ExecuteReaderAsync" parameters="System.Data.CommandBehavior,System.Threading.CancellationToken" />
+				<exactMethodMatcher methodName="ExecuteNonQueryAsync" />
+				<exactMethodMatcher methodName="ExecuteScalarAsync" />
+			</match>
+
+			<match assemblyName="MySqlConnector" className="MySql.Data.MySqlClient.MySqlDataReader">
+				<exactMethodMatcher methodName="NextResultAsync" />
+				<exactMethodMatcher methodName="ReadAsync" />
+			</match>
+
+		</tracerFactory>
+
 	</instrumentation>
 </extension>
\ No newline at end of file