Skip to content

Support Python 3.12 #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 11, 2023
Merged

Support Python 3.12 #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ee24de
Update tooling and documentation to include Python3.12.
purple4reina Nov 16, 2023
526e721
Replace deprecated assertEquals in tests.
purple4reina Nov 16, 2023
08bf514
Remove httpretty which does not support Python3.12.
purple4reina Nov 16, 2023
8ae6bc4
Fix new flake8 errors.
purple4reina Nov 16, 2023
c1ac9b3
Add snapshots for python3.12.
purple4reina Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions datadog_lambda/tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,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(
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]

[tool.poetry.dependencies]
Expand All @@ -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]
Expand All @@ -47,7 +47,6 @@ dev = [
"requests",
"nose2",
"flake8",
"httpretty",
]

[build-system]
Expand Down
28 changes: 26 additions & 2 deletions scripts/add_new_region.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_layers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set -e

LAYER_DIR=".layers"
LAYER_FILES_PREFIX="datadog_lambda_py"
AVAILABLE_PYTHON_VERSIONS=("3.7" "3.8" "3.9" "3.10" "3.11")
AVAILABLE_PYTHON_VERSIONS=("3.7" "3.8" "3.9" "3.10" "3.11" "3.12")

# Determine which Python versions to build layers for
if [ -z "$PYTHON_VERSION" ]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/check_layer_size.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 13 additions & 1 deletion scripts/list_layers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=()

Expand Down
43 changes: 39 additions & 4 deletions scripts/publish_layers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/run_integration_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=("python37" "python38" "python39" "python310" "python311")

LOGS_WAIT_SECONDS=20

Expand All @@ -33,8 +32,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=("python37" "python38" "python39" "python310" "python311")
PARAMETERS_SETS=("python37" "python38" "python39" "python310" "python311" "python312")

if [ -z "$RUNTIME_PARAM" ]; then
echo "Python version not specified, running for all python versions."
Expand Down
2 changes: 1 addition & 1 deletion scripts/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions scripts/sign_layers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,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"

Expand Down
Loading