Propagate exception details

Azure · Oct 20, 2023 · cd1afd2 · cd1afd2
1 parent 6531013
commit cd1afd2
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 34 deletions.
diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Azure.Messaging.EventGrid.csproj b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Azure.Messaging.EventGrid.csproj
@@ -21,6 +21,14 @@
     <Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" LinkBase="Shared" />
     <Compile Include="$(AzureCoreSharedSources)ForwardsClientCallsAttribute.cs" LinkBase="Shared" />
     <Compile Include="$(AzureCoreSharedSources)AzureResourceProviderNamespaceAttribute.cs" LinkBase="Shared" />
+    <Compile Remove="Generated\Models\ResourceNotificationsResourceManagementDeletedEventData.cs" />
+    <Compile Remove="Generated\Models\ResourceNotificationsResourceManagementDeletedEventData.Serialization.cs" />
+    <Compile Remove="Generated\Models\ResourceNotificationsResourceManagementCreatedOrUpdatedEventData.cs" />
+    <Compile Remove="Generated\Models\ResourceNotificationsResourceManagementCreatedOrUpdatedEventData.Serialization.cs" />
+    <Compile Remove="Generated\Models\ResourceNotificationsResourceDeletedEventData.cs" />
+    <Compile Remove="Generated\Models\ResourceNotificationsResourceDeletedEventData.Serialization.cs" />
+    <Compile Remove="Generated\Models\ResourceNotificationsResourceDeletedDetails.cs" />
+    <Compile Remove="Generated\Models\ResourceNotificationsResourceDeletedDetails.Serialization.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EventGridSourceGenerator\src\EventGridSourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />

diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - Fixed issue where deadlettering a message without specifying properties to modify could throw 
   an exception from out of proc extension.
+- Include underlying exception details in RpcException when a failure occurs.
 
 ## 5.13.2 (2023-10-18)
 

