Change Context Naming convention PTFeature/Name/Version. Fix Version to Major.Minor.Build Update tests.

Author: hjgraca

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

@@ -37,6 +37,7 @@ public string GetAssemblyName<T>(T type)
     /// <inheritdoc />
     public string GetAssemblyVersion<T>(T type)
     {
-        return type.GetType().Assembly.GetName().Version?.ToString();
+        var version = type.GetType().Assembly.GetName().Version;
+        return version != null ? $"{version.Major}.{version.Minor}.{version.Build}" : string.Empty;
     }
 }

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

@@ -100,14 +100,34 @@ public void SetExecutionEnvironment<T>(T type)
         // If there is an existing execution environment variable add the annotations package as a suffix.
         if(!string.IsNullOrEmpty(GetEnvironmentVariable(envName)))
         {
-            envValue.Append($"{GetEnvironmentVariable(envName)}_");
+            envValue.Append($"{GetEnvironmentVariable(envName)} ");
         }
 
         var assemblyVersion = _powertoolsEnvironment.GetAssemblyVersion(type);
         var assemblyName =_powertoolsEnvironment.GetAssemblyName(type);
 
-        envValue.Append($"{assemblyName}_{assemblyVersion}");
+        envValue.Append($"{ParseAssemblyName(assemblyName)}/{assemblyVersion}");
 
         SetEnvironmentVariable(envName, envValue.ToString());
     }
+
+    /// <summary>
+    /// Parsing the name to conform with the required naming convention for the UserAgent header (PTFeature/Name/Version)
+    /// Fallback to Assembly Name on exception
+    /// </summary>
+    /// <param name="assemblyName"></param>
+    /// <returns></returns>
+    private string ParseAssemblyName(string assemblyName)
+    {
+        try
+        {
+            var parsedName = assemblyName.Substring(assemblyName.LastIndexOf(".", StringComparison.Ordinal)+1);
+            return $"PTFeature/{parsedName}";
+        }
+        catch
+        {
+            //NOOP
+        }
+        return $"PTFeature/{assemblyName}";
+    }
 }

libraries/tests/AWS.Lambda.Powertools.Common.Tests/Core/PowertoolsEnvironmentTest.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using Moq;
 using Xunit;
 
 namespace AWS.Lambda.Powertools.Common.Tests;
 
-public class PowertoolsEnvironmentTest
+public class PowertoolsEnvironmentTest : IDisposable
 {
     [Fact]
     public void Set_Execution_Environment()
@@ -17,7 +16,7 @@ public void Set_Execution_Environment()
         systemWrapper.SetExecutionEnvironment(this);
 
         // Assert
-        Assert.Equal("Lambda_Powertools_1.0.0", systemWrapper.GetEnvironmentVariable("AWS_EXECUTION_ENV"));
+        Assert.Equal("PTFeature/Fake/1.0.0", systemWrapper.GetEnvironmentVariable("AWS_EXECUTION_ENV"));
     }
 
     [Fact]
@@ -26,13 +25,61 @@ public void Set_Execution_Environment_WhenEnvironmentHasValue()
         // Arrange
         var systemWrapper = new SystemWrapper(new MockEnvironment());
 
-        systemWrapper.SetEnvironmentVariable("AWS_EXECUTION_ENV", "ExistingValue");
+        systemWrapper.SetEnvironmentVariable("AWS_EXECUTION_ENV", "ExistingValuesInUserAgent");
 
         // Act
         systemWrapper.SetExecutionEnvironment(this);
 
         // Assert
-        Assert.Equal("ExistingValue_Lambda_Powertools_1.0.0", systemWrapper.GetEnvironmentVariable("AWS_EXECUTION_ENV"));
+        Assert.Equal("ExistingValuesInUserAgent PTFeature/Fake/1.0.0", systemWrapper.GetEnvironmentVariable("AWS_EXECUTION_ENV"));
+    }
+    
+    [Fact]
+    public void Set_Multiple_Execution_Environment()
+    {
+        // Arrange
+        var systemWrapper = new SystemWrapper(new MockEnvironment());
+        
+        // Act
+        systemWrapper.SetExecutionEnvironment(this);
+        systemWrapper.SetExecutionEnvironment(this);
+
+        // Assert
+        Assert.Equal("PTFeature/Fake/1.0.0 PTFeature/Fake/1.0.0", systemWrapper.GetEnvironmentVariable("AWS_EXECUTION_ENV"));
+    }
+    
+    [Fact]
+    public void Set_Execution_Real_Environment()
+    {
+        // Arrange
+        var systemWrapper = new SystemWrapper(new PowertoolsEnvironment());
+        
+        // Act
+        systemWrapper.SetExecutionEnvironment(this);
+
+        // Assert
+        Assert.Equal("PTFeature/Tests/1.0.0", systemWrapper.GetEnvironmentVariable("AWS_EXECUTION_ENV"));
+    }
+    
+    [Fact]
+    public void Set_Execution_Real_Environment_Multiple()
+    {
+        // Arrange
+        var systemWrapper = new SystemWrapper(new PowertoolsEnvironment());
+        
+        // Act
+        systemWrapper.SetExecutionEnvironment(this);
+        systemWrapper.SetExecutionEnvironment(this);
+
+        // Assert
+        Assert.Equal("PTFeature/Tests/1.0.0 PTFeature/Tests/1.0.0", systemWrapper.GetEnvironmentVariable("AWS_EXECUTION_ENV"));
+    }
+
+    public void Dispose()
+    {
+        //Do cleanup actions here
+        
+        Environment.SetEnvironmentVariable("AWS_EXECUTION_ENV", null);
     }
 }
 
@@ -56,7 +103,7 @@ public void SetEnvironmentVariable(string variableName, string value)
 
     public string GetAssemblyName<T>(T type)
     {
-        return "Lambda_Powertools";
+        return "AWS.Lambda.Powertools.Fake";
     }
 
     public string GetAssemblyVersion<T>(T type)

libraries/tests/AWS.Lambda.Powertools.Logging.Tests/PowertoolsLoggerTest.cs

@@ -1226,7 +1226,7 @@ public void Log_Set_Execution_Environment_Context()
         {
             // Arrange
             var loggerName = Guid.NewGuid().ToString();
-            var assemblyName = "LambdaPowertools";
+            var assemblyName = "AWS.Lambda.Powertools.Logger";
             var assemblyVersion = "1.0.0";
 
             var configurations = new Mock<IPowertoolsConfigurations>();
@@ -1248,7 +1248,7 @@ public void Log_Set_Execution_Environment_Context()
             // Assert
             env.Verify(v =>
                 v.SetEnvironmentVariable(
-                    "AWS_EXECUTION_ENV", $"{assemblyName}_{assemblyVersion}"
+                    "AWS_EXECUTION_ENV", $"PTFeature/Logger/{assemblyVersion}"
                 ), Times.Once);
 
             env.Verify(v =>