Merge branch 'dev'

Author: aws-sdk-dotnet-automation

CHANGELOG.md

@@ -1,3 +1,11 @@
+## Release 2025-07-14
+
+### AWS.Messaging.Lambda (1.0.1)
+* Don't use .Any() on List<T>
+### AWS.Messaging (1.0.1)
+* Support scoped IAsyncDisposable services being disposed after message is processed
+* Minor threading and memory optimizations and cleanups
+
 ## Release 2025-06-03
 
 ### AWS.Messaging.Telemetry.OpenTelemetry (0.23.0)

README.md

@@ -10,7 +10,7 @@ The **AWS Message Processing Framework for .NET** is an AWS-native framework tha
 
 Add the `AWS.Messaging` NuGet package to your project:
 ```
-dotnet add package AWS.Messaging --prerelease
+dotnet add package AWS.Messaging
 ```
 
 The framework integrates with .NET's [dependency injection (DI) service container](https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection). You can configure the framework during your application's startup by calling `AddAWSMessageBus` to add it to the DI container.

src/AWS.Messaging.Lambda/AWS.Messaging.Lambda.csproj

@@ -16,7 +16,7 @@
     <WarningsAsErrors>CA1727</WarningsAsErrors>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>

src/AWS.Messaging.Lambda/DefaultLambdaMessaging.cs

