Fix missing sync to async changes (#7157)

## Summary of changes

This PR complete the missing sync to async changes from the previous PR

## Reason for change

I missed a couple of them

## Implementation details

## Test coverage

## Other details
<!-- Fixes #{issue} -->

<!-- ⚠️ Note: where possible, please obtain 2 approvals prior to
merging. Unless CODEOWNERS specifies otherwise, for external teams it is
typically best to have one review from a team member, and one review
from apm-dotnet. Trivial changes do not require 2 reviews. -->

---------

Signed-off-by: Tony Redondo <[email protected]>

Author: tonyredondo

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/DynamicConfigurationTests.cs

@@ -221,12 +221,12 @@ static string FlattenJsonArray(JToken json)
                 json["tags"]?.ToString(Formatting.None).Should().Be(expectedConfig.GlobalTags ?? "[]");
             }
 
-            WaitForTelemetry(agent);
+            await WaitForTelemetryAsync(agent);
 
-            AssertConfigurationChanged(agent.Telemetry, config);
+            await AssertConfigurationChangedAsync(agent.Telemetry, config);
         }
 
-        private bool WaitForTelemetry(MockTracerAgent agent)
+        private async Task<bool> WaitForTelemetryAsync(MockTracerAgent agent)
         {
             var deadline = DateTime.UtcNow.AddSeconds(20);
 
@@ -240,13 +240,13 @@ private bool WaitForTelemetry(MockTracerAgent agent)
                     }
                 }
 
-                Thread.Sleep(500);
+                await Task.Delay(500);
             }
 
             return false;
         }
 
