Merge branch 'develop' into chore/ua-change-env

Author: hjgraca

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b  # v3.29.2
+      uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8  # v3.29.4
       with:
         languages: ${{ matrix.language }}
 
@@ -45,7 +45,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b  # v3.29.2
+      uses: github/codeql-action/autobuild@4e828ff8d448a8a6e532957b1811f387a63867e8  # v3.29.4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -58,4 +58,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b  # v3.29.2
+      uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8  # v3.29.4

.github/workflows/e2e-tests.yml

@@ -51,7 +51,7 @@ jobs:
           node-version: "22"
 
       - name: Setup dependencies
-        uses: aws-powertools/actions/.github/actions/cached-node-modules@29979bc5339bf54f76a11ac36ff67701986bb0f0
+        uses: aws-powertools/actions/.github/actions/cached-node-modules@7d2401cbbb232594bde7285bc5b8c0c78dcbe6e2
 
       - name: Install AWS Lambda .NET CLI Tools
         run: dotnet tool install -g Amazon.Lambda.Tools
@@ -95,7 +95,7 @@ jobs:
           node-version: "22"
 
       - name: Setup dependencies
-        uses: aws-powertools/actions/.github/actions/cached-node-modules@29979bc5339bf54f76a11ac36ff67701986bb0f0
+        uses: aws-powertools/actions/.github/actions/cached-node-modules@7d2401cbbb232594bde7285bc5b8c0c78dcbe6e2
 
       - name: Install AWS Lambda .NET CLI Tools
         run: dotnet tool install -g Amazon.Lambda.Tools
@@ -163,7 +163,7 @@ jobs:
           node-version: "22"
 
       - name: Setup dependencies
-        uses: aws-powertools/actions/.github/actions/cached-node-modules@29979bc5339bf54f76a11ac36ff67701986bb0f0
+        uses: aws-powertools/actions/.github/actions/cached-node-modules@7d2401cbbb232594bde7285bc5b8c0c78dcbe6e2
 
       - name: Install AWS Lambda .NET CLI Tools
         run: dotnet tool install -g Amazon.Lambda.Tools
@@ -204,7 +204,7 @@ jobs:
           node-version: "22"
 
       - name: Setup dependencies
-        uses: aws-powertools/actions/.github/actions/cached-node-modules@29979bc5339bf54f76a11ac36ff67701986bb0f0
+        uses: aws-powertools/actions/.github/actions/cached-node-modules@7d2401cbbb232594bde7285bc5b8c0c78dcbe6e2
 
       - name: Install AWS Lambda .NET CLI Tools
         run: dotnet tool install -g Amazon.Lambda.Tools

.github/workflows/ossf_scorecard.yml

@@ -43,6 +43,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         with:
           sarif_file: results.sarif

docs/core/logging.md

@@ -446,7 +446,7 @@ When debugging in non-production environments, you can instruct Logger to log th
 parameter or via `POWERTOOLS_LOGGER_LOG_EVENT` environment variable.
 
 !!! warning
-Log event is disabled by default to prevent sensitive info being logged.
+    Log event is disabled by default to prevent sensitive info being logged.
 
 === "Function.cs"
 
