#188129245 Add: Support for logging body in aws lambda (#90)

* Add: Support for aws lambda

Add: Support for aws lambda
Bump version to 1.4.9

* Refactor: Update README.md

Refactor: Update README.md

* Refactor: Call next middleware only once

Refactor: Call next middleware only once

Author: keyur9

Moesif.Middleware/Moesif.Middleware.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Moesif.Middleware</id>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <title>MoesifMiddleware</title>
     <authors>Moesif</authors>
 	  <owners>Moesif</owners>

Moesif.Middleware/NetCore/MoesifMiddlewareNetCore.cs

@@ -66,6 +66,8 @@ public class MoesifMiddlewareNetCore
 
         public bool logBody;
 
+        public bool isLambda;
+
         private AutoResetEvent configEvent ;
 
         private AutoResetEvent governanceEvent;
@@ -83,7 +85,7 @@ public MoesifMiddlewareNetCore(Dictionary<string, object> _middleware)
             try
             {
                 // Initialize client
-                client = new MoesifApiClient(moesifOptions["ApplicationId"].ToString(), "moesif-netcore/1.4.8", debug);
+                client = new MoesifApiClient(moesifOptions["ApplicationId"].ToString(), "moesif-netcore/1.4.9", debug);
                 debug = loggerHelper.GetConfigBoolValues(moesifOptions, "LocalDebug", false);
                 companyHelper = new CompanyHelper();
                 userHelper = new UserHelper();
@@ -104,8 +106,9 @@ public MoesifMiddlewareNetCore(RequestDelegate next, Dictionary<string, object>
             {
                 // Initialize client
                 debug = loggerHelper.GetConfigBoolValues(moesifOptions, "LocalDebug", false);
-                client = new MoesifApiClient(moesifOptions["ApplicationId"].ToString(), "moesif-netcore/1.4.8", debug);
+                client = new MoesifApiClient(moesifOptions["ApplicationId"].ToString(), "moesif-netcore/1.4.9", debug);
                 logBody = loggerHelper.GetConfigBoolValues(moesifOptions, "LogBody", true);
+                isLambda = loggerHelper.GetConfigBoolValues(moesifOptions, "IsLambda", false);
                 _next = next;
                 config = AppConfig.getDefaultAppConfig();
                 userHelper = new UserHelper(); // Create a new instance of userHelper
@@ -324,9 +327,16 @@ public async Task Invoke(HttpContext httpContext)
                 }
                 else
                 {
+                    if (isLambda)
+                    {
+                        eventModel.Response = await FormatLambdaResponse(httpContext, transactionId);
+
+                    } else
+                    {
+                        eventModel.Response = FormatResponse(httpContext.Response, outputCaptureOwin, transactionId);
+                    }
 
-                    eventModel.Response = FormatResponse(httpContext.Response, outputCaptureOwin, transactionId);
-                    if(eventModel.CompanyId == null)
+                    if (eventModel.CompanyId == null)
                     {
 
                         eventModel.CompanyId = loggerHelper.GetConfigValues("IdentifyCompany", moesifOptions, httpContext.Request, httpContext.Response, debug);
@@ -425,6 +435,50 @@ private EventResponseModel FormatResponse(HttpResponse response, StreamHelper st
             return eventRsp;
         }
 
+        private async Task<EventResponseModel> FormatLambdaResponse(HttpContext httpContext, string transactionId)
+        {
+            // Response headers
+            var rspHeaders = loggerHelper.ToHeaders(httpContext.Response.Headers, debug);
+
+            // Add Transaction Id to Response Header
+            rspHeaders = loggerHelper.AddTransactionId("X-Moesif-Transaction-Id", transactionId, rspHeaders);
+
+            var responseWrapper = new Tuple<object, string>(null, null);
+            if (logBody)
+            {
+                // ResponseBody
+                string contentEncoding = "";
+                rspHeaders.TryGetValue("Content-Encoding", out contentEncoding);
+
+                var originalResponseBodyStream = httpContext.Response.Body;
+                string responseBody = string.Empty;
+                using (var responseBodyStream = new MemoryStream())
+                {
+                    httpContext.Response.Body = responseBodyStream; // Use the memory stream for the response
+
+                    // Capture the response
+                    httpContext.Response.Body.Seek(0, SeekOrigin.Begin);
+                    responseBody = await new StreamReader(httpContext.Response.Body).ReadToEndAsync();
+                    httpContext.Response.Body.Seek(0, SeekOrigin.Begin); // Reset the position for the response to be sent
+
+                    // Copy the response body back to the original stream
+                    await responseBodyStream.CopyToAsync(originalResponseBodyStream);
+                }
+
+                // Serialize Response body
+                responseWrapper = loggerHelper.Serialize(responseBody, httpContext.Response.ContentType, logBody, debug);
+            }
+            var eventRsp = new EventResponseModel()
+            {
+                Time = DateTime.UtcNow,
+                Status = httpContext.Response.StatusCode,
+                Headers = rspHeaders,
+                Body = responseWrapper.Item1,
+                TransferEncoding = responseWrapper.Item2
+            };
+            return eventRsp;
+        }
+
         private String getUserId(HttpContext httpContext, EventRequestModel request)
         {
             Object iu;

Moesif.Middleware/NetFramework/MoesifMiddlewareNetFramework.cs

@@ -82,7 +82,7 @@ public MoesifMiddlewareNetFramework(Dictionary<String,object> options) : base(nu
             _logger = null;
             loggerHelper = new LoggerHelper(_logger);
             debug = loggerHelper.GetConfigBoolValues(moesifOptions, "LocalDebug", false);
-            client = new MoesifApiClient(moesifOptions["ApplicationId"].ToString(), "moesif-netframework/1.4.8", debug);
+            client = new MoesifApiClient(moesifOptions["ApplicationId"].ToString(), "moesif-netframework/1.4.9", debug);
             userHelper = new UserHelper(); // Create a new instance of userHelper
             companyHelper = new CompanyHelper(); // Create a new instane of companyHelper
             clientIpHelper = new ClientIp(); // Create a new instance of client Ip
@@ -98,7 +98,7 @@ public MoesifMiddlewareNetFramework(OwinMiddleware next, Dictionary<string, obje
             {
                 // Initialize client
                 debug = loggerHelper.GetConfigBoolValues(moesifOptions, "LocalDebug", false);
-                client = new MoesifApiClient(moesifOptions["ApplicationId"].ToString(), "moesif-netframework/1.4.8", debug);
+                client = new MoesifApiClient(moesifOptions["ApplicationId"].ToString(), "moesif-netframework/1.4.9", debug);
                 logBody = loggerHelper.GetConfigBoolValues(moesifOptions, "LogBody", true);
                 isBatchingEnabled = loggerHelper.GetConfigBoolValues(moesifOptions, "EnableBatching", true); // Enable batching
                 disableStreamOverride = loggerHelper.GetConfigBoolValues(moesifOptions, "DisableStreamOverride", false); // Reset Request Body position

Moesif.Middleware/Properties/AssemblyInfo.cs

@@ -23,5 +23,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.8")]
-[assembly: AssemblyFileVersion("1.4.8")]
+[assembly: AssemblyVersion("1.4.9")]
+[assembly: AssemblyFileVersion("1.4.9")]

README.md

@@ -126,6 +126,9 @@ _boolean_, default true. Set to false to not log the request and response body t
 #### __`AuthorizationUserIdField`__
 (optional), _string_, Field name in JWT/OpenId token's payload for identifying users. Only applicable if authorization_header_name is set and is a Bearer token.
 
+#### __`IsLambda`__
+_boolean_, default false. Set to true if integrating with AWS Lambda functions. 
+
 #### __`Capture_Outgoing_Requests`__
 (optional), Set to capture all outgoing API calls from your app to third parties like Stripe or to your own dependencies while using [System.Net.Http](https://docs.microsoft.com/en-us/dotnet/api/system.net.http?view=netframework-4.8) package. The options below is applied to outgoing API calls. When the request is outgoing, for options functions that take request and response as input arguments, the request and response objects passed in are [HttpRequestMessage](https://docs.microsoft.com/en-us/uwp/api/windows.web.http.httprequestmessage) request and [HttpResponseMessage](https://docs.microsoft.com/en-us/uwp/api/windows.web.http.httpresponsemessage) response objects.