Reducing test flakyness.

Author: stebet

projects/Unit/ActivitySource/TestActivitySource.cs

@@ -48,6 +48,7 @@ void AssertIntTagGreaterThanZero(Activity activity, string name)
             }
 
             List<Activity> activities = new List<Activity>();
+            string queueName = "";
 
             // Let's create an activity listener and listen to all events
             using (ActivityListener activityListener = new ActivityListener())
@@ -63,6 +64,7 @@ void AssertIntTagGreaterThanZero(Activity activity, string name)
                 using (IModel m = c.CreateModel())
                 {
                     QueueDeclareOk q = m.QueueDeclare();
+                    queueName = q.QueueName;
                     byte[] sendBody = Encoding.UTF8.GetBytes("hi");
                     byte[] consumeBody = null;
                     var consumer = new EventingBasicConsumer(m);
@@ -78,37 +80,37 @@ void AssertIntTagGreaterThanZero(Activity activity, string name)
                     m.BasicPublish("", q.QueueName, sendBody);
                     bool waitResFalse = are.WaitOne(5000);
                     m.BasicCancel(tag);
-                    Assert.True(waitResFalse);
-                    Assert.Equal(sendBody, consumeBody);
-                    Assert.NotEmpty(activities);
-                    Activity sendActivity = activities.Single(x => x.OperationName == $"{q.QueueName} send");
-                    Activity receiveActivity = activities.Single(x => x.OperationName == $"{q.QueueName} receive");
-                    Activity processActivity = activities.Single(x => x.OperationName == $"{q.QueueName} process");
-                    Assert.Equal(ActivityKind.Producer, sendActivity.Kind);
-                    Assert.Equal(ActivityKind.Consumer, receiveActivity.Kind);
-                    Assert.Equal(ActivityKind.Consumer, processActivity.Kind);
-                    Assert.Equal(receiveActivity.ParentId, sendActivity.Id);
-                    Assert.Equal(processActivity.ParentId, sendActivity.Id);
+                }
+
+                var activityArray = activities.ToArray();
+                Assert.NotEmpty(activityArray);
+                Activity sendActivity = activityArray.Single(x => x.OperationName == $"{queueName} send");
+                Activity receiveActivity = activityArray.Single(x => x.OperationName == $"{queueName} receive");
+                Activity processActivity = activityArray.Single(x => x.OperationName == $"{queueName} process");
+                Assert.Equal(ActivityKind.Producer, sendActivity.Kind);
+                Assert.Equal(ActivityKind.Consumer, receiveActivity.Kind);
+                Assert.Equal(ActivityKind.Consumer, processActivity.Kind);
+                Assert.Equal(receiveActivity.ParentId, sendActivity.Id);
+                Assert.Equal(processActivity.ParentId, sendActivity.Id);
 #if NET6_0_OR_GREATER
-                    AssertStringTagNotNullOrEmpty(sendActivity, "thread.name");
+                AssertStringTagNotNullOrEmpty(sendActivity, "thread.name");
 #endif
-                    AssertIntTagGreaterThanZero(sendActivity, "thread.id");
-                    AssertStringTagEquals(sendActivity, "net.host.name", Environment.MachineName);
-                    AssertStringTagNotNullOrEmpty(sendActivity, "net.peer.ip");
-                    AssertIntTagGreaterThanZero(sendActivity, "net.peer.port");
-                    AssertStringTagNotNullOrEmpty(sendActivity, "net.peer.name");
-                    AssertStringTagNotNullOrEmpty(sendActivity, "net.local.ip");
-                    AssertIntTagGreaterThanZero(sendActivity, "net.local.port");
-                    AssertStringTagEquals(sendActivity, "net.transport", "ip_tcp");
-                    AssertStringTagEquals(sendActivity, "messaging.system", "rabbitmq");
-                    AssertStringTagEquals(sendActivity, "messaging.protocol", "amqp");
-                    AssertStringTagEquals(sendActivity, "messaging.protocol_version", "0.9.1");
-                    AssertStringTagEquals(sendActivity, "messaging.destination", "amq.default");
-                    AssertStringTagEquals(sendActivity, "messaging.destination_kind", "topic");
-                    AssertStringTagEquals(sendActivity, "messaging.rabbitmq.routing_key", q.QueueName);
-                    AssertStringTagTrue(sendActivity, "messaging.url", x => Uri.IsWellFormedUriString(x, UriKind.Absolute));
-                    AssertIntTagGreaterThanZero(sendActivity, "messaging.message_payload_size_bytes");
-                }
+                AssertIntTagGreaterThanZero(sendActivity, "thread.id");
+                AssertStringTagEquals(sendActivity, "net.host.name", Environment.MachineName);
+                AssertStringTagNotNullOrEmpty(sendActivity, "net.peer.ip");
+                AssertIntTagGreaterThanZero(sendActivity, "net.peer.port");
+                AssertStringTagNotNullOrEmpty(sendActivity, "net.peer.name");
+                AssertStringTagNotNullOrEmpty(sendActivity, "net.local.ip");
+                AssertIntTagGreaterThanZero(sendActivity, "net.local.port");
+                AssertStringTagEquals(sendActivity, "net.transport", "ip_tcp");
+                AssertStringTagEquals(sendActivity, "messaging.system", "rabbitmq");
+                AssertStringTagEquals(sendActivity, "messaging.protocol", "amqp");
+                AssertStringTagEquals(sendActivity, "messaging.protocol_version", "0.9.1");
+                AssertStringTagEquals(sendActivity, "messaging.destination", "amq.default");
+                AssertStringTagEquals(sendActivity, "messaging.destination_kind", "topic");
+                AssertStringTagEquals(sendActivity, "messaging.rabbitmq.routing_key", q.QueueName);
+                AssertStringTagTrue(sendActivity, "messaging.url", x => Uri.IsWellFormedUriString(x, UriKind.Absolute));
+                AssertIntTagGreaterThanZero(sendActivity, "messaging.message_payload_size_bytes");
             }
         }
     }