-        private void AssertConfigurationChanged(ConcurrentStack<object> events, Config config)
+        private async Task AssertConfigurationChangedAsync(ConcurrentStack<object> events, Config config)
         {
             var expectedKeys = new List<(string Key, object Value)>
             {
@@ -297,7 +297,7 @@ private void AssertConfigurationChanged(ConcurrentStack<object> events, Config c
 
                 if (latestConfig.Count < expectedCount)
                 {
-                    Thread.Sleep(500);
+                    await Task.Delay(500);
                 }
             }
 

tracer/test/Datadog.Trace.Debugger.IntegrationTests/AspNetBase.cs

@@ -78,10 +78,10 @@ protected async Task<IImmutableList<MockSpan>> SendRequestsAsync(MockTracerAgent
             var minDateTime = DateTime.UtcNow; // when ran sequentially, we get the spans from the previous tests!
             await SendRequestsAsyncNoWaitForSpans(url, body, numberOfAttacks, contentType, userAgent);
 
-            return WaitForSpans(agent, expectedSpans, phase, minDateTime, url);
+            return await WaitForSpansAsync(agent, expectedSpans, phase, minDateTime, url);
         }
 
-        protected IImmutableList<MockSpan> WaitForSpans(MockTracerAgent agent, int expectedSpans, string phase, DateTime minDateTime, string url)
+        protected async Task<IImmutableList<MockSpan>> WaitForSpansAsync(MockTracerAgent agent, int expectedSpans, string phase, DateTime minDateTime, string url)
         {
             agent.SpanFilters.Clear();
 
@@ -90,7 +90,7 @@ protected IImmutableList<MockSpan> WaitForSpans(MockTracerAgent agent, int expec
                 agent.SpanFilters.Add(s => s.Tags.ContainsKey("http.url") && s.Tags["http.url"].IndexOf(url, StringComparison.InvariantCultureIgnoreCase) > -1);
             }
 
-            var spans = agent.WaitForSpans(expectedSpans, minDateTime: minDateTime);
+            var spans = await agent.WaitForSpansAsync(expectedSpans, minDateTime: minDateTime);
             if (spans.Count != expectedSpans)
             {
                 Output?.WriteLine($"spans.Count: {spans.Count} != expectedSpans: {expectedSpans}, this is phase: {phase}");

tracer/test/Datadog.Trace.Debugger.IntegrationTests/ProbesTests.cs

@@ -575,7 +575,7 @@ private async Task VerifySpanDecorationResults(DebuggerSampleProcessHelper sampl
         var testName = isMultiPhase ? $"{testDescription.TestType.Name}_#{phaseNumber}." : testDescription.TestType.Name;
         settings.UseFileName($"{nameof(ProbeTests)}.{testName}.{testNameSuffix}");
 
-        var spans = agent.WaitForSpans(expectedSpanCount);
+        var spans = await agent.WaitForSpansAsync(expectedSpanCount);
 
         Assert.Equal(expectedSpanCount, spans.Count);
 
@@ -616,7 +616,7 @@ private async Task VerifySpanProbeResults(ProbeDefinition[] snapshotProbes, Prob
             var testName = isMultiPhase ? $"{testDescription.TestType.Name}_#{phaseNumber}." : testDescription.TestType.Name;
             settings.UseFileName($"{nameof(ProbeTests)}.{testName}.Spans");
 
-            var spans = agent.WaitForSpans(spanProbes.Length, operationName: spanProbeOperationName);
+            var spans = await agent.WaitForSpansAsync(spanProbes.Length, operationName: spanProbeOperationName);
             // Assert.Equal(spanProbes.Length, spans.Count);
             foreach (var span in spans)
             {

tracer/test/Datadog.Trace.Security.IntegrationTests/ApiSecurity/AspNetCore2ApiSecurity.cs

@@ -19,15 +19,15 @@ namespace Datadog.Trace.Security.IntegrationTests.ApiSecurity
     public class AspNetCore2ApiSecurityEnabled : AspNetCoreApiSecurity
     {
         public AspNetCore2ApiSecurityEnabled(AspNetCoreTestFixture fixture, ITestOutputHelper outputHelper)
-            : base(fixture, outputHelper, true, "AspNetCore2")
+            : base(fixture, outputHelper, true, true, "AspNetCore2")
         {
         }
     }
 
     public class AspNetCore2ApiSecurityDisabled : AspNetCoreApiSecurity
     {
         public AspNetCore2ApiSecurityDisabled(AspNetCoreTestFixture fixture, ITestOutputHelper outputHelper)
-            : base(fixture, outputHelper, false, sampleName: "AspNetCore2")
+            : base(fixture, outputHelper, false, true, sampleName: "AspNetCore2")
         {
         }
     }

tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetMvc5RateLimiter.cs

@@ -124,7 +124,7 @@ public async Task TestRateLimiterSecurity(int totalRequests, string url = Defaul
             // tracing module and mvc actions
             await TestRateLimiter(_enableSecurity, url, _iisFixture.Agent, _traceRateLimit.GetValueOrDefault(100), totalRequests, 2);
             // have to wait a second for the rate limiter to reset (or restart iis express completely)
-            Thread.Sleep(1000);
+            await Task.Delay(1_000);
         }
 
         public async Task InitializeAsync()

tracer/test/Datadog.Trace.Tests/Agent/MovingAverageKeepRateCalculatorTests.cs

@@ -87,7 +87,7 @@ public void Calculator_ShouldHandleOverflows()
         }
 
         [Fact(Skip = "Flaky as is very timing/load dependent")]
-        public void Calculator_ShouldUpdateAutomatically()
+        public async Task Calculator_ShouldUpdateAutomatically()
         {
             const int bucketSize = 10;
             const int bucketDuration = 10;
@@ -112,12 +112,12 @@ public void Calculator_ShouldUpdateAutomatically()
                     break;
                 }
 
-                Thread.Sleep(5);
+                await Task.Delay(5);
             }
 
             Assert.True(updatedKeepRate, "Keep rate was not updated automatically");
 
-            Thread.Sleep(bucketDuration * bucketSize);
+            await Task.Delay(bucketDuration * bucketSize);
 
             // buckets should all be empty again now
             Assert.Equal(0, calc.GetKeepRate());

tracer/test/Datadog.Trace.Tests/DataStreamsMonitoring/DataStreamsManagerTests.cs

@@ -123,14 +123,14 @@ public void WhenEnabled_TracksBacklog()
     }
 
     [Fact]
-    public void WhenEnabled_TimeInQueueIsNotUsedForSecondCheckpoint()
+    public async Task WhenEnabled_TimeInQueueIsNotUsedForSecondCheckpoint()
     {
         long latencyMs = 100;
         var latencyNs = latencyMs * 1_000_000;
 
         var dsm = GetDataStreamManager(true, out var writer);
         var parent = dsm.SetCheckpoint(parentPathway: null, CheckpointKind.Consume, new[] { "some-tags" }, 100, latencyMs);
-        Thread.Sleep(1);
+        await Task.Delay(1);
         dsm.SetCheckpoint(parentPathway: parent, CheckpointKind.Consume, new[] { "some-tags" }, 100, latencyMs);
 
         writer.Points.Should().HaveCount(2);

tracer/test/Datadog.Trace.Tests/Util/ClockTests.cs

@@ -19,7 +19,7 @@ namespace Datadog.Trace.Tests.Util
     public class ClockTests
     {
         [Fact]
-        public void Should_use_real_clock_if_not_overriden()
+        public async Task Should_use_real_clock_if_not_overriden()
         {
             // If everything works, the fastpath should be used and this clock ignored
             using var lease = Clock.SetForCurrentThread(new SimpleClock());
@@ -29,7 +29,7 @@ public void Should_use_real_clock_if_not_overriden()
 
             var now = Clock.UtcNow;
 
-            Thread.Sleep(100);
+            await Task.Delay(100);
 
             var then = Clock.UtcNow;