feat(lambda): add support for python 3.10 (#403)

* [CS-190]: Add Support for Python 3.10

* fix(lint): handle exception type specified

* fix(requirements): wrapt version

* fix(travis): pip version

* fix(travis): revert pip version

* fix(requirements): autowrapt no specific version

* fix(requirements): place autowrapt as first

* fix(travis): specific pip version

* fix(travis): specific pip version

* fix(requirements): pytest version for python 3_7

* fix(requirements): pytest version for python 3_7

* fix(requirements): pytest version for python 3_7

* fix(travis): remove install pip specific version

* fix(travis): add install pip specific version

* Revert fix attempts

* Revert fix attempts

* Fix call to self test flask

Co-authored-by: maorlx <maorlevi@cisco.com>

Author: sagivr2020

.travis.yml

@@ -11,6 +11,8 @@ before_install:
   - nvm use 12
 
 install:
+  - pip install -U importlib-metadata
+  - pip install -U pluggy
   - pip install -r requirements-dev.txt
 
 script:

epsagon/utils.py

@@ -4,7 +4,10 @@
 
 from __future__ import absolute_import, print_function
 import os
-import collections
+try:
+    from collections import Mapping, Iterable
+except: # pylint: disable=W0702
+    from collections.abc import Mapping, Iterable
 import uuid
 import socket
 import sys
@@ -333,13 +336,13 @@ def find_in_object(obj, key, path=None):
     if not path:
         path = []
 
-    if isinstance(obj, collections.Mapping):
+    if isinstance(obj, Mapping):
         # search key in obj
         if key in obj:
             return obj[key], path
 
     if (
-        isinstance(obj, collections.Iterable)
+        isinstance(obj, Iterable)
         and not isinstance(obj, six.string_types)
     ):
         for k in obj:

epsagon/wrappers/aws_lambda.py

@@ -11,7 +11,10 @@
 import copy
 import functools
 import warnings
-import collections
+try:
+    from collections import Mapping
+except: # pylint: disable=W0702
+    from collections.abc import Mapping
 from uuid import uuid4
 
 import epsagon.trace
@@ -32,7 +35,7 @@ def _add_status_code(runner, return_value):
     :param runner: Runner event to update
     :param return_value: The return value to extract from
     """
-    if isinstance(return_value, collections.Mapping):
+    if isinstance(return_value, Mapping):
         status_code = return_value.get('statusCode')
         if status_code:
             runner.resource['metadata']['status_code'] = status_code

epsagon/wrappers/tencent_function.py

@@ -7,7 +7,10 @@
 import time
 import functools
 import warnings
-import collections
+try:
+    from collections import Mapping
+except: # pylint: disable=W0702
+    from collections.abc import Mapping
 
 import epsagon.trace
 import epsagon.runners.tencent_function
@@ -26,7 +29,7 @@ def _add_status_code(runner, return_value):
     :param runner: Runner event to update
     :param return_value: The return value to extract from
     """
-    if isinstance(return_value, collections.Mapping):
+    if isinstance(return_value, Mapping):
         status_code = return_value.get('statusCode')
         if status_code:
             runner.resource['metadata']['status_code'] = status_code

tests/wrappers/test_flask_wrapper.py

@@ -65,7 +65,7 @@ def self_call():
 
     if not inner_call:
         return CLIENT.post('/self_call', json={
-            'inner_call': 'True'
+            'inner_call': True
         })
 
     return RETURN_VALUE
@@ -179,7 +179,7 @@ def test_call_to_self(trace_transport, client):
     And API that calls itself. Make sure instrumentation doesn't throw
     and exception that gets to the user.
     """
-    result = CLIENT.post('/self_call')
+    result = CLIENT.post('/self_call', json={})
     assert result.data.decode('ascii') == RETURN_VALUE