diff --git a/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Grpc/SettlementService.cs b/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Grpc/SettlementService.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 #if NET6_0_OR_GREATER
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Azure.Core.Amqp.Shared;
@@ -31,65 +32,98 @@ public SettlementService()
 
         public override async Task<Empty> Complete(CompleteRequest request, ServerCallContext context)
         {
-            if (_provider.ActionsCache.TryGetValue(request.Locktoken, out var tuple))
+            try
             {
-                await tuple.Actions.CompleteMessageAsync(
-                    tuple.Message,
-                    context.CancellationToken).ConfigureAwait(false);
-                return new Empty();
+                if (_provider.ActionsCache.TryGetValue(request.Locktoken, out var tuple))
+                {
+                    await tuple.Actions.CompleteMessageAsync(
+                        tuple.Message,
+                        context.CancellationToken).ConfigureAwait(false);
+                    return new Empty();
+                }
             }
+            catch (Exception ex)
+            {
+                throw new RpcException(new Status(StatusCode.Unknown, ex.ToString()));
+            }
+
             throw new RpcException (new Status(StatusCode.FailedPrecondition, $"LockToken {request.Locktoken} not found."));
         }
 
         public override async Task<Empty> Abandon(AbandonRequest request, ServerCallContext context)
         {
-            if (_provider.ActionsCache.TryGetValue(request.Locktoken, out var tuple))
+            try
             {
-                await tuple.Actions.AbandonMessageAsync(
-                    tuple.Message,
-                    DeserializeAmqpMap(request.PropertiesToModify),
-                    context.CancellationToken).ConfigureAwait(false);
-                return new Empty();
+                if (_provider.ActionsCache.TryGetValue(request.Locktoken, out var tuple))
+                {
+                    await tuple.Actions.AbandonMessageAsync(
+                        tuple.Message,
+                        DeserializeAmqpMap(request.PropertiesToModify),
+                        context.CancellationToken).ConfigureAwait(false);
+                    return new Empty();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new RpcException(new Status(StatusCode.Unknown, ex.ToString()));
             }
+
             throw new RpcException (new Status(StatusCode.FailedPrecondition, $"LockToken {request.Locktoken} not found."));
         }
 
         public override async Task<Empty> Defer(DeferRequest request, ServerCallContext context)
         {
-            if (_provider.ActionsCache.TryGetValue(request.Locktoken, out var tuple))
+            try
+            {
+                if (_provider.ActionsCache.TryGetValue(request.Locktoken, out var tuple))
+                {
+                    await tuple.Actions.DeferMessageAsync(
+                        tuple.Message,
+                        DeserializeAmqpMap(request.PropertiesToModify),
+                        context.CancellationToken).ConfigureAwait(false);
+                    return new Empty();
+                }
+            }
+            catch (Exception ex)
             {
-                await tuple.Actions.DeferMessageAsync(
-                    tuple.Message,
-                    DeserializeAmqpMap(request.PropertiesToModify),
-                    context.CancellationToken).ConfigureAwait(false);
-                return new Empty();
+                throw new RpcException(new Status(StatusCode.Unknown, ex.ToString()));
             }
+
             throw new RpcException (new Status(StatusCode.FailedPrecondition, $"LockToken {request.Locktoken} not found."));
         }
 
         public override async Task<Empty> Deadletter(DeadletterRequest request, ServerCallContext context)
         {
-            if (_provider.ActionsCache.TryGetValue(request.Locktoken, out var tuple))
+            try
             {
-                if (request.PropertiesToModify == null || request.PropertiesToModify == ByteString.Empty)
+                if (_provider.ActionsCache.TryGetValue(request.Locktoken, out var tuple))
                 {
-                    await tuple.Actions.DeadLetterMessageAsync(
-                        tuple.Message,
-                        request.DeadletterReason,
-                        request.DeadletterErrorDescription,
-                        context.CancellationToken).ConfigureAwait(false);
-                }
-                else
-                {
-                    await tuple.Actions.DeadLetterMessageAsync(
-                        tuple.Message,
-                        DeserializeAmqpMap(request.PropertiesToModify),
-                        request.DeadletterReason,
-                        request.DeadletterErrorDescription,
-                        context.CancellationToken).ConfigureAwait(false);
+                    if (request.PropertiesToModify == null || request.PropertiesToModify == ByteString.Empty)
+                    {
+                        await tuple.Actions.DeadLetterMessageAsync(
+                            tuple.Message,
+                            request.DeadletterReason,
+                            request.DeadletterErrorDescription,
+                            context.CancellationToken).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        await tuple.Actions.DeadLetterMessageAsync(
+                            tuple.Message,
+                            DeserializeAmqpMap(request.PropertiesToModify),
+                            request.DeadletterReason,
+                            request.DeadletterErrorDescription,
+                            context.CancellationToken).ConfigureAwait(false);
+                    }
+
+                    return new Empty();
                 }
-                return new Empty();
             }
+            catch (Exception ex)
+            {
+                throw new RpcException(new Status(StatusCode.Unknown, ex.ToString()));
+            }
+
             throw new RpcException (new Status(StatusCode.FailedPrecondition, $"LockToken {request.Locktoken} not found."));
         }
 

diff --git a/...re.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj b/...re.WebJobs.Extensions.ServiceBus/src/Microsoft.Azure.WebJobs.Extensions.ServiceBus.csproj
@@ -51,4 +51,8 @@
     <Compile Include="$(AzureCoreAmqpSharedSources)AmqpAnnotatedMessageConverter.cs" LinkBase="SharedSource\Azure.Core.Amqp" />
     <Compile Include="$(AzureCoreAmqpSharedSources)MessageBody.cs" LinkBase="SharedSource\Azure.Core.Amqp" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Azure.Messaging.ServiceBus\src\Azure.Messaging.ServiceBus.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/...s/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/Grpc/ServiceBusGrpcEndToEndTests.cs b/...s/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/Grpc/ServiceBusGrpcEndToEndTests.cs
@@ -339,6 +339,37 @@ await SettlementService.Deadletter(
                 Assert.AreEqual("description", deadletterMessage.DeadLetterErrorDescription);
                 Assert.AreEqual("reason", deadletterMessage.DeadLetterReason);
                 Assert.AreEqual(42, deadletterMessage.ApplicationProperties["key"]);
+
+                var exception = Assert.ThrowsAsync<RpcException>(
+                    async () =>
+                        await SettlementService.Complete(
+                            new CompleteRequest { Locktoken = message.LockToken },
+                            new MockServerCallContext()));
+                StringAssert.Contains(
+                    "Azure.Messaging.ServiceBus.ServiceBusException: The lock supplied is invalid.",
+                    exception.ToString());
+
+                exception = Assert.ThrowsAsync<RpcException>(
+                    async () =>
+                        await SettlementService.Defer(
+                            new DeferRequest { Locktoken = message.LockToken },
+                            new MockServerCallContext()));
+                StringAssert.Contains(
+                    "Azure.Messaging.ServiceBus.ServiceBusException: The lock supplied is invalid.",
+                    exception.ToString());
+
+                exception = Assert.ThrowsAsync<RpcException>(
+                    async () =>
+                        await SettlementService.Deadletter(
+                            new DeadletterRequest() { Locktoken = message.LockToken },
+                            new MockServerCallContext()));
+                StringAssert.Contains(
+                    "Azure.Messaging.ServiceBus.ServiceBusException: The lock supplied is invalid.",
+                    exception.ToString());
+
+                // The service doesn't seem to throw when an already settled message gets abandoned over the mgmt link. Will need to discuss
+                // with service team.
+
                 _waitHandle1.Set();
             }
         }