Release 3.0.1

Release 3.0.1

Author: nemakam

src/Microsoft.Azure.ServiceBus/Microsoft.Azure.ServiceBus.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>This is the next generation Azure Service Bus .NET Standard client library that focuses on queues &amp; topics. For more information about Service Bus, see https://azure.microsoft.com/en-us/services/service-bus/</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <Version>3.0.1</Version>
     <Authors>Microsoft</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyOriginatorKeyFile>../../build/keyfile.snk</AssemblyOriginatorKeyFile>
@@ -31,10 +31,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Amqp" Version="[2.2.0, 3.0.0)" />
-    <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.1.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="[1.0.1, 2.0.0)" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="[3.17.2, 4.0.0)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.4.1" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.0-preview2-41113220915" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="[5.2.2, 6.0.0)" />
     <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
   </ItemGroup>
 

src/Microsoft.Azure.ServiceBus/ServiceBusDiagnosticsSource.cs

@@ -650,7 +650,7 @@ private Activity Start(string operationName, Func<object> getPayload, Action<Act
         private void Inject(IList<Message> messageList)
         {
             var currentActivity = Activity.Current;
-            if (currentActivity != null)
+            if (currentActivity != null && messageList != null)
             {
                 var correlationContext = SerializeCorrelationContext(currentActivity.Baggage.ToList());
 
@@ -672,7 +672,7 @@ private void Inject(Message message)
 
         private void Inject(Message message, string id, string correlationContext)
         {
-            if (!message.UserProperties.ContainsKey(ActivityIdPropertyName))
+            if (message != null && !message.UserProperties.ContainsKey(ActivityIdPropertyName))
             {
                 message.UserProperties[ActivityIdPropertyName] = id;
                 if (correlationContext != null)
@@ -684,7 +684,7 @@ private void Inject(Message message, string id, string correlationContext)
 
         private string SerializeCorrelationContext(IList<KeyValuePair<string,string>> baggage)
         {
-            if (baggage.Any())
+            if (baggage != null && baggage.Count > 0)
             {
                 return string.Join(",", baggage.Select(kvp => kvp.Key + "=" + kvp.Value));
             }
@@ -716,7 +716,7 @@ private Activity ProcessStart(string operationName, Message message, Func<object
             Activity activity = null;
             string activityName = BaseActivityName + operationName;
 
-            if (DiagnosticListener.IsEnabled(activityName, entityPath))
+            if (message != null && DiagnosticListener.IsEnabled(activityName, entityPath))
             {
                 var tmpActivity = message.ExtractActivity(activityName);
                 setTags?.Invoke(tmpActivity);
@@ -739,6 +739,11 @@ private Activity ProcessStart(string operationName, Message message, Func<object
 
         private void SetTags(Activity activity, IList<Message> messageList)
         {
+            if (messageList == null)
+            {
+                return;
+            }
+
             var messageIds = messageList.Where(m => m.MessageId != null).Select(m => m.MessageId).ToArray();
             if (messageIds.Any())
             {
@@ -754,6 +759,11 @@ private void SetTags(Activity activity, IList<Message> messageList)
 
         private void SetTags(Activity activity, Message message)
         {
+            if (message == null)
+            {
+                return;
+            }
+
             if (message.MessageId != null)
             {
                 activity.AddTag(MessageIdTag, message.MessageId);

test/Microsoft.Azure.ServiceBus.UnitTests/Diagnostics/DiagnosticsTests.cs

@@ -265,7 +265,7 @@ protected int AssertReceiveStop(string name, object payload, Activity activity,
             }
 
             Assert.Equal(sentMessagesCount, GetPropertyValueFromAnonymousTypeInstance<int>(payload, "RequestedMessageCount"));
-            var messages = GetPropertyValueFromAnonymousTypeInstance<IList<Message>>(payload, "Messages");
+            var messages = GetPropertyValueFromAnonymousTypeInstance<IList<Message>>(payload, "Messages", true);
 
             if (receivedMessagesCount != -1)
             {
@@ -278,7 +278,7 @@ protected int AssertReceiveStop(string name, object payload, Activity activity,
             }
 
             AssertTags(messages, activity);
-            return messages.Count;
+            return messages?.Count ?? 0;
         }
 
         #endregion
@@ -414,6 +414,11 @@ protected void AssertRenewLockStop(string name, object payload, Activity activit
 
         protected void AssertTags(IList<Message> messageList, Activity activity)
         {
+            if (messageList == null)
+            {
+                return;
+            }
+
             var messagesWithId = messageList.Where(m => m.MessageId != null).ToArray();
             if (messagesWithId.Any())
             {
@@ -441,13 +446,13 @@ protected void AssertTags(IList<Message> messageList, Activity activity)
 
         protected void AssertTags(Message message, Activity activity)
         {
-            if (message.MessageId != null)
+            if (message?.MessageId != null)
             {
                 Assert.Contains("MessageId", activity.Tags.Select(t => t.Key));
                 Assert.Equal(message.MessageId, activity.Tags.Single(t => t.Key == "MessageId").Value);
             }
 
-            if (message.SessionId != null)
+            if (message?.SessionId != null)
             {
                 Assert.Contains("SessionId", activity.Tags.Select(t => t.Key));
                 Assert.Equal(message.SessionId, activity.Tags.Single(t => t.Key == "SessionId").Value);
@@ -483,15 +488,22 @@ protected void AssertCommonStopPayloadProperties(object eventPayload)
             Assert.Equal(TaskStatus.RanToCompletion, status);
         }
 
-        protected T GetPropertyValueFromAnonymousTypeInstance<T>(object obj, string propertyName)
+        protected T GetPropertyValueFromAnonymousTypeInstance<T>(object obj, string propertyName, bool canValueBeNull = false)
         {
             Type t = obj.GetType();
 
             PropertyInfo p = t.GetRuntimeProperty(propertyName);
 
             object propertyValue = p.GetValue(obj);
-            Assert.NotNull(propertyValue);
-            Assert.IsAssignableFrom<T>(propertyValue);
+            if (!canValueBeNull)
+            {
+                Assert.NotNull(propertyValue); 
+            }
+
+            if (propertyValue != null)
+            {
+                Assert.IsAssignableFrom<T>(propertyValue); 
+            }
 
             return (T)propertyValue;
         }

test/Microsoft.Azure.ServiceBus.UnitTests/Diagnostics/QueueClientDiagnosticsTests.cs

@@ -239,6 +239,32 @@ async Task AbandonCompleteFireEvents()
             Assert.True(this.events.IsEmpty);
         }
 
+        [Fact]
+        [DisplayTestMethodName]
+        async Task ReceiveNoMessageFireEvents()
+        {
+            this.queueClient = new QueueClient(TestUtility.NamespaceConnectionString, TestConstants.NonPartitionedQueueName,
+                ReceiveMode.ReceiveAndDelete);
+
+            this.listener.Enable((name, queuName, arg) => name.Contains("Send") || name.Contains("Receive"));
+            var messages = await this.queueClient.InnerReceiver.ReceiveAsync(2, TimeSpan.FromSeconds(5));
+
+            int receivedStopCount = 0;
+            Assert.Equal(2, this.events.Count);
+            while (this.events.TryDequeue(out var receiveStart))
+            {
+                var startCount = AssertReceiveStart(receiveStart.eventName, receiveStart.payload, receiveStart.activity,
+                    -1);
+
+                Assert.True(this.events.TryDequeue(out var receiveStop));
+                receivedStopCount += AssertReceiveStop(receiveStop.eventName, receiveStop.payload, receiveStop.activity,
+                    receiveStart.activity, null, startCount, -1);
+            }
+
+            Assert.Equal(0, receivedStopCount);
+            Assert.True(this.events.IsEmpty);
+        }
+
         [Fact]
         [DisplayTestMethodName]
         async Task BatchSendReceiveFireEvents()

test/Microsoft.Azure.ServiceBus.UnitTests/Microsoft.Azure.ServiceBus.UnitTests.csproj

@@ -24,15 +24,16 @@
     <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\RetryTests.cs" />
     <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\SubscriptionClientTests.cs" />
     <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\Diagnostics\ExtractActivityTests.cs" />
-    <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\Diagnostics\QueueClientDiagnosticsTests.cs" />
-    <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\Diagnostics\SubscriptionClientDiagnosticsTests.cs" />
     <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\Diagnostics\SessionDiagnosticsTests.cs" />
+    <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\Diagnostics\QueueClientDiagnosticsTests.cs" />
+    <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\API\APIApprovals.cs" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
     <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\OnMessageTopicSubscriptionTests.cs" />
     <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\TopicClientTests.cs" />
-    <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\OnSessionTopicSubscriptionTests.cs" />    
+    <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\OnSessionTopicSubscriptionTests.cs" />
+    <compile Remove="..\..\test\Microsoft.Azure.ServiceBus.UnitTests\Diagnostics\SubscriptionClientDiagnosticsTests.cs" />
   </ItemGroup>
 
   <ItemGroup>

test/Microsoft.Azure.ServiceBus.UnitTests/TransactionTests.cs

@@ -111,6 +111,10 @@ public async Task TransactionalCompleteCommitTest(string queueName)
                     ts.Complete();
                 }
 
+                // Adding delay since transaction Commit/Rollback is an asynchronous operation.
+                // Operating on the same message should not be done.
+                await Task.Delay(TimeSpan.FromSeconds(2));
+
                 await Assert.ThrowsAsync<MessageLockLostException>(async () => await receiver.CompleteAsync(receivedMessage.SystemProperties.LockToken));
             }
             finally
@@ -183,12 +187,18 @@ public async Task TransactionalSessionDispositionTest(string queueName)
                     ts.Dispose();
                 }
 
+                // Adding delay since transaction Commit/Rollback is an asynchronous operation.
+                // Operating on the same message should not be done.
+                await Task.Delay(TimeSpan.FromSeconds(2));
+
                 using (var ts = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled))
                 {
                     await receiver.CompleteAsync(receivedMessage.SystemProperties.LockToken);
                     ts.Complete();
                 }
 
+                await Task.Delay(TimeSpan.FromSeconds(2));
+
                 await Assert.ThrowsAsync<SessionLockLostException>(async () => await receiver.CompleteAsync(receivedMessage.SystemProperties.LockToken));
             }
             finally