Trying to stabilize Activity tests

Author: stebet

projects/Test/Integration/TestActivitySource.cs

@@ -86,6 +86,7 @@ public async Task TestPublisherAndConsumerActivityTags(bool useRoutingKeyAsOpera
             var _activities = new List<Activity>();
             using (ActivityListener activityListener = StartActivityListener(_activities))
             {
+                await Task.Delay(500);
                 string queueName = $"{Guid.NewGuid()}";
                 QueueDeclareOk q = await _channel.QueueDeclareAsync(queueName);
                 byte[] sendBody = Encoding.UTF8.GetBytes("hi");
@@ -106,7 +107,7 @@ public async Task TestPublisherAndConsumerActivityTags(bool useRoutingKeyAsOpera
                 Assert.True(await consumerReceivedTcs.Task);
 
                 await _channel.BasicCancelAsync(consumerTag);
-
+                await Task.Delay(500);
                 AssertActivityData(useRoutingKeyAsOperationName, queueName, _activities, true);
             }
         }
@@ -122,6 +123,8 @@ public async Task TestPublisherAndConsumerActivityTagsAsync(bool useRoutingKeyAs
             var activities = new List<Activity>();
             using (ActivityListener activityListener = StartActivityListener(activities))
             {
+                await Task.Delay(500);
+
                 string queueName = $"{Guid.NewGuid()}";
                 QueueDeclareOk q = await _channel.QueueDeclareAsync(queueName);
                 byte[] sendBody = Encoding.UTF8.GetBytes("hi");
@@ -142,7 +145,7 @@ public async Task TestPublisherAndConsumerActivityTagsAsync(bool useRoutingKeyAs
                 Assert.True(await consumerReceivedTcs.Task);
 
                 await _channel.BasicCancelAsync(consumerTag);
-
+                await Task.Delay(500);
                 AssertActivityData(useRoutingKeyAsOperationName, queueName, activities, true);
             }
         }
@@ -153,11 +156,11 @@ public async Task TestPublisherAndConsumerActivityTagsAsync(bool useRoutingKeyAs
         public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOperationName)
         {
             await _channel.ConfirmSelectAsync();
-
             RabbitMQActivitySource.UseRoutingKeyAsOperationName = useRoutingKeyAsOperationName;
             var activities = new List<Activity>();
             using (ActivityListener activityListener = StartActivityListener(activities))
             {
+                await Task.Delay(500);
                 string queue = $"queue-{Guid.NewGuid()}";
                 const string msg = "for basic.get";
 
@@ -172,13 +175,13 @@ public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOpera
                     Assert.Equal(msg, Encoding.UTF8.GetString(res.Body.ToArray()));
                     ok = await _channel.QueueDeclarePassiveAsync(queue);
                     Assert.Equal(0u, ok.MessageCount);
+                    await Task.Delay(500);
+                    AssertActivityData(useRoutingKeyAsOperationName, queue, activities, false);
                 }
                 finally
                 {
                     await _channel.QueueDeleteAsync(queue);
                 }
-
-                AssertActivityData(useRoutingKeyAsOperationName, queue, activities, false);
             }
         }
 
@@ -191,7 +194,7 @@ private static ActivityListener StartActivityListener(List<Activity> activities)
                 ActivitySamplingResult.AllDataAndRecorded;
             activityListener.ShouldListenTo =
                 activitySource => activitySource.Name.StartsWith("RabbitMQ.Client.");
-            activityListener.ActivityStarted = activity => activities.Add(activity);
+            activityListener.ActivityStarted = activities.Add;
             ActivitySource.AddActivityListener(activityListener);
             return activityListener;
         }