@@ -51,7 +51,7 @@ public async Task ProcessLambdaEventAsync(SQSEvent sqsEvent, ILambdaContext cont
         {
             try
             {
-                if (sqsEvent.Records?.Any() == false)
+                if (sqsEvent.Records?.Count == 0)
                     return;
 
                 _lambdaContextHolder.Context = context;
@@ -84,7 +84,7 @@ public async Task<SQSBatchResponse> ProcessLambdaEventWithBatchResponseAsync(SQS
         {
             try
             {
-                if (sqsEvent.Records?.Any() == false)
+                if (sqsEvent.Records?.Count == 0)
                     return new SQSBatchResponse();
 
                 _lambdaContextHolder.Context = context;

src/AWS.Messaging.Lambda/Extensions/MessageBusBuilderExtensions.cs

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-using Amazon.Lambda.Core;
 using AWS.Messaging.Configuration;
 using AWS.Messaging.Lambda;
 using AWS.Messaging.Lambda.Services;
@@ -25,10 +24,7 @@ public static IMessageBusBuilder AddLambdaMessageProcessor(this IMessageBusBuild
     {
         var lambdaMessagingOptions = new LambdaMessagingOptions();
 
-        if (options != null)
-        {
-            options.Invoke(lambdaMessagingOptions);
-        }
+        options?.Invoke(lambdaMessagingOptions);
 
         lambdaMessagingOptions.Validate();
 

src/AWS.Messaging.Lambda/Services/DefaultLambdaMessageProcessor.cs

@@ -9,7 +9,6 @@
 using AWS.Messaging.Services;
 using AWS.Messaging.SQS;
 using AWS.Messaging.Telemetry;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
 namespace AWS.Messaging.Lambda.Services;
@@ -77,7 +76,7 @@ public DefaultLambdaMessageProcessor(
 
                 trace.AddMetadata(TelemetryKeys.QueueUrl, _configuration.SubscriberEndpoint);
 
-                if (sqsEvent is null || !sqsEvent.Records.Any())
+                if (sqsEvent is null || sqsEvent.Records.Count == 0)
                 {
                     return _sqsBatchResponse;
                 }

src/AWS.Messaging.Lambda/Services/LambdaMessageProcessorConfiguration.cs

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 using Amazon.Lambda.SQSEvents;
-using AWS.Messaging.Configuration;
 
 namespace AWS.Messaging.Lambda.Services;
 

src/AWS.Messaging/AWS.Messaging.csproj

@@ -18,7 +18,7 @@
     <NoWarn>CS1591</NoWarn>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>

src/AWS.Messaging/Configuration/AWSClientProvider.cs

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-using System.Reflection;
 using Amazon.Runtime;
 using AWS.Messaging.Telemetry;
 
@@ -29,18 +28,18 @@ public AWSClientProvider(IServiceProvider serviceProvider)
     public T GetServiceClient<T>() where T : IAmazonService
     {
         var serviceClient =  _serviceProvider.GetService(typeof(T)) ?? throw new FailedToFindAWSServiceClientException($"Failed to find AWS service client of type {typeof(T)}");
-        if (serviceClient is AmazonServiceClient)
+        if (serviceClient is AmazonServiceClient client)
         {
-            ((AmazonServiceClient)serviceClient).BeforeRequestEvent += AWSServiceClient_BeforeServiceRequest;
+            client.BeforeRequestEvent += AWSServiceClient_BeforeServiceRequest;
         }
         return (T)serviceClient;
     }
 
     internal static void AWSServiceClient_BeforeServiceRequest(object sender, RequestEventArgs e)
     {
-        if (e is not WebServiceRequestEventArgs args || !args.Headers.ContainsKey(_userAgentHeader) || args.Headers[_userAgentHeader].Contains(_userAgentString))
+        if (e is not WebServiceRequestEventArgs args || !args.Headers.TryGetValue(_userAgentHeader, out var value) || value.Contains(_userAgentString))
             return;
 
-        args.Headers[_userAgentHeader] = args.Headers[_userAgentHeader] + " " + _userAgentString;
+        args.Headers[_userAgentHeader] = value + " " + _userAgentString;
     }
 }

src/AWS.Messaging/Configuration/MessageBusBuilder.cs

@@ -115,10 +115,7 @@ public IMessageBusBuilder AddSQSPoller(string queueUrl, Action<SQSMessagePollerO
         // Create the user-provided options class
         var sqsMessagePollerOptions = new SQSMessagePollerOptions();
 
-        if (options != null)
-        {
-            options.Invoke(sqsMessagePollerOptions);
-        }
+        options?.Invoke(sqsMessagePollerOptions);
 
         sqsMessagePollerOptions.Validate();
 
@@ -188,9 +185,9 @@ public IMessageBusBuilder LoadConfigurationFromSettings(IConfiguration configura
         {
             foreach (var sqsPublisher in settings.SQSPublishers)
             {
-                var messageType = GetTypeFromAssemblies(callingAssembly, sqsPublisher.MessageType);
-                if (messageType is null)
-                    throw new InvalidAppSettingsConfigurationException($"Unable to find the provided message type '{sqsPublisher.MessageType}'.");
+                var messageType = GetTypeFromAssemblies(callingAssembly, sqsPublisher.MessageType)
+                    ?? throw new InvalidAppSettingsConfigurationException($"Unable to find the provided message type '{sqsPublisher.MessageType}'.");
+
                 AddSQSPublisher(messageType, sqsPublisher.QueueUrl, sqsPublisher.MessageTypeIdentifier);
             }
         }
@@ -199,9 +196,9 @@ public IMessageBusBuilder LoadConfigurationFromSettings(IConfiguration configura
         {
             foreach (var snsPublisher in settings.SNSPublishers)
             {
-                var messageType = GetTypeFromAssemblies(callingAssembly, snsPublisher.MessageType);
-                if (messageType is null)
-                    throw new InvalidAppSettingsConfigurationException($"Unable to find the provided message type '{snsPublisher.MessageType}'.");
+                var messageType = GetTypeFromAssemblies(callingAssembly, snsPublisher.MessageType)
+                    ?? throw new InvalidAppSettingsConfigurationException($"Unable to find the provided message type '{snsPublisher.MessageType}'.");
+
                 AddSNSPublisher(messageType, snsPublisher.TopicUrl, snsPublisher.MessageTypeIdentifier);
             }
         }
@@ -210,9 +207,9 @@ public IMessageBusBuilder LoadConfigurationFromSettings(IConfiguration configura
         {
             foreach (var eventBridgePublisher in settings.EventBridgePublishers)
             {
-                var messageType = GetTypeFromAssemblies(callingAssembly, eventBridgePublisher.MessageType);
-                if (messageType is null)
-                    throw new InvalidAppSettingsConfigurationException($"Unable to find the provided message type '{eventBridgePublisher.MessageType}'.");
+                var messageType = GetTypeFromAssemblies(callingAssembly, eventBridgePublisher.MessageType)
+                    ?? throw new InvalidAppSettingsConfigurationException($"Unable to find the provided message type '{eventBridgePublisher.MessageType}'.");
+
                 AddEventBridgePublisher(messageType, eventBridgePublisher.EventBusName, eventBridgePublisher.MessageTypeIdentifier, eventBridgePublisher.Options);
             }
         }
@@ -221,17 +218,15 @@ public IMessageBusBuilder LoadConfigurationFromSettings(IConfiguration configura
         {
             foreach (var messageHandler in settings.MessageHandlers)
             {
-                var messageType = GetTypeFromAssemblies(callingAssembly, messageHandler.MessageType);
-                if (messageType is null)
-                    throw new InvalidAppSettingsConfigurationException($"Unable to find the provided message type '{messageHandler.MessageType}'.");
-                var handlerType = GetTypeFromAssemblies(callingAssembly, messageHandler.HandlerType);
-                if (handlerType is null)
-                    throw new InvalidAppSettingsConfigurationException($"Unable to find the provided message handler type '{messageHandler.HandlerType}'.");
+                var messageType = GetTypeFromAssemblies(callingAssembly, messageHandler.MessageType)
+                    ?? throw new InvalidAppSettingsConfigurationException($"Unable to find the provided message type '{messageHandler.MessageType}'.");
+                var handlerType = GetTypeFromAssemblies(callingAssembly, messageHandler.HandlerType)
+                    ?? throw new InvalidAppSettingsConfigurationException($"Unable to find the provided message handler type '{messageHandler.HandlerType}'.");
 
                 // This func is not Native AOT compatible but the method in general is marked
                 // as not being Native AOT compatible due to loading dynamic types. So this
                 // func not being Native AOT compatible is okay.
-                var envelopeFactory = () =>
+                MessageEnvelope envelopeFactory()
                 {
                     var messageEnvelopeType = typeof(MessageEnvelope<>).MakeGenericType(messageType);
                     var envelope = Activator.CreateInstance(messageEnvelopeType);
@@ -241,7 +236,7 @@ public IMessageBusBuilder LoadConfigurationFromSettings(IConfiguration configura
 
                     }
                     return (MessageEnvelope)envelope;
-                };
+                }
 
                 AddMessageHandler(handlerType, messageType, envelopeFactory, messageHandler.MessageTypeIdentifier);
             }