diff --git a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.Tests/Trace/SimpleManagedTracerTest.cs b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.Tests/Trace/SimpleManagedTracerTest.cs index f2caf295a976..049cf5432fb2 100644 --- a/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.Tests/Trace/SimpleManagedTracerTest.cs +++ b/apis/Google.Cloud.Diagnostics.Common/Google.Cloud.Diagnostics.Common.Tests/Trace/SimpleManagedTracerTest.cs @@ -356,14 +356,15 @@ public async Task MultipleSpans_Threads_Started_During_Span() var mockConsumer = new Mock>(); var tracer = SimpleManagedTracer.Create(mockConsumer.Object, ProjectId, TraceId); - ulong rootId = 0; Predicate> rootMatcher = t => { var spans = t.Single().Spans; - rootId = spans[0].SpanId; return spans.Count == 1 && IsValidSpan(spans[0], "root"); }; - mockConsumer.Setup(c => c.Receive(Match.Create(rootMatcher))); + ulong rootId = 0; + mockConsumer + .Setup(c => c.Receive(Match.Create(rootMatcher))) + .Callback>(t => rootId = t.Single().Spans[0].SpanId); var childThreadsReleased = new ManualResetEventSlim(initialState: false); var startedChildSpans = 0; @@ -402,9 +403,6 @@ public async Task MultipleSpans_Threads_Started_During_Span() t2 = Task.Run(() => op("child-two", "grandchild-two").Wait()); } - mockConsumer.VerifyAll(); - mockConsumer.Reset(); - Predicate> childMatcher = t => { // Verify that even though the child spans were started after the root span was ended, they