chore: update environment variable references to use AWS_SDK_UA_APP_ID

libraries/AWS.Lambda.Powertools.sln

@@ -123,6 +123,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AWS.Lambda.Powertools.Kafka
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AWS.Lambda.Powertools.Kafka.Protobuf", "src\AWS.Lambda.Powertools.Kafka.Protobuf\AWS.Lambda.Powertools.Kafka.Protobuf.csproj", "{B640DB80-C982-407B-A2EC-CD29AC77DDB8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AWS.Lambda.Powertools.ModuleInitializer.Tests", "tests\AWS.Lambda.Powertools.ModuleInitializer.Tests\AWS.Lambda.Powertools.ModuleInitializer.Tests.csproj", "{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}"
+EndProject
+
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -688,6 +691,19 @@ Global
 		{B640DB80-C982-407B-A2EC-CD29AC77DDB8}.Release|x64.Build.0 = Release|Any CPU
 		{B640DB80-C982-407B-A2EC-CD29AC77DDB8}.Release|x86.ActiveCfg = Release|Any CPU
 		{B640DB80-C982-407B-A2EC-CD29AC77DDB8}.Release|x86.Build.0 = Release|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Debug|x64.Build.0 = Debug|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Debug|x86.Build.0 = Debug|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Release|x64.ActiveCfg = Release|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Release|x64.Build.0 = Release|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Release|x86.ActiveCfg = Release|Any CPU
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B}.Release|x86.Build.0 = Release|Any CPU
+
 	EndGlobalSection
 
 	GlobalSection(NestedProjects) = preSolution
@@ -746,5 +762,7 @@ Global
 		{25F0929B-2E04-4ED6-A0ED-5379A0A755B0} = {73C9B1E5-3893-47E8-B373-17E5F5D7E6F5}
 		{9E2B8160-3E76-4B33-86AB-DE35A5FCDB1E} = {73C9B1E5-3893-47E8-B373-17E5F5D7E6F5}
 		{B640DB80-C982-407B-A2EC-CD29AC77DDB8} = {73C9B1E5-3893-47E8-B373-17E5F5D7E6F5}
+		{E1F2A3B4-C5D6-7E8F-9A0B-1C2D3E4F5A6B} = {1CFF5568-8486-475F-81F6-06105C437528}
+
 	EndGlobalSection
 EndGlobal

libraries/src/AWS.Lambda.Powertools.BatchProcessing/AWS.Lambda.Powertools.BatchProcessing.csproj

@@ -16,4 +16,10 @@
         <PackageReference Include="Amazon.Lambda.SQSEvents" />
         <ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
     </ItemGroup>
+
+    <!-- Include MSBuild targets in the NuGet package -->
+    <ItemGroup>
+        <None Include="build\AWS.Lambda.Powertools.BatchProcessing.targets" Pack="true" PackagePath="build\AWS.Lambda.Powertools.BatchProcessing.targets" />
+    </ItemGroup>
+
 </Project>

libraries/src/AWS.Lambda.Powertools.BatchProcessing/BatchProcessor.cs

@@ -5,7 +5,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using AWS.Lambda.Powertools.BatchProcessing.Exceptions;
-using AWS.Lambda.Powertools.Common;
 
 namespace AWS.Lambda.Powertools.BatchProcessing;
 
@@ -16,14 +15,6 @@ namespace AWS.Lambda.Powertools.BatchProcessing;
 /// <typeparam name="TRecord">Type of batch record.</typeparam>
 public abstract class BatchProcessor<TEvent, TRecord> : IBatchProcessor<TEvent, TRecord>
 {
-    /// <summary>
-    /// Default constructor
-    /// </summary>
-    protected BatchProcessor(IPowertoolsConfigurations powertoolsConfigurations)
-    {
-        powertoolsConfigurations.SetExecutionEnvironment(this);
-    }
-
     /// <inheritdoc />
     public ProcessingResult<TRecord> ProcessingResult { get; protected set; }
 

libraries/src/AWS.Lambda.Powertools.BatchProcessing/DynamoDb/DynamoDbStreamBatchProcessor.cs

@@ -2,7 +2,6 @@
 
 using System.Collections.Generic;
 using Amazon.Lambda.DynamoDBEvents;
-using AWS.Lambda.Powertools.Common;
 
 namespace AWS.Lambda.Powertools.BatchProcessing.DynamoDb;
 
@@ -20,23 +19,16 @@ public class DynamoDbStreamBatchProcessor : BatchProcessor<DynamoDBEvent, Dynamo
     /// The singleton instance of the batch processor.
     /// </summary>
     public static IDynamoDbStreamBatchProcessor Instance =>
-        _instance ??= new DynamoDbStreamBatchProcessor(PowertoolsConfigurations.Instance);
+        _instance ??= new DynamoDbStreamBatchProcessor();
+
 
-    /// <summary>
-    /// This is the default constructor
-    /// </summary>
-    /// <param name="powertoolsConfigurations"></param>
-    public DynamoDbStreamBatchProcessor(IPowertoolsConfigurations powertoolsConfigurations) : base(powertoolsConfigurations)
-    {
-        _instance = this;
-    }
-
     /// <summary>
     /// Need default constructor for when consumers create a custom batch processor
     /// </summary>
     // ReSharper disable once MemberCanBePrivate.Global
-    protected DynamoDbStreamBatchProcessor() : this(PowertoolsConfigurations.Instance)
+    protected DynamoDbStreamBatchProcessor()
     {
+        _instance = this;
     }
 
     /// <summary>

libraries/src/AWS.Lambda.Powertools.BatchProcessing/DynamoDb/TypedDynamoDbStreamBatchProcessor.cs

@@ -7,7 +7,6 @@
 using Amazon.Lambda.DynamoDBEvents;
 using AWS.Lambda.Powertools.BatchProcessing.Exceptions;
 using AWS.Lambda.Powertools.BatchProcessing.Internal;
-using AWS.Lambda.Powertools.Common;
 
 namespace AWS.Lambda.Powertools.BatchProcessing.DynamoDb;
 
@@ -20,30 +19,18 @@ public class TypedDynamoDbStreamBatchProcessor : DynamoDbStreamBatchProcessor, I
     private readonly IRecordDataExtractor<DynamoDBEvent.DynamodbStreamRecord> _recordDataExtractor;
 
 
-
     /// <summary>
     /// Initializes a new instance of the TypedDynamoDbStreamBatchProcessor class.
     /// </summary>
-    /// <param name="powertoolsConfigurations">The Powertools configurations.</param>
     /// <param name="deserializationService">The deserialization service. If null, uses JsonDeserializationService.Instance.</param>
     /// <param name="recordDataExtractor">The record data extractor. If null, uses DynamoDbRecordDataExtractor.Instance.</param>
-    public TypedDynamoDbStreamBatchProcessor(
-        IPowertoolsConfigurations powertoolsConfigurations,
-        IDeserializationService deserializationService = null,
+    public TypedDynamoDbStreamBatchProcessor(IDeserializationService deserializationService = null,
         IRecordDataExtractor<DynamoDBEvent.DynamodbStreamRecord> recordDataExtractor = null) 
-        : base(powertoolsConfigurations)
     {
         _deserializationService = deserializationService ?? JsonDeserializationService.Instance;
         _recordDataExtractor = recordDataExtractor ?? DynamoDbRecordDataExtractor.Instance;
     }
 
-    /// <summary>
-    /// Default constructor for when consumers create a custom typed batch processor.
-    /// </summary>
-    protected TypedDynamoDbStreamBatchProcessor() : this(PowertoolsConfigurations.Instance)
-    {
-    }
-
     /// <inheritdoc />
     public async Task<ProcessingResult<DynamoDBEvent.DynamodbStreamRecord>> ProcessAsync<T>(
         DynamoDBEvent @event, 

libraries/src/AWS.Lambda.Powertools.BatchProcessing/Internal/EnvWrapper.cs

@@ -0,0 +1,18 @@
+using AWS.Lambda.Powertools.Common;
+
+namespace AWS.Lambda.Powertools.BatchProcessing.Internal
+{
+    /// <summary>
+    ///   Wrapper class to set the execution environment
+    /// </summary>
+    public static class EnvWrapper
+    {
+        /// <summary>
+        ///  Sets the execution environment
+        /// </summary>
+        public static void SetExecutionEnvironment()
+        {
+            PowertoolsEnvironment.Instance.SetExecutionEnvironment(typeof(EnvWrapper));
+        }
+    }
+}

libraries/src/AWS.Lambda.Powertools.BatchProcessing/Kinesis/KinesisEventBatchProcessor.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Amazon.Lambda.KinesisEvents;
-using AWS.Lambda.Powertools.Common;
 
 namespace AWS.Lambda.Powertools.BatchProcessing.Kinesis;
 
@@ -18,25 +17,16 @@ public class KinesisEventBatchProcessor : BatchProcessor<KinesisEvent, KinesisEv
     /// The singleton instance of the batch processor.
     /// </summary>
     public static IKinesisEventBatchProcessor Instance =>
-        _instance ??= new KinesisEventBatchProcessor(PowertoolsConfigurations.Instance);
-
-    /// <summary>
-    /// This is the default constructor
-    /// </summary>
-    /// <param name="powertoolsConfigurations"></param>
-    public KinesisEventBatchProcessor(IPowertoolsConfigurations powertoolsConfigurations) : base(powertoolsConfigurations)
-    {
-        _instance = this;
-    }
+        _instance ??= new KinesisEventBatchProcessor();
 
     /// <summary>
     /// Need default constructor for when consumers create a custom batch processor
     /// </summary>
-    // ReSharper disable once MemberCanBePrivate.Global
-    protected KinesisEventBatchProcessor() : this(PowertoolsConfigurations.Instance)
+    protected KinesisEventBatchProcessor()
     {
+        _instance = this;
     }
-
+    
     /// <summary>
     /// Return the instance ProcessingResult
     /// </summary>

libraries/src/AWS.Lambda.Powertools.BatchProcessing/Kinesis/TypedKinesisEventBatchProcessor.cs

@@ -7,7 +7,6 @@
 using Amazon.Lambda.KinesisEvents;
 using AWS.Lambda.Powertools.BatchProcessing.Exceptions;
 using AWS.Lambda.Powertools.BatchProcessing.Internal;
-using AWS.Lambda.Powertools.Common;
 
 namespace AWS.Lambda.Powertools.BatchProcessing.Kinesis;
 
@@ -20,30 +19,18 @@ public class TypedKinesisEventBatchProcessor : KinesisEventBatchProcessor, IType
     private readonly IRecordDataExtractor<KinesisEvent.KinesisEventRecord> _recordDataExtractor;
 
 
-
     /// <summary>
     /// Initializes a new instance of the TypedKinesisEventBatchProcessor class.
     /// </summary>
-    /// <param name="powertoolsConfigurations">The Powertools configurations.</param>
     /// <param name="deserializationService">The deserialization service. If null, uses JsonDeserializationService.Instance.</param>
     /// <param name="recordDataExtractor">The record data extractor. If null, uses KinesisRecordDataExtractor.Instance.</param>
-    public TypedKinesisEventBatchProcessor(
-        IPowertoolsConfigurations powertoolsConfigurations,
-        IDeserializationService deserializationService = null,
+    public TypedKinesisEventBatchProcessor(IDeserializationService deserializationService = null,
         IRecordDataExtractor<KinesisEvent.KinesisEventRecord> recordDataExtractor = null) 
-        : base(powertoolsConfigurations)
     {
         _deserializationService = deserializationService ?? JsonDeserializationService.Instance;
         _recordDataExtractor = recordDataExtractor ?? KinesisRecordDataExtractor.Instance;
     }
 
-    /// <summary>
-    /// Default constructor for when consumers create a custom typed batch processor.
-    /// </summary>
-    protected TypedKinesisEventBatchProcessor() : this(PowertoolsConfigurations.Instance)
-    {
-    }
-
     /// <inheritdoc />
     public async Task<ProcessingResult<KinesisEvent.KinesisEventRecord>> ProcessAsync<T>(
         KinesisEvent @event, 

libraries/src/AWS.Lambda.Powertools.BatchProcessing/Sqs/SqsBatchProcessor.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Amazon.Lambda.SQSEvents;
-using AWS.Lambda.Powertools.Common;
 
 namespace AWS.Lambda.Powertools.BatchProcessing.Sqs;
 
@@ -20,22 +19,14 @@ public class SqsBatchProcessor : BatchProcessor<SQSEvent, SQSEvent.SQSMessage>,
     /// Gets the instance.
     /// </summary>
     /// <value>The instance.</value>
-    public static ISqsBatchProcessor Instance => _instance ??= new SqsBatchProcessor(PowertoolsConfigurations.Instance);
-
-    /// <summary>
-    /// This is the default constructor
-    /// </summary>
-    /// <param name="powertoolsConfigurations"></param>
-    public SqsBatchProcessor(IPowertoolsConfigurations powertoolsConfigurations) : base(powertoolsConfigurations)
-    {
-        _instance = this;
-    }
-
+    public static ISqsBatchProcessor Instance => _instance ??= new SqsBatchProcessor();
+
     /// <summary>
     /// Need default constructor for when consumers create a custom batch processor
     /// </summary>
-    protected SqsBatchProcessor() : this(PowertoolsConfigurations.Instance)
+    public SqsBatchProcessor()
     {
+        _instance = this;
     }
 
     /// <summary>

libraries/src/AWS.Lambda.Powertools.BatchProcessing/Sqs/TypedSqsBatchProcessor.cs

@@ -7,7 +7,6 @@
 using Amazon.Lambda.SQSEvents;
 using AWS.Lambda.Powertools.BatchProcessing.Exceptions;
 using AWS.Lambda.Powertools.BatchProcessing.Internal;
-using AWS.Lambda.Powertools.Common;
 
 namespace AWS.Lambda.Powertools.BatchProcessing.Sqs;
 
@@ -20,30 +19,18 @@ public class TypedSqsBatchProcessor : SqsBatchProcessor, ITypedBatchProcessor<SQ
     private readonly IRecordDataExtractor<SQSEvent.SQSMessage> _recordDataExtractor;
 
 
-
     /// <summary>
     /// Initializes a new instance of the TypedSqsBatchProcessor class.
     /// </summary>
-    /// <param name="powertoolsConfigurations">The Powertools configurations.</param>
     /// <param name="deserializationService">The deserialization service. If null, uses JsonDeserializationService.Instance.</param>
     /// <param name="recordDataExtractor">The record data extractor. If null, uses SqsRecordDataExtractor.Instance.</param>
-    public TypedSqsBatchProcessor(
-        IPowertoolsConfigurations powertoolsConfigurations,
-        IDeserializationService deserializationService = null,
+    public TypedSqsBatchProcessor(IDeserializationService deserializationService = null,
         IRecordDataExtractor<SQSEvent.SQSMessage> recordDataExtractor = null) 
-        : base(powertoolsConfigurations)
     {
         _deserializationService = deserializationService ?? JsonDeserializationService.Instance;
         _recordDataExtractor = recordDataExtractor ?? SqsRecordDataExtractor.Instance;
     }
 
-    /// <summary>
-    /// Default constructor for when consumers create a custom typed batch processor.
-    /// </summary>
-    protected TypedSqsBatchProcessor() : this(PowertoolsConfigurations.Instance)
-    {
-    }
-
     /// <inheritdoc />
     public async Task<ProcessingResult<SQSEvent.SQSMessage>> ProcessAsync<T>(
         SQSEvent @event, 

libraries/src/AWS.Lambda.Powertools.BatchProcessing/build/AWS.Lambda.Powertools.BatchProcessing.targets

@@ -0,0 +1,42 @@
+<Project>
+
+  <!-- Automatically inject a module initializer for the BatchProcessing library -->
+  <Target Name="InjectBatchProcessingAutoInitializer" BeforeTargets="BeforeCompile">
+
+    <!-- Generate the C# content directly -->
+    <PropertyGroup>
+      <GeneratedFileContent>// Generated by AWS Lambda Powertools Auto-Initializer
+using System.Runtime.CompilerServices%3B
+
+internal static class PowertoolsBatchProcessingAutoInitializer
+{
+    [ModuleInitializer]
+    internal static void Initialize()
+    {
+        try
+        {
+            // Force load the Powertools assembly by calling its initialization method
+            AWS.Lambda.Powertools.BatchProcessing.Internal.EnvWrapper.SetExecutionEnvironment()%3B
+        }
+        catch
+        {
+            // Ignore errors - the assembly might not be available in all scenarios
+        }
+    }
+}</GeneratedFileContent>
+    </PropertyGroup>
+
+    <!-- Write the generated file -->
+    <WriteLinesToFile 
+      File="$(IntermediateOutputPath)PowertoolsBatchProcessingAutoInitializer.g.cs" 
+      Lines="$(GeneratedFileContent)" 
+      Overwrite="true" />
+
+    <!-- Include the generated file in compilation -->
+    <ItemGroup>
+      <Compile Include="$(IntermediateOutputPath)PowertoolsBatchProcessingAutoInitializer.g.cs" />
+    </ItemGroup>
+
+  </Target>
+
+</Project>

libraries/src/AWS.Lambda.Powertools.Common/AWS.Lambda.Powertools.Common.csproj

@@ -2,17 +2,18 @@
 
     <PropertyGroup>
         <!--  Remaining properties are defined in Directory.Build.props  -->
-      <PackageId>AWS.Lambda.Powertools.Common</PackageId>
-      <Description>Powertools for AWS Lambda (.NET) - Core package.</Description>
-      <AssemblyName>AWS.Lambda.Powertools.Common</AssemblyName>
-      <RootNamespace>AWS.Lambda.Powertools.Common</RootNamespace>
-      <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+        <PackageId>AWS.Lambda.Powertools.Common</PackageId>
+        <Description>Powertools for AWS Lambda (.NET) - Core package.</Description>
+        <AssemblyName>AWS.Lambda.Powertools.Common</AssemblyName>
+        <RootNamespace>AWS.Lambda.Powertools.Common</RootNamespace>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     </PropertyGroup>
 
     <ItemGroup>
-<!--   Package versions are Centrally managed in Directory.Packages.props file  -->
-<!--   More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management   -->
+        <!--   Package versions are Centrally managed in Directory.Packages.props file  -->
+        <!--   More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management   -->
+        <PackageReference Include="Amazon.Lambda.Core"/>
         <PackageReference Include="AspectInjector"/>
     </ItemGroup>
-    
+
 </Project>