Address PR Comments

aws · Sep 18, 2023 · 6712828 · 6712828
1 parent 1a33a05
commit 6712828
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Libraries/src/Amazon.Lambda.RuntimeSupport/Bootstrap/LambdaBootstrap.cs b/Libraries/src/Amazon.Lambda.RuntimeSupport/Bootstrap/LambdaBootstrap.cs
@@ -266,10 +266,10 @@ private void AdjustMemorySettings()
             try
             {
                 int lambdaMemoryInMb;
-                if (!int.TryParse(Environment.GetEnvironmentVariable("AWS_LAMBDA_FUNCTION_MEMORY_SIZE"), out lambdaMemoryInMb))
+                if (!int.TryParse(Environment.GetEnvironmentVariable(LambdaEnvironment.EnvVarFunctionMemorySize), out lambdaMemoryInMb))
                     return;
 
-                ulong memoryInBytes = (ulong)lambdaMemoryInMb * 1048576;
+                ulong memoryInBytes = (ulong)lambdaMemoryInMb * LambdaEnvironment.OneMegabyte;
 
                 // If the user has already configured the hard heap limit to something lower then is available 
                 // then make no adjustments to honor the user's setting.
@@ -278,8 +278,6 @@ private void AdjustMemorySettings()
 
                 AppContext.SetData("GCHeapHardLimit", memoryInBytes);
 
-// The RefreshMemoryLimit API is currently marked as a preview feature. Disable the warning for now but this
-// feature can not be merged till the API is no longer marked as preview.
 #pragma warning disable CA2252
                 GC.RefreshMemoryLimit();
 #pragma warning disable CA2252

diff --git a/Libraries/src/Amazon.Lambda.RuntimeSupport/Context/LambdaEnvironment.cs b/Libraries/src/Amazon.Lambda.RuntimeSupport/Context/LambdaEnvironment.cs
@@ -32,12 +32,15 @@ public class LambdaEnvironment
         internal const string EnvVarLogStreamName = "AWS_LAMBDA_LOG_STREAM_NAME";
         internal const string EnvVarServerHostAndPort = "AWS_LAMBDA_RUNTIME_API";
         internal const string EnvVarTraceId = "_X_AMZN_TRACE_ID";
+        internal const string EnvVarFunctionSize = "AWS_LAMBDA_FUNCTION_MEMORY_SIZE";
 
         internal const string AwsLambdaDotnetCustomRuntime = "AWS_Lambda_dotnet_custom";
         internal const string AmazonLambdaRuntimeSupportMarker = "amazonlambdaruntimesupport";
 
         private IEnvironmentVariables _environmentVariables;
 
+        internal const int OneMegabyte = 1024 * 1024;
+
         public LambdaEnvironment() : this(new SystemEnvironmentVariables()) { }
 
         internal LambdaEnvironment(IEnvironmentVariables environmentVariables)