SQL Collection fix

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 2.11.2
+- [Fix Sql dependency collection bug in .NET Core 3.0 with Microsoft.Data.SqlClient.](/~https://github.com/Microsoft/ApplicationInsights-dotnet-server/issues/1291)
+
 ## Version 2.11.1
 - [Fix Sql dependency parent id to match W3CTraceContext format](/~https://github.com/Microsoft/ApplicationInsights-dotnet-server/issues/1277)
 - [Fix EventCounters so that it appear as CustomMetrics as opposed to PerformanceCounters.](/~https://github.com/Microsoft/ApplicationInsights-dotnet-server/issues/1280)

Src/DependencyCollector/Shared.Tests/Implementation/SqlClientDiagnosticSourceListenerTests.cs

@@ -198,6 +198,53 @@ public void TracksCommandExecuted(string beforeCommand, string afterCommand)
             Assert.True(Math.Abs((start - dependencyTelemetry.Timestamp).TotalMilliseconds) <= 16);
         }
 
+        [Theory]
+        [InlineData(SqlClientDiagnosticSourceListener.SqlBeforeExecuteCommand, SqlClientDiagnosticSourceListener.SqlAfterExecuteCommand)]
+        [InlineData(SqlClientDiagnosticSourceListener.SqlMicrosoftBeforeExecuteCommand, SqlClientDiagnosticSourceListener.SqlMicrosoftAfterExecuteCommand)]
+        public void TracksCommandExecutedSP(string beforeCommand, string afterCommand)
+        {
+            var operationId = Guid.NewGuid();
+            var sqlConnection = new SqlConnection(TestConnectionString);
+            var sqlCommand = sqlConnection.CreateCommand();
+            sqlCommand.CommandText = "SP_GetOrders";
+            sqlCommand.CommandType = CommandType.StoredProcedure;
+
+            var beforeExecuteEventData = new
+            {
+                OperationId = operationId,
+                Command = sqlCommand,
+                Timestamp = (long?)1000000L
+            };
+
+            this.fakeSqlClientDiagnosticSource.Write(
+                beforeCommand,
+                beforeExecuteEventData);
+            var start = DateTimeOffset.UtcNow;
+
+            var afterExecuteEventData = new
+            {
+                OperationId = operationId,
+                Command = sqlCommand,
+                Timestamp = 2000000L
+            };
+
+            this.fakeSqlClientDiagnosticSource.Write(
+                afterCommand,
+                afterExecuteEventData);
+
+            var dependencyTelemetry = (DependencyTelemetry)this.sendItems.Single();
+
+            Assert.Equal(beforeExecuteEventData.OperationId.ToString("N"), dependencyTelemetry.Id);
+            Assert.Equal(sqlCommand.CommandText, dependencyTelemetry.Data);
+            Assert.Equal("(localdb)\\MSSQLLocalDB | master | SP_GetOrders", dependencyTelemetry.Name);
+            Assert.Equal("(localdb)\\MSSQLLocalDB | master", dependencyTelemetry.Target);
+            Assert.Equal(RemoteDependencyConstants.SQL, dependencyTelemetry.Type);
+            Assert.True((bool)dependencyTelemetry.Success);
+            Assert.True(dependencyTelemetry.Duration > TimeSpan.Zero);
+            Assert.True(dependencyTelemetry.Duration < TimeSpan.FromMilliseconds(500));
+            Assert.True(Math.Abs((start - dependencyTelemetry.Timestamp).TotalMilliseconds) <= 16);
+        }
+
         [Theory]
         [InlineData(SqlClientDiagnosticSourceListener.SqlBeforeExecuteCommand, SqlClientDiagnosticSourceListener.SqlAfterExecuteCommand)]
         [InlineData(SqlClientDiagnosticSourceListener.SqlMicrosoftBeforeExecuteCommand, SqlClientDiagnosticSourceListener.SqlMicrosoftAfterExecuteCommand)]

Src/DependencyCollector/Shared/Implementation/SqlClientDiagnostics/SqlClientDiagnosticFetcherTypes.cs

@@ -11,7 +11,7 @@ internal static class SqlClientDiagnosticFetcherTypes
         //// http://github.com/dotnet/corefx/blob/master/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlClientDiagnosticListenerExtensions.cs
         //// /~https://github.com/dotnet/SqlClient/blob/master/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientDiagnosticListenerExtensions.cs
 
-#region "System.Data fetchers"
+        #region "System.Data fetchers"
 
         /// <summary> Fetchers for execute command before event. </summary>
         internal static class CommandBefore
@@ -41,6 +41,7 @@ internal static class CommandError
             public static readonly PropertyFetcher Command = new PropertyFetcher(nameof(Command));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for connection open/close before events. </summary>
@@ -68,6 +69,7 @@ internal static class ConnectionError
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for transaction commit before events. </summary>
@@ -118,6 +120,7 @@ internal static class TransactionRollbackError
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for transaction commit error events. </summary>
@@ -127,9 +130,10 @@ internal static class TransactionCommitError
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
         #endregion
-        
+
         #region "Microsoft.Data fetchers"
 
         /// <summary> Fetchers for execute command before event. </summary>
@@ -160,6 +164,7 @@ internal static class CommandErrorMicrosoft
             public static readonly PropertyFetcher Command = new PropertyFetcher(nameof(Command));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for connection open/close before events. </summary>
@@ -187,6 +192,7 @@ internal static class ConnectionErrorMicrosoft
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for transaction commit before events. </summary>
@@ -237,6 +243,7 @@ internal static class TransactionRollbackErrorMicrosoft
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
 
         /// <summary> Fetchers for transaction commit error events. </summary>
@@ -246,6 +253,7 @@ internal static class TransactionCommitErrorMicrosoft
             public static readonly PropertyFetcher Connection = new PropertyFetcher(nameof(Connection));
             public static readonly PropertyFetcher Exception = new PropertyFetcher(nameof(Exception));
             public static readonly PropertyFetcher Timestamp = new PropertyFetcher(nameof(Timestamp));
+            public static readonly PropertyFetcher Number = new PropertyFetcher(nameof(Number));
         }
         #endregion
     }