@@ -107,12 +107,11 @@ public class XEventsTracingTest
107107 /// context when executing a stored procedure.
108108 /// </summary>
109109 /// <remarks>
110- /// This test is marked as flaky because it can occasionally fail due to deadlocks on the remote SQL Server instance.
111- /// This first became apparent when running 'sp_help' on an Azure SQL instance under load. The first mitigation attempt
112- /// is to switch to a temporary stored procedure which consists of a simple 'SELECT 1' statement, which should be less
113- /// likely to cause deadlocks .
110+ /// This test has historically been marked as flaky following occasional failures due to deadlocks on the remote
111+ /// SQL Server instance. This first became apparent when running 'sp_help' on an Azure SQL instance under load.
112+ /// This appears to have been resolved by switching to a temporary stored procedure which consists of a simple
113+ /// 'SELECT 1' statement .
114114 /// </remarks>
115- [ Trait ( "Category" , "flaky" ) ]
116115 [ ConditionalFact ( typeof ( DataTestUtility ) , nameof ( DataTestUtility . AreConnStringsSetup ) , nameof ( DataTestUtility . IsNotAzureSynapse ) , nameof ( DataTestUtility . IsNotManagedInstance ) ) ]
117116 public void XEventActivityIDConsistentWithTracing_RpcStarting ( )
118117 {
@@ -131,24 +130,17 @@ public void XEventActivityIDConsistentWithTracing_RpcStarting()
131130 /// context when executing a SQL statement which is not a stored procedure.
132131 /// </summary>
133132 /// <remarks>
134- /// This test is marked as flaky because it can occasionally fail due to deadlocks on the remote SQL Server instance.
135- /// This first became apparent when running 'SELECT @@VERSION' on an Azure SQL instance under load. The first mitigation
136- /// attempt is to switch to a simpler 'SELECT 1' statement, which should be less likely to cause deadlocks .
133+ /// This test has historically been marked as flaky following occasional failures due to deadlocks on the remote
134+ /// SQL Server instance. This first became apparent when running 'SELECT @@VERSION' on an Azure SQL instance under load.
135+ /// This appears to have been resolved by switching to a simpler 'SELECT 1' statement.
137136 /// </remarks>
138- [ Trait ( "Category" , "flaky" ) ]
139137 [ ConditionalFact ( typeof ( DataTestUtility ) , nameof ( DataTestUtility . AreConnStringsSetup ) , nameof ( DataTestUtility . IsNotAzureSynapse ) , nameof ( DataTestUtility . IsNotManagedInstance ) ) ]
140138 public void XEventActivityIDConsistentWithTracing_SqlStatementStarting ( ) =>
141139 VerifyXEventActivityIDConsistentWithTracing ( "SELECT 1 AS [Field1]" , System . Data . CommandType . Text , "sql_statement_starting" ) ;
142140
143141 /// <summary>
144142 /// Validates that the activity ID is consistently recorded in an XEvent session even when a command generates an error.
145143 /// </summary>
146- /// <remarks>
147- /// This test is marked as flaky because the other two XEvents-based tests have failed intermittently as a result of their
148- /// connection being killed to resolve deadlocks when the server is under load. While this test is not expected to cause
149- /// deadlocks, it's marked as flaky in case something specific to XEvents makes deadlocks more likely.
150- /// </remarks>
151- [ Trait ( "Category" , "flaky" ) ]
152144 [ ConditionalFact ( typeof ( DataTestUtility ) , nameof ( DataTestUtility . AreConnStringsSetup ) , nameof ( DataTestUtility . IsNotAzureSynapse ) , nameof ( DataTestUtility . IsNotManagedInstance ) ) ]
153145 public void XEventActivityIDConsistentWithTracing_ActivityIDTransferOnError ( ) =>
154146 VerifyXEventActivityIDConsistentWithTracing ( $ "THROW { CustomErrorNumber } , 'Sample message', 0", System . Data . CommandType . Text , "sql_statement_starting" ) ;
0 commit comments