updated tests for messageid tag

Author: YayBurritos

projects/Test/SequentialIntegration/TestActivitySource.cs

@@ -293,7 +293,7 @@ public async Task TestPublisherWithPublicationAddressAndConsumerActivityTagsAsyn
         [InlineData(false, true)]
         [InlineData(true, false)]
         [InlineData(false, false)]
-        public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOperationName, bool verifyMessageIdTag)
+        public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOperationName, bool useMessageId)
         {
             RabbitMQActivitySource.UseRoutingKeyAsOperationName = useRoutingKeyAsOperationName;
             var activities = new List<Activity>();
@@ -302,7 +302,7 @@ public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOpera
             string queue = $"queue-{Guid.NewGuid()}";
             const string msg = "for basic.get";
 
-            var basicProps = new BasicProperties() { MessageId = Guid.NewGuid().ToString() };
+            var basicProps = useMessageId ? new BasicProperties() { MessageId = Guid.NewGuid().ToString() } : new BasicProperties();
 
             try
             {
@@ -315,7 +315,7 @@ public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOpera
                 ok = await _channel.QueueDeclarePassiveAsync(queue);
                 Assert.Equal(0u, ok.MessageCount);
                 await Task.Delay(500);
-                AssertActivityData(useRoutingKeyAsOperationName, queue, activities, false, verifyMessageIdTag);
+                AssertActivityData(useRoutingKeyAsOperationName, queue, activities, false, basicProps.MessageId);
             }
             finally
             {
@@ -404,7 +404,7 @@ private static ActivityListener StartActivityListener(List<Activity> activities)
         }
 
         private void AssertActivityData(bool useRoutingKeyAsOperationName, string queueName,
-            List<Activity> activityList, bool isDeliver = false, bool verifyMessageIdTag = false)
+            List<Activity> activityList, bool isDeliver = false, string messageId = null)
         {
             string childName = isDeliver ? "deliver" : "fetch";
             Activity[] activities = activityList.ToArray();
@@ -449,10 +449,10 @@ private void AssertActivityData(bool useRoutingKeyAsOperationName, string queueN
             AssertIntTagGreaterThanZero(sendActivity, RabbitMQActivitySource.MessagingBodySize);
             AssertIntTagGreaterThanZero(receiveActivity, RabbitMQActivitySource.MessagingBodySize);
 
-            if (verifyMessageIdTag)
+            if (messageId is not null)
             {
-                AssertStringTagNotNullOrEmpty(sendActivity, RabbitMQActivitySource.MessageId);
-                AssertStringTagNotNullOrEmpty(receiveActivity, RabbitMQActivitySource.MessageId);
+                AssertStringTagEquals(sendActivity, RabbitMQActivitySource.MessageId, messageId);
+                AssertStringTagEquals(receiveActivity, RabbitMQActivitySource.MessageId, messageId);
             }
         }
     }

projects/Test/SequentialIntegration/TestOpenTelemetry.cs

@@ -305,7 +305,7 @@ public async Task TestPublisherWithCachedStringsAndConsumerActivityTagsAsync(boo
         [InlineData(false, true)]
         [InlineData(true, false)]
         [InlineData(false, false)]
-        public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOperationName, bool verifyMessageIdTag)
+        public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOperationName, bool useMessageId)
         {
             var exportedItems = new List<Activity>();
             using var tracer = Sdk.CreateTracerProviderBuilder()
@@ -320,7 +320,7 @@ public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOpera
             string queue = $"queue-{Guid.NewGuid()}";
             const string msg = "for basic.get";
 
-            var basicProps = new BasicProperties() { MessageId = Guid.NewGuid().ToString() };
+            var basicProps = useMessageId ? new BasicProperties() { MessageId = Guid.NewGuid().ToString() } : new BasicProperties();
 
             try
             {
@@ -335,7 +335,7 @@ public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOpera
                 ok = await _channel.QueueDeclarePassiveAsync(queue);
                 Assert.Equal(0u, ok.MessageCount);
                 await Task.Delay(500);
-                AssertActivityData(useRoutingKeyAsOperationName, queue, exportedItems, false, verifyMessageIdTag);
+                AssertActivityData(useRoutingKeyAsOperationName, queue, exportedItems, false, basicProps.MessageId);
             }
             finally
             {
@@ -344,7 +344,7 @@ public async Task TestPublisherAndBasicGetActivityTags(bool useRoutingKeyAsOpera
         }
 
         private void AssertActivityData(bool useRoutingKeyAsOperationName, string queueName,
-            List<Activity> activityList, bool isDeliver = false, bool verifyMessageIdTag = false)
+            List<Activity> activityList, bool isDeliver = false, string messageId = null)
         {
             string childName = isDeliver ? "deliver" : "fetch";
             string childType = isDeliver ? "process" : "receive";
@@ -390,10 +390,10 @@ private void AssertActivityData(bool useRoutingKeyAsOperationName, string queueN
             AssertStringTagEquals(sendActivity, RabbitMQActivitySource.MessagingOperationType, "send");
             AssertStringTagEquals(sendActivity, RabbitMQActivitySource.MessagingOperationName, "publish");
 
-            if (verifyMessageIdTag)
+            if (messageId is not null)
             {
-                AssertStringTagNotNullOrEmpty(sendActivity, RabbitMQActivitySource.MessageId);
-                AssertStringTagNotNullOrEmpty(receiveActivity, RabbitMQActivitySource.MessageId);
+                AssertStringTagEquals(sendActivity, RabbitMQActivitySource.MessageId, messageId);
+                AssertStringTagEquals(receiveActivity, RabbitMQActivitySource.MessageId, messageId);
             }
         }
     }