Merge branch 'master' into darcy.rayner/dd-trace-support

DarcyRaynerDD · DarcyRaynerDD · commit 76c36321d443 · 2020-03-24T16:27:03.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -32,6 +32,11 @@ jobs:
           command: |
             source venv/bin/activate
             flake8 datadog_lambda/
+      - run:
+          name: Check Formatting
+          command: |
+            source venv/bin/activate
+            ./scripts/check_format.sh
 
       - save_cache:
           paths:
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Datadog Lambda Layer for Python (2.7, 3.6, 3.7 and 3.8) enables custom metric su
 
 ## IMPORTANT NOTE
 
-AWS Lambda is expected to recieve a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **March 30th, 2020**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to version 11. 
+AWS Lambda is expected to recieve a [breaking change](https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/) on **January 30, 2021**. If you are using Datadog Python Lambda layer version 7 or below, please upgrade to version 11. 
 
 ## Installation
 
diff --git a/scripts/check_format.sh b/scripts/check_format.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+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==19.10b0
+
+python -m black --check datadog_lambda/
+python -m black --check tests
+
+
+
diff --git a/tests/test_patch.py b/tests/test_patch.py
@@ -1,19 +1,16 @@
 import sys
 import unittest
+
 try:
     from unittest.mock import patch
 except ImportError:
     from mock import patch
 
-from datadog_lambda.patch import (
-    _patch_httplib,
-    _ensure_patch_requests,
-)
+from datadog_lambda.patch import _patch_httplib, _ensure_patch_requests
 from datadog_lambda.constants import TraceHeader
 
 
 class TestPatchHTTPClients(unittest.TestCase):
-
     def setUp(self):
         patcher = patch("datadog_lambda.patch.get_dd_trace_context")
         self.mock_get_dd_trace_context = patcher.start()
@@ -36,6 +33,7 @@ def test_patch_httplib(self):
     def test_patch_requests(self):
         _ensure_patch_requests()
         import requests
+
         r = requests.get("https://www.datadoghq.com/")
         self.mock_get_dd_trace_context.assert_called()
         self.assertEqual(r.request.headers[TraceHeader.TRACE_ID], "123")
@@ -45,6 +43,7 @@ def test_patch_requests(self):
     def test_patch_requests_with_headers(self):
         _ensure_patch_requests()
         import requests
+
         r = requests.get("https://www.datadoghq.com/", headers={"key": "value"})
         self.mock_get_dd_trace_context.assert_called()
         self.assertEqual(r.request.headers["key"], "value")
@@ -55,6 +54,7 @@ def test_patch_requests_with_headers(self):
     def test_patch_requests_with_headers_none(self):
         _ensure_patch_requests()
         import requests
+
         r = requests.get("https://www.datadoghq.com/", headers=None)
         self.mock_get_dd_trace_context.assert_called()
         self.assertEqual(r.request.headers[TraceHeader.TRACE_ID], "123")
diff --git a/tests/test_tracing.py b/tests/test_tracing.py
@@ -179,7 +179,6 @@ def test_convert_xray_sampling(self):
 
 class TestLogsInjection(unittest.TestCase):
     def setUp(self):
-
         patcher = patch("datadog_lambda.tracing.get_dd_trace_context")
         self.mock_get_dd_trace_context = patcher.start()
         self.mock_get_dd_trace_context.return_value = {
@@ -198,4 +197,3 @@ def test_set_correlation_ids(self):
         trace_id, span_id = get_correlation_ids()
         self.assertEqual(trace_id, "123")
         self.assertEqual(span_id, "456")
-
