fix(logging trace id): dict or list object issues (#233)

* fix(logging trace id): dict or list object issues

* fix(acceptance): adding tests with logging

Author: enoodle

acceptance/acceptance.py

@@ -59,5 +59,19 @@ def test_labels(self, input):
         body = json.loads(content['body'])
         assert body['input'] == input
 
-
-
+    @pytest.mark.parametrize("input", [
+        '',
+        '{afwe',
+        [],
+        [1, 2, 3],
+        {},
+        {'test': 'test'},
+        {'test': 'test', 'more': [1, 2, '3']},
+    ])
+    def test_logging(self, input):
+        response = invoke('logging', json.dumps(input))
+        assert response['StatusCode'] == 200
+        content = json.loads(response['Payload'].read())
+        assert content['statusCode'] == 200
+        body = json.loads(content['body'])
+        assert body['input'] == input

acceptance/lambda-handlers/handler.py

@@ -3,8 +3,11 @@
 """
 import platform
 import json
+import logging
 import epsagon
 
+logging.getLogger().setLevel(logging.INFO)
+
 
 epsagon.init(
     token='acceptance-test',
@@ -63,3 +66,27 @@ def labels(event, _):
     epsagon.label('12', None)
 
     return response
+
+
+@epsagon.lambda_wrapper
+def logging_test(event, _):
+    """
+    Basic test, using the Epsagon lambda-wrapper
+    :param event: events args
+    :param _: context, unused
+    :return: Success indication
+    """
+    body = {
+        'message': 'Epsagon: General Acceptance Test (py {})'.format(
+            platform.python_version()
+        ),
+        'input': event
+    }
+    logging.info(event)
+
+    response = {
+        'statusCode': 200,
+        'body': json.dumps(body)
+    }
+
+    return response

acceptance/lambda-handlers/serverless.yml

@@ -24,6 +24,8 @@ functions:
     handler: handler.sanity
   labels:
     handler: handler.labels
+  logging:
+    handler: handler.logging_test
 
 plugins:
   - serverless-python-requirements

epsagon/modules/logging.py

@@ -38,6 +38,22 @@ def _wrapper(wrapped, _instance, args, kwargs):
     return wrapped(*args, **kwargs)
 
 
+def _add_log_id(trace_log_id, msg):
+    """
+    adds log id to the msg
+    """
+    try:
+        # Check if message is in json format
+        json_log = json.loads(msg)
+        json_log['epsagon'] = {'trace_id': trace_log_id}
+        return json.dumps(json_log)
+    except Exception:   # pylint: disable=broad-except
+        # message is a regular string, add the ID to the beginning
+        if not isinstance(msg, str):
+            msg = str(msg)
+        return ' '.join([trace_log_id, msg])
+
+
 def _epsagon_trace_id_wrapper(msg_index, wrapped, _instance, args, kwargs):
     """
     Wrapper for logging module.
@@ -56,13 +72,10 @@ def _epsagon_trace_id_wrapper(msg_index, wrapped, _instance, args, kwargs):
             return wrapped(*args, **kwargs)
 
         try:
-            # Check if message is in json format
-            json_log = json.loads(args[msg_index])
-            json_log['epsagon'] = {'trace_id': trace_log_id}
-            message = json.dumps(json_log)
-        except Exception:  # pylint: disable=broad-except
-            # message is a regular string, add the ID to the beginning
-            message = ' '.join([trace_log_id, args[msg_index]])
+            message = _add_log_id(trace_log_id, args[msg_index])
+        except Exception:   # pylint: disable=broad-except
+            # total failure to add log id
+            return wrapped(*args, **kwargs)
         args = (
             args[0:msg_index] +
             (message,) +