@@ -471,8 +471,8 @@ You can set a Correlation ID using `CorrelationIdPath` parameter by passing
 a [JSON Pointer expression](https://datatracker.ietf.org/doc/html/draft-ietf-appsawg-json-pointer-03){target="_blank"}.
 
 !!! Attention
-The JSON Pointer expression is `case sensitive`. In the bellow example `/headers/my_request_id_header` would work but
-`/Headers/my_request_id_header` would not find the element.
+    The JSON Pointer expression is `case sensitive`. In the bellow example `/headers/my_request_id_header` would work but
+    `/Headers/my_request_id_header` would not find the element.
 
 === "Function.cs"
 
@@ -577,8 +577,8 @@ for known event sources, where either a request ID or X-Ray Trace ID are present
 ## Appending additional keys
 
 !!! info "Custom keys are persisted across warm invocations"
-Always set additional keys as part of your handler to ensure they have the latest value, or explicitly clear them with [
-`ClearState=true`](#clearing-all-state).
+    Always set additional keys as part of your handler to ensure they have the latest value, or explicitly clear them with [
+    `ClearState=true`](#clearing-all-state).
 
 You can append your own keys to your existing logs via `AppendKey`. Typically this value would be passed into the
 function via the event. Appended keys are added to all subsequent log entries in the current execution from the point
@@ -683,7 +683,7 @@ It accepts any dictionary, and all keyword arguments will be added as part of th
 log statement.
 
 !!! info
-Any keyword argument added using extra keys will not be persisted for subsequent messages.
+    Any keyword argument added using extra keys will not be persisted for subsequent messages.
 
 === "Function.cs"
 
@@ -782,8 +782,8 @@ You can dynamically set a percentage of your logs to **DEBUG** level via env var
 via `SamplingRate` parameter on attribute.
 
 !!! info
-Configuration on environment variable is given precedence over sampling rate configuration on attribute, provided it's
-in valid value range.
+    Configuration on environment variable is given precedence over sampling rate configuration on attribute, provided it's
+    in valid value range.
 
 === "Sampling via attribute parameter"
 
@@ -915,18 +915,18 @@ We support the following log levels:
 ### Using AWS Lambda Advanced Logging Controls (ALC)
 
 !!! question "When is it useful?"
-When you want to set a logging policy to drop informational or verbose logs for one or all AWS Lambda functions,
-regardless of runtime and logger used.
+    When you want to set a logging policy to drop informational or verbose logs for one or all AWS Lambda functions,
+    regardless of runtime and logger used.
 
 With [AWS Lambda Advanced Logging Controls (ALC)](https://docs.aws.amazon.com/lambda/latest/dg/monitoring-cloudwatchlogs.html#monitoring-cloudwatchlogs-advanced)
 {target="_blank"}, you can enforce a minimum log level that Lambda will accept from your application code.
 
 When enabled, you should keep `Logger` and ALC log level in sync to avoid data loss.
 
 !!! warning "When using AWS Lambda Advanced Logging Controls (ALC)"
-- When Powertools Logger output is set to `PascalCase` **`Level`**  property name will be replaced by **`LogLevel`** as
-  a property name.
-- ALC takes precedence over **`POWERTOOLS_LOG_LEVEL`** and when setting it in code using **`[Logging(LogLevel = )]`**
+    - When Powertools Logger output is set to `PascalCase` **`Level`**  property name will be replaced by **`LogLevel`** as
+    a property name.
+    - ALC takes precedence over **`POWERTOOLS_LOG_LEVEL`** and when setting it in code using **`[Logging(LogLevel = )]`**
 
 Here's a sequence diagram to demonstrate how ALC will drop both `Information` and `Debug` logs emitted from `Logger`,
 when ALC log level is stricter than `Logger`.
@@ -985,8 +985,8 @@ customize the serialization of Powertools Logger.
   This is useful when you want to change the casing of the property names or use a different naming convention.
 
 !!! info
-If you want to preserve the original casing of the property names (keys), you can set the `DictionaryKeyPolicy` to
-`null`.
+    If you want to preserve the original casing of the property names (keys), you can set the `DictionaryKeyPolicy` to
+    `null`.
 
 ```csharp
 builder.Logging.AddPowertoolsLogger(options => 
@@ -999,6 +999,19 @@ builder.Logging.AddPowertoolsLogger(options =>
 });
 ```
 
+!!! warning
+    When using `builder.Logging.AddPowertoolsLogger` method it will use any already configured logging providers (file loggers, database loggers, third-party providers).
+    
+    If you want to use Powertools Logger as the only logging provider, you should call `builder.Logging.ClearProviders()` before adding Powertools Logger or the new method override
+    
+    ```csharp
+    builder.Logging.AddPowertoolsLogger(config =>
+        {
+        config.Service = "TestService";
+        config.LoggerOutputCase = LoggerOutputCase.PascalCase;
+        }, clearExistingProviders: true);
+    ```
+
 ### Custom Log formatter (Bring Your Own Formatter)
 
 You can customize the structure (keys and values) of your log entries by implementing a custom log formatter and

libraries/src/AWS.Lambda.Powertools.Common/Core/ConsoleWrapper.cs

@@ -8,7 +8,6 @@ public class ConsoleWrapper : IConsoleWrapper
 {
     private static bool _override;
     private static TextWriter _testOutputStream;
-    private static bool _outputResetPerformed = false;
     private static bool _inTestMode = false;
 
     /// <inheritdoc />
@@ -20,7 +19,7 @@ public void WriteLine(string message)
         }
         else
         {
-            EnsureConsoleOutputOnce();
+            EnsureConsoleOutput();
             Console.WriteLine(message);
         }
     }
@@ -34,7 +33,7 @@ public void Debug(string message)
         }
         else
         {
-            EnsureConsoleOutputOnce();
+            EnsureConsoleOutput();
             System.Diagnostics.Debug.WriteLine(message);
         }
     }
@@ -50,9 +49,9 @@ public void Error(string message)
         {
             if (!_override)
             {
-                var errordOutput = new StreamWriter(Console.OpenStandardError());
-                errordOutput.AutoFlush = true;
-                Console.SetError(errordOutput);
+                var errorOutput = new StreamWriter(Console.OpenStandardError());
+                errorOutput.AutoFlush = true;
+                Console.SetError(errorOutput);
             }
             Console.Error.WriteLine(message);
         }
@@ -70,23 +69,69 @@ public static void SetOut(TextWriter consoleOut)
         Console.SetOut(consoleOut);
     }
 
-    private static void EnsureConsoleOutputOnce()
+    private static void EnsureConsoleOutput()
     {
-        if (_outputResetPerformed) return;
-        OverrideLambdaLogger();
-        _outputResetPerformed = true;
+        // Check if we need to override console output for Lambda environment
+        if (ShouldOverrideConsole())
+        {
+            OverrideLambdaLogger();
+        }
+    }
+
+    private static bool ShouldOverrideConsole()
+    {
+        // Don't override if we're in test mode
+        if (_inTestMode) return false;
+
+        // Always override in Lambda environment to prevent Lambda's log wrapping
+        var isLambda = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("AWS_LAMBDA_FUNCTION_NAME"));
+
+        return isLambda && (!_override || HasLambdaReInterceptedConsole());
+    }
+
+    internal static bool HasLambdaReInterceptedConsole()
+    {
+        return HasLambdaReInterceptedConsole(() => Console.Out);
     }
 
-    private static void OverrideLambdaLogger()
+    internal static bool HasLambdaReInterceptedConsole(Func<TextWriter> consoleOutAccessor)
     {
-        if (_override)
+        // Lambda might re-intercept console between init and handler execution
+        try
+        {
+            var currentOut = consoleOutAccessor();
+            // Check if current output stream looks like it might be Lambda's wrapper
+            var typeName = currentOut.GetType().FullName ?? "";
+            return typeName.Contains("Lambda") || typeName == "System.IO.TextWriter+SyncTextWriter";
+        }
+        catch
+        {
+            return true; // Assume re-interception if we can't determine
+        }
+    }
+    
+    internal static void OverrideLambdaLogger()
+    {
+        OverrideLambdaLogger(() => Console.OpenStandardOutput());
+    }
+    
+    internal static void OverrideLambdaLogger(Func<Stream> standardOutputOpener)
+    {
+        try
+        {
+            // Force override of LambdaLogger
+            var standardOutput = new StreamWriter(standardOutputOpener())
+            {
+                AutoFlush = true
+            };
+            Console.SetOut(standardOutput);
+            _override = true;
+        }
+        catch (Exception)
         {
-            return;
+            // Log the failure but don't throw - degraded functionality is better than crash
+            _override = false;
         }
-        // Force override of LambdaLogger
-        var standardOutput = new StreamWriter(Console.OpenStandardOutput());
-        standardOutput.AutoFlush = true;
-        Console.SetOut(standardOutput);
     }
 
     internal static void WriteLine(string logLevel, string message)
