pr-fix: correct managed identity connection

arcus-azure · Nov 14, 2024 · 896052b · 896052b
1 parent d03caa0
commit 896052b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/src/Arcus.Messaging.Pumps.Abstractions/MessagePump.cs b/src/Arcus.Messaging.Pumps.Abstractions/MessagePump.cs
@@ -82,7 +82,7 @@ protected MessagePump(IConfiguration configuration, IServiceProvider serviceProv
         /// <param name="receiveException">Exception that occurred</param>
         protected virtual Task HandleReceiveExceptionAsync(Exception receiveException)
         {
-            Logger.LogCritical(receiveException, "Unable to process message from {EntityPath} with client {ClientId}: {Message}", EntityPath, ClientId, receiveException.Message);
+            Logger.LogCritical(receiveException, "Unable to process message from {EntityPath} with client {ClientId}: {Message}", EntityPath, ClientId, receiveException);
             return Task.CompletedTask;
         }
 

diff --git a/src/Arcus.Messaging.Tests.Integration/MessagePump/EventHubsMessagePumpTests.cs b/src/Arcus.Messaging.Tests.Integration/MessagePump/EventHubsMessagePumpTests.cs
@@ -87,8 +87,6 @@ private async Task TestEventHubsMessageHandlingAsync(
                 MessageCorrelationFormat.Hierarchical => CreateSensorEventDataForHierarchical(),
             };
 
-            using var connection = TemporaryManagedIdentityConnection.Create(_config, _logger);
-
             var options = new WorkerOptions();
             configureOptions(options);
 

diff --git a/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePump.ServiceBusTests.cs b/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePump.ServiceBusTests.cs
@@ -43,8 +43,6 @@ await TestServiceBusQueueDeadLetteredMessageAsync(options =>
         private async Task TestServiceBusQueueDeadLetteredMessageAsync(Action<WorkerOptions> configureOptions)
         {
             // Arrange
-            using var connection = TemporaryManagedIdentityConnection.Create(_config, _logger);
-
             var options = new WorkerOptions();
             configureOptions(options);
 

diff --git a/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePump.TelemetryTests.cs b/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePump.TelemetryTests.cs
@@ -208,8 +208,8 @@ public async Task ServiceBusQueueMessagePump_WithCustomOperationParentIdProperty
             // Arrange
             var customOperationParentIdPropertyName = "MyOperationParentId";
             var options = new WorkerOptions();
-            options.AddServiceBusQueueMessagePump(QueueName, HostName,
-                opt =>
+            options.AddServiceBusQueueMessagePumpUsingManagedIdentity(QueueName, HostName,
+                configureMessagePump: opt =>
                 {
                     opt.AutoComplete = true;
                     opt.Routing.Correlation.Format = MessageCorrelationFormat.Hierarchical;

diff --git a/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePumpTests.cs b/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePumpTests.cs
@@ -30,10 +30,11 @@ namespace Arcus.Messaging.Tests.Integration.MessagePump
 {
     [Collection("Integration")]
     [Trait("Category", "Integration")]
-    public partial class ServiceBusMessagePumpTests : IClassFixture<ServiceBusEntityFixture>
+    public partial class ServiceBusMessagePumpTests : IClassFixture<ServiceBusEntityFixture>, IDisposable
     {
         private readonly TestConfig _config;
         private readonly ServiceBusConfig _serviceBusConfig;
+        private readonly TemporaryManagedIdentityConnection _connection;
         private readonly ILogger _logger;
         private readonly ITestOutputHelper _outputWriter;
 
@@ -47,6 +48,7 @@ public ServiceBusMessagePumpTests(ServiceBusEntityFixture entity, ITestOutputHel
 
             _outputWriter = outputWriter;
             _logger = new XunitTestLogger(outputWriter);
+            _connection = TemporaryManagedIdentityConnection.Create(_config, _logger);
 
             QueueName = entity.QueueName;
             TopicName = entity.TopicName;
@@ -100,8 +102,6 @@ private async Task TestServiceBusMessageHandlingAsync(
                 MessageCorrelationFormat.Hierarchical => CreateOrderServiceBusMessageForHierarchical(),
             };
 
-            using var connection = TemporaryManagedIdentityConnection.Create(_config, _logger);
-
             var options = new WorkerOptions();
             configureOptions(options);
 
@@ -251,6 +251,14 @@ private static void AssertReceivedOrderEventDataForW3C(
             Assert.NotNull(receivedEventData.CorrelationInfo.OperationId);
             Assert.Equal(operationParentId, receivedEventData.CorrelationInfo.OperationParentId);
         }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            _connection?.Dispose();
+        }
     }
 
     public class ServiceBusEntityFixture : IAsyncLifetime