Merge branch 'main' into aj/drop37-from-build

Author: astuyve

.github/workflows/build.yml

@@ -41,7 +41,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
 
     steps:
       - name: Checkout
@@ -68,7 +68,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        runtime-param: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        runtime-param: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
       - name: Checkout
         uses: actions/checkout@v3

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 (3.7, 3.8, 3.9, 3.10, and 3.11) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions.
+Datadog Lambda Library for Python (3.7, 3.8, 3.9, 3.10, 3.11, and 3.12) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions.
 
 ## Installation
 

datadog_lambda/tracing.py

@@ -266,6 +266,7 @@ def extract_context_from_sqs_or_sns_event_or_context(event, lambda_context):
                 "Datadog Lambda Python only supports extracting trace"
                 "context from String or Binary SQS/SNS message attributes"
             )
+            return extract_context_from_lambda_context(lambda_context)
         dd_data = json.loads(dd_json_data)
         return propagator.extract(dd_data)
     except Exception as e:
@@ -568,9 +569,8 @@ def inject_correlation_ids():
     # Override the log format of the AWS provided LambdaLoggerHandler
     root_logger = logging.getLogger()
     for handler in root_logger.handlers:
-        if (
-            handler.__class__.__name__ == "LambdaLoggerHandler"
-            and type(handler.formatter) == logging.Formatter
+        if handler.__class__.__name__ == "LambdaLoggerHandler" and isinstance(
+            handler.formatter, logging.Formatter
         ):
             handler.setFormatter(
                 logging.Formatter(
@@ -603,7 +603,7 @@ def set_dd_trace_py_root(trace_context_source, merge_xray_traces):
         )
         if merge_xray_traces:
             xray_context = _get_xray_trace_context()
-            if xray_context.span_id:
+            if xray_context and xray_context.span_id:
                 context.span_id = xray_context.span_id
 
         tracer.context_provider.activate(context)

datadog_lambda/wrapper.py

@@ -281,7 +281,12 @@ def _before(self, event, context):
             # Create a Datadog X-Ray subsegment with the trace context
             if dd_context and trace_context_source == TraceContextSource.EVENT:
                 create_dd_dummy_metadata_subsegment(
-                    dd_context, XraySubsegment.TRACE_KEY
+                    {
+                        "trace-id": str(dd_context.trace_id),
+                        "parent-id": str(dd_context.span_id),
+                        "sampling-priority": str(dd_context.sampling_priority),
+                    },
+                    XraySubsegment.TRACE_KEY,
                 )
 
             if dd_tracing_enabled:

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datadog_lambda"
-version = "4.82.0"
+version = "5.85.0"
 description = "The Datadog AWS Lambda Library"
 authors = ["Datadog, Inc. <dev@datadoghq.com>"]
 license = "Apache-2.0"
@@ -21,13 +21,14 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 
 [tool.poetry.dependencies]
 python = ">=3.7.0,<4"
 datadog = ">=0.41.0,<1.0.0"
 wrapt = "^1.11.2"
-ddtrace = ">=2.3.0"
+ddtrace = ">=2.3.1"
 urllib3 = [
     {version = "<2.0.0", python = "<3.11", optional = true},
     {version = "<2.1.0", python = ">=3.11", optional = true},
@@ -37,8 +38,7 @@ boto3 = { version = "^1.28.0", optional = true }
 typing_extensions = {version = "^4.0", python = "<3.8"}
 requests = { version ="^2.22.0", optional = true }
 nose2 = { version= "^0.9.1", optional = true }
-flake8 = { version = "^3.7.9", optional = true }
-httpretty = {version = "^0.9.7", optional = true }
+flake8 = { version = "^5.0.4", optional = true }
 
 
 [tool.poetry.extras]
@@ -47,7 +47,6 @@ dev = [
     "requests",
     "nose2",
     "flake8",
-    "httpretty",
 ]
 
 [build-system]

pyproject.toml

@@ -12,8 +12,32 @@ set -e
 
 OLD_REGION='us-east-1'
 
-LAYER_NAMES=("Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM" "Datadog-Python310" "Datadog-Python310-ARM" "Datadog-Python311" "Datadog-Python311-ARM")
-PYTHON_VERSIONS_FOR_AWS_CLI=("python3.7" "python3.8" "python3.8" "python3.9" "python3.9" "python3.10" "python3.10" "python3.11" "python3.11")
+LAYER_NAMES=(
+    "Datadog-Python37"
+    "Datadog-Python38"
+    "Datadog-Python38-ARM"
+    "Datadog-Python39"
+    "Datadog-Python39-ARM"
+    "Datadog-Python310"
+    "Datadog-Python310-ARM"
+    "Datadog-Python311"
+    "Datadog-Python311-ARM"
+    "Datadog-Python312"
+    "Datadog-Python312-ARM"
+)
+PYTHON_VERSIONS_FOR_AWS_CLI=(
+    "python3.7"
+    "python3.8"
+    "python3.8"
+    "python3.9"
+    "python3.9"
+    "python3.10"
+    "python3.10"
+    "python3.11"
+    "python3.11"
+    "python3.12"
+    "python3.12"
+)
 NEW_REGION=$1
 
 publish_layer() {

scripts/add_new_region.sh

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

scripts/build_layers.sh

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

scripts/check_layer_size.sh

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

scripts/list_layers.sh

@@ -13,10 +13,45 @@ set -e
 # Makes sure any subprocesses will be terminated with this process
 trap "pkill -P $$; exit 1;" INT
 
-PYTHON_VERSIONS_FOR_AWS_CLI=("python3.7" "python3.8" "python3.8" "python3.9" "python3.9" "python3.10" "python3.10" "python3.11" "python3.11")
-LAYER_PATHS=(".layers/datadog_lambda_py-amd64-3.7.zip" ".layers/datadog_lambda_py-amd64-3.8.zip" ".layers/datadog_lambda_py-arm64-3.8.zip" ".layers/datadog_lambda_py-amd64-3.9.zip" ".layers/datadog_lambda_py-arm64-3.9.zip" ".layers/datadog_lambda_py-amd64-3.10.zip" ".layers/datadog_lambda_py-arm64-3.10.zip" ".layers/datadog_lambda_py-amd64-3.11.zip" ".layers/datadog_lambda_py-arm64-3.11.zip")
-AVAILABLE_LAYERS=("Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM" "Datadog-Python310" "Datadog-Python310-ARM" "Datadog-Python311" "Datadog-Python311-ARM")
-ARCHS=("amd64" "amd64" "amd64""amd64" "amd64" "arm64" "amd64" "arm64" "amd64" "arm64")
+PYTHON_VERSIONS_FOR_AWS_CLI=(
+    "python3.7"
+    "python3.8"
+    "python3.8"
+    "python3.9"
+    "python3.9"
+    "python3.10"
+    "python3.10"
+    "python3.11"
+    "python3.11"
+    "python3.12"
+    "python3.12"
+)
+LAYER_PATHS=(
+    ".layers/datadog_lambda_py-amd64-3.7.zip"
+    ".layers/datadog_lambda_py-amd64-3.8.zip"
+    ".layers/datadog_lambda_py-arm64-3.8.zip"
+    ".layers/datadog_lambda_py-amd64-3.9.zip"
+    ".layers/datadog_lambda_py-arm64-3.9.zip"
+    ".layers/datadog_lambda_py-amd64-3.10.zip"
+    ".layers/datadog_lambda_py-arm64-3.10.zip"
+    ".layers/datadog_lambda_py-amd64-3.11.zip"
+    ".layers/datadog_lambda_py-arm64-3.11.zip"
+    ".layers/datadog_lambda_py-amd64-3.12.zip"
+    ".layers/datadog_lambda_py-arm64-3.12.zip"
+)
+AVAILABLE_LAYERS=(
+    "Datadog-Python37"
+    "Datadog-Python38"
+    "Datadog-Python38-ARM"
+    "Datadog-Python39"
+    "Datadog-Python39-ARM"
+    "Datadog-Python310"
+    "Datadog-Python310-ARM"
+    "Datadog-Python311"
+    "Datadog-Python311-ARM"
+    "Datadog-Python312"
+    "Datadog-Python312-ARM"
+)
 AVAILABLE_REGIONS=$(aws ec2 describe-regions | jq -r '.[] | .[] | .RegionName')
 
 BATCH_SIZE=60

scripts/publish_layers.sh

@@ -11,7 +11,6 @@ set -e
 # These values need to be in sync with serverless.yml, where there needs to be a function
 # defined for every handler_runtime combination
 LAMBDA_HANDLERS=("async-metrics" "sync-metrics")
-RUNTIMES=("python38" "python39" "python310" "python311")
 
 LOGS_WAIT_SECONDS=20
 
@@ -32,8 +31,9 @@ python38=("python3.8" "3.8" $(xxd -l 4 -c 4 -p < /dev/random))
 python39=("python3.9" "3.9" $(xxd -l 4 -c 4 -p < /dev/random))
 python310=("python3.10" "3.10" $(xxd -l 4 -c 4 -p < /dev/random))
 python311=("python3.11" "3.11" $(xxd -l 4 -c 4 -p < /dev/random))
+python312=("python3.12" "3.12" $(xxd -l 4 -c 4 -p < /dev/random))
 
-PARAMETERS_SETS=("python38" "python39" "python310" "python311")
+PARAMETERS_SETS=("python38" "python39" "python310" "python311" "python312")
 
 if [ -z "$RUNTIME_PARAM" ]; then
     echo "Python version not specified, running for all python versions."

scripts/run_integration_tests.sh

@@ -8,7 +8,7 @@
 # Run unit tests in Docker
 set -e
 
-PYTHON_VERSIONS=("3.7" "3.8" "3.9" "3.10" "3.11")
+PYTHON_VERSIONS=("3.7" "3.8" "3.9" "3.10" "3.11" "3.12")
 
 for python_version in "${PYTHON_VERSIONS[@]}"
 do

scripts/run_tests.sh

@@ -17,6 +17,8 @@ LAYER_FILES=(
     "datadog_lambda_py-arm64-3.10.zip"
     "datadog_lambda_py-amd64-3.11.zip"
     "datadog_lambda_py-arm64-3.11.zip"
+    "datadog_lambda_py-amd64-3.12.zip"
+    "datadog_lambda_py-arm64-3.12.zip"
 )
 SIGNING_PROFILE_NAME="DatadogLambdaSigningProfile"