@@ -102,14 +147,14 @@ public static void ResetForTest()
         _override = false;
         _inTestMode = false;
         _testOutputStream = null;
-        _outputResetPerformed = false;
     }
 
     /// <summary>
     ///     Clear the output reset flag
     /// </summary>
     public static void ClearOutputResetFlag()
     {
-        _outputResetPerformed = false;
+        // This method is kept for backward compatibility but no longer needed
+        // since we removed the _outputResetPerformed flag
     }
 }

libraries/src/AWS.Lambda.Powertools.Logging/PowertoolsLoggingBuilderExtensions.cs

@@ -56,6 +56,7 @@ internal static PowertoolsLoggerConfiguration GetCurrentConfiguration()
     ///     Adds the Powertools logger to the logging builder with default configuration.
     /// </summary>
     /// <param name="builder">The logging builder to configure.</param>
+    /// <param name="clearExistingProviders">Opt-in to clear providers for Powertools-only output</param>
     /// <returns>The logging builder for further configuration.</returns>
     /// <remarks>
     ///     This method registers the Powertools logger with default settings. The logger will output 
@@ -78,14 +79,24 @@ internal static PowertoolsLoggerConfiguration GetCurrentConfiguration()
     ///     </code>
     /// </example>
     public static ILoggingBuilder AddPowertoolsLogger(
-        this ILoggingBuilder builder)
+        this ILoggingBuilder builder,
+        bool clearExistingProviders = false)
     {
+        if (clearExistingProviders)
+        {
+            builder.ClearProviders();
+        }
+        
         builder.AddConfiguration();
-
+        
         builder.Services.TryAddSingleton<IPowertoolsEnvironment, PowertoolsEnvironment>();
         builder.Services.TryAddSingleton<IPowertoolsConfigurations>(sp =>
             new PowertoolsConfigurations(sp.GetRequiredService<IPowertoolsEnvironment>()));
 
+        // automatically register ILogger
+        builder.Services.TryAddSingleton<ILogger>(provider =>
+            provider.GetRequiredService<ILoggerFactory>().CreatePowertoolsLogger());
+
         builder.Services.TryAddEnumerable(
             ServiceDescriptor.Singleton<ILoggerProvider, PowertoolsLoggerProvider>(provider =>
             {
@@ -111,6 +122,7 @@ public static ILoggingBuilder AddPowertoolsLogger(
     /// </summary>
     /// <param name="builder">The logging builder to configure.</param>
     /// <param name="configure"></param>
+    /// <param name="clearExistingProviders">Opt-in to clear providers for Powertools-only output</param>
     /// <returns>The logging builder for further configuration.</returns>
     /// <remarks>
     ///     This method registers the Powertools logger with default settings. The logger will output 
@@ -155,10 +167,11 @@ public static ILoggingBuilder AddPowertoolsLogger(
     /// </example>
     public static ILoggingBuilder AddPowertoolsLogger(
         this ILoggingBuilder builder,
-        Action<PowertoolsLoggerConfiguration> configure)
+        Action<PowertoolsLoggerConfiguration> configure,
+        bool clearExistingProviders = false)
     {
         // Add configuration
-        builder.AddPowertoolsLogger();
+        builder.AddPowertoolsLogger(clearExistingProviders);
 
         // Create initial configuration
         var options = new PowertoolsLoggerConfiguration();

libraries/src/AWS.Lambda.Powertools.Metrics/Metrics.cs

@@ -182,6 +182,10 @@ void IMetrics.AddMetric(string key, double value, MetricUnit unit, MetricResolut
                 throw new ArgumentNullException(
                     nameof(key),
                     "'AddMetric' method requires a valid metrics key. 'Null' or empty values are not allowed.");
+            if (key.Length > 255)
+                throw new ArgumentOutOfRangeException(
+                    nameof(key),
+                    "'AddMetric' method requires a valid metrics key. Key exceeds the allowed length constraint.");
 
             if (value < 0)
             {