Refactor: Use AppConfig class from the moesifapi-python api (#23)

Refactor: Use AppConfig class from the moesifapi-python api
Refactor: Update moesifpythonrequest version to 0.3.5
Bump version to 1.2.3

Author: keyur9

eventV2.json

@@ -54,8 +54,7 @@
       "requestId": "id",
       "routeKey": "$default",
       "stage": "$default",
-      "time": "12/Mar/2020:19:03:58 +0000",
-      "timeEpoch": 1698901826000
+      "time": "12/Mar/2020:19:03:58 +0000"
     },
     "body": "Hello from Lambda",
     "pathParameters": {

moesif_aws_lambda/global_variable.py

@@ -1,6 +1,6 @@
 """This module is to declare global objects."""
 from datetime import datetime
-from moesifpythonrequest.app_config.app_config import AppConfig
+from moesifapi.app_config.app_config import AppConfig
 from moesifapi.moesif_api_client import *
 import os
 

moesif_aws_lambda/middleware.py

@@ -276,10 +276,10 @@ def before(self, event, context):
                 return event, context
 
             # Request headers
-            req_headers = {}
+            req_headers = event.get('headers', {})
             try:
-                if 'headers' in event:
-                    req_headers = APIHelper.json_deserialize(event['headers'])
+                if isinstance(req_headers, str):
+                    req_headers = APIHelper.json_deserialize(req_headers)
             except Exception as e:
                 if self.DEBUG:
                     print('[moesif] Error while fetching request headers')
@@ -312,7 +312,10 @@ def before(self, event, context):
                                 'trace_id': str(context.aws_request_id),
                                 'function_name': context.function_name,
                                 'request_context': event['requestContext'],
-                                'context': context
+                                # Lambda context object - https://docs.aws.amazon.com/lambda/latest/dg/python-context.html
+                                'context': {
+                                    'aws_request_id': str(getattr(context, 'aws_request_id', ''))
+                                }
                             }
                     except:
                         if self.DEBUG:
@@ -456,7 +459,7 @@ def after(self, retval):
                     random_percentage = random.random() * 100
                     gv.sampling_percentage = gv.app_config.get_sampling_percentage(
                         event_model,
-                        gv.config,
+                        json.loads(gv.config.raw_body),
                         self.user_id,
                         self.company_id,
                     )

requirements.txt

@@ -1,3 +1,3 @@
-moesifapi==1.4.1
-lambda_decorators==0.3.0
-moesifpythonrequest==0.3.2
+moesifapi==1.5.5
+lambda_decorators==0.6.0
+moesifpythonrequest==0.3.5

setup.py

@@ -28,7 +28,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.2.2',
+    version='1.2.3',
 
     description='Moesif Middleware to automatically log API calls from AWS Lambda functions',
     long_description=long_description,
@@ -84,7 +84,7 @@
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['moesifapi>=1.4.0', 'lambda_decorators', 'moesifpythonrequest>=0.3.0'],
+    install_requires=['moesifapi>=1.5.5', 'lambda_decorators', 'moesifpythonrequest>=0.3.5'],
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,