@@ -36,7 +36,17 @@ public static void EventSource_SuccessfulHandshake_LogsStartStop()
36
36
listener . AddActivityTracking ( ) ;
37
37
38
38
var events = new ConcurrentQueue < ( EventWrittenEventArgs Event , Guid ActivityId ) > ( ) ;
39
- await listener . RunWithCallbackAsync ( e => events . Enqueue ( ( e , e . ActivityId ) ) , async ( ) =>
39
+ await listener . RunWithCallbackAsync ( e =>
40
+ {
41
+ events . Enqueue ( ( e , e . ActivityId ) ) ;
42
+
43
+ if ( e . EventName == "HandshakeStart" )
44
+ {
45
+ // Wait for a new counter group so that current-tls-handshakes is guaranteed a non-zero value
46
+ WaitForEventCountersAsync ( events ) . GetAwaiter ( ) . GetResult ( ) ;
47
+ }
48
+ } ,
49
+ async ( ) =>
40
50
{
41
51
// Invoke tests that'll cause some events to be generated
42
52
var test = new SslStreamStreamToStreamTest_Async ( ) ;
@@ -86,7 +96,17 @@ public static void EventSource_UnsuccessfulHandshake_LogsStartFailureStop()
86
96
listener . AddActivityTracking ( ) ;
87
97
88
98
var events = new ConcurrentQueue < ( EventWrittenEventArgs Event , Guid ActivityId ) > ( ) ;
89
- await listener . RunWithCallbackAsync ( e => events . Enqueue ( ( e , e . ActivityId ) ) , async ( ) =>
99
+ await listener . RunWithCallbackAsync ( e =>
100
+ {
101
+ events . Enqueue ( ( e , e . ActivityId ) ) ;
102
+
103
+ if ( e . EventName == "HandshakeStart" )
104
+ {
105
+ // Wait for a new counter group so that current-tls-handshakes is guaranteed a non-zero value
106
+ WaitForEventCountersAsync ( events ) . GetAwaiter ( ) . GetResult ( ) ;
107
+ }
108
+ } ,
109
+ async ( ) =>
90
110
{
91
111
// Invoke tests that'll cause some events to be generated
92
112
var test = new SslStreamStreamToStreamTest_Async ( ) ;
0 commit comments