Drop support for python 2.7 (#181)

* remove support in tests, files, and documentation

* remove conditional imports

* remove trailing spaces

* remove try/catch for imports

* try to fix lint

* add a single empty line

* make local a variable and remove docstrings for python2

* fix unit tests

Author: duncanista

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
       - name: Checkout
@@ -64,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        runtime-param: [2.7, 3.6, 3.7, 3.8, 3.9]
+        runtime-param: [3.6, 3.7, 3.8, 3.9]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

CONTRIBUTING.md

@@ -3,11 +3,11 @@
 We love pull requests. For new features, consider opening an issue to discuss the idea first. When you're ready to open a pull request, here's a quick guide.
 
 1. Fork, clone and branch off `main`:
-   ```bash
-   git clone git@github.com:<your-username>/datadog-lambda-python.git
-   git checkout -b <my-branch>
-   ```
-1. Make your changes. Ensure your code is compatible with both Python 2.7 and 3.X.
+    ```bash
+    git clone git@github.com:<your-username>/datadog-lambda-python.git
+    git checkout -b <my-branch>
+    ```
+1. Make your changes. Ensure your code is compatible with Python 3.X. 
 1. Test your Lambda function against the locally modified version of Datadog Lambda library.
 
    - The easiest approach is to create a soft link of the `datadog_lambda` folder in your project's root. Note, this only overrides the `datadog_lambda` module, and you still need to install the `datadog_lambda` package or the Lambda layer to have the required dependencies.

README.md

@@ -6,7 +6,7 @@
 [![Slack](https://chat.datadoghq.com/badge.svg?bg=632CA6)](https://chat.datadoghq.com/)
 [![License](https://img.shields.io/badge/license-Apache--2.0-blue)](https://github.com/DataDog/datadog-lambda-python/blob/main/LICENSE)
 
-Datadog Lambda Library for Python (2.7, 3.6, 3.7, 3.8, and 3.9) enables enhanced Lambda metrics, distributed tracing, and custom metric submission from AWS Lambda functions.
+Datadog Lambda Library for Python (3.6, 3.7, 3.8, and 3.9) enables enhanced Lambda metrics, distributed tracing, and custom metric submission from AWS Lambda functions.  
 
 **IMPORTANT NOTE:** AWS Lambda is expected to receive a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **March 31, 2021**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to the latest.
 

datadog_lambda/patch.py

@@ -17,17 +17,11 @@
     get_dd_trace_context,
     dd_tracing_enabled,
 )
+from collections.abc import MutableMapping
 
 logger = logging.getLogger(__name__)
 
-if sys.version_info >= (3, 0, 0):
-    httplib_module = "http.client"
-    from collections.abc import MutableMapping
-else:
-    httplib_module = "httplib"
-    from collections import MutableMapping
-
-_httplib_patched = False
+_http_patched = False
 _requests_patched = False
 _integration_tests_patched = False
 
@@ -41,7 +35,7 @@ def patch_all():
     if dd_tracing_enabled:
         patch_all_dd()
     else:
-        _patch_httplib()
+        _patch_http()
         _ensure_patch_requests()
 
 
@@ -56,17 +50,17 @@ def _patch_for_integration_tests():
         _integration_tests_patched = True
 
 
-def _patch_httplib():
+def _patch_http():
     """
-    Patch the Python built-in `httplib` (Python 2) or
-    `http.client` (Python 3) module.
+    Patch `http.client` (Python 3) module.
     """
-    global _httplib_patched
-    if not _httplib_patched:
-        _httplib_patched = True
-        wrap(httplib_module, "HTTPConnection.request", _wrap_httplib_request)
+    global _http_patched
+    http_module = "http.client"
+    if not _http_patched:
+        _http_patched = True
+        wrap(http_module, "HTTPConnection.request", _wrap_http_request)
 
-    logger.debug("Patched %s", httplib_module)
+    logger.debug("Patched %s", http_module)
 
 
 def _ensure_patch_requests():
@@ -113,9 +107,9 @@ def _wrap_requests_request(func, instance, args, kwargs):
     return func(*args, **kwargs)
 
 
-def _wrap_httplib_request(func, instance, args, kwargs):
+def _wrap_http_request(func, instance, args, kwargs):
     """
-    Wrap `httplib` (python2) or `http.client` (python3) to inject
+    Wrap `http.client` (python3) to inject
     the Datadog trace headers into the outgoing requests.
     """
     context = get_dd_trace_context()

datadog_lambda/tags.py

@@ -8,7 +8,7 @@
 
 def _format_dd_lambda_layer_tag():
     """
-    Formats the dd_lambda_layer tag, e.g., 'dd_lambda_layer:datadog-python27_1'
+    Formats the dd_lambda_layer tag, e.g., 'dd_lambda_layer:datadog-python39_1'
     """
     runtime = "python{}{}".format(sys.version_info[0], sys.version_info[1])
     return "dd_lambda_layer:datadog-{}_{}".format(runtime, __version__)

scripts/add_new_region.sh

@@ -12,8 +12,8 @@ set -e
 
 OLD_REGION='us-east-1'
 
-PYTHON_VERSIONS_FOR_AWS_CLI=("python2.7" "python3.6" "python3.7" "python3.8" "python3.9")
-LAYER_NAMES=("Datadog-Python27" "Datadog-Python36" "Datadog-Python37" "Datadog-Python38" "Datadog-Python39")
+PYTHON_VERSIONS_FOR_AWS_CLI=("python3.6" "python3.7" "python3.8" "python3.9")
+LAYER_NAMES=("Datadog-Python36" "Datadog-Python37" "Datadog-Python38" "Datadog-Python39")
 NEW_REGION=$1
 
 publish_layer() {

scripts/build_layers.sh

@@ -14,7 +14,7 @@ set -e
 
 LAYER_DIR=".layers"
 LAYER_FILES_PREFIX="datadog_lambda_py"
-AVAILABLE_PYTHON_VERSIONS=("2.7" "3.6" "3.7" "3.8" "3.9")
+AVAILABLE_PYTHON_VERSIONS=("3.6" "3.7" "3.8" "3.9")
 
 # Determine which Python versions to build layers for
 if [ -z "$PYTHON_VERSION" ]; then

scripts/check_format.sh

@@ -2,10 +2,6 @@
 set -e
 
 PYTHON_VERSION=$(python -c 'import sys; print(sys.version_info.major)')
-if [ "$PYTHON_VERSION" = "2" ]; then
-    echo "Skipping formatting, black not compatible with python 2"
-    exit 0
-fi
 pip install -Iv black==21.5b2
 
 python -m black --check datadog_lambda/ --diff

scripts/check_layer_size.sh

@@ -14,7 +14,7 @@ MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 16 \* 1024)
 
 LAYER_FILES_PREFIX="datadog_lambda_py"
 LAYER_DIR=".layers"
-VERSIONS=("2.7" "3.6" "3.7" "3.8" "3.9")
+VERSIONS=("3.6" "3.7" "3.8" "3.9")
 
 for version in "${VERSIONS[@]}"
 do

scripts/list_layers.sh

@@ -10,7 +10,7 @@
 
 set -e
 
-LAYER_NAMES=("Datadog-Python27" "Datadog-Python36" "Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM")
+LAYER_NAMES=("Datadog-Python36" "Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM")
 AVAILABLE_REGIONS=$(aws ec2 describe-regions | jq -r '.[] | .[] | .RegionName')
 LAYERS_MISSING_REGIONS=()