diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index ea5b93f7..29763320 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -9,7 +9,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.9', '3.10'] + python-version: ['3.10', '3.11'] steps: - name: Checkout source uses: actions/checkout@v3 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 092c7fe2..7610d565 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v3 with: - python-version: '3.10' + python-version: '3.11' - name: Install pip run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f659a9be..8766933e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.9', '3.10'] + python-version: ['3.10', '3.11'] steps: - name: Checkout source uses: actions/checkout@v3 diff --git a/aws/logs_monitoring/README.md b/aws/logs_monitoring/README.md index ee0a841c..e85ed97e 100644 --- a/aws/logs_monitoring/README.md +++ b/aws/logs_monitoring/README.md @@ -138,6 +138,10 @@ If you can't install the Forwarder using the provided CloudFormation template, y If you encounter issues upgrading to the latest version, check the Troubleshooting section. +### Upgrade an older version to +3.99.0 + +Since version 3.99.0 the Lambda function has been updated to require **Python 3.11**. If upgrading an older forwarder installation to +3.99.0 or above, ensure the AWS Lambda function is configured to use Python 3.11 + ### Upgrade an older version to +3.98.0 Since version 3.98.0 the Lambda function has been updated to require **Python 3.10**. If upgrading an older forwarder installation to 3.98.0 or above, ensure the AWS Lambda function is configured to use Python 3.10 diff --git a/aws/logs_monitoring/setup.py b/aws/logs_monitoring/setup.py index b5a23c91..bcee79da 100644 --- a/aws/logs_monitoring/setup.py +++ b/aws/logs_monitoring/setup.py @@ -12,11 +12,11 @@ author="Datadog, Inc.", author_email="dev@datadoghq.com", classifiers=[ - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", ], keywords="datadog aws lambda layer", - python_requires=">=3.9, <3.11", + python_requires=">=3.10, <3.12", install_requires=[ "datadog-lambda==4.77.0", "requests-futures==1.0.0", diff --git a/aws/logs_monitoring/template.yaml b/aws/logs_monitoring/template.yaml index c47d66d2..6d08fd01 100644 --- a/aws/logs_monitoring/template.yaml +++ b/aws/logs_monitoring/template.yaml @@ -478,7 +478,7 @@ Resources: MemorySize: Ref: MemorySize - Runtime: python3.10 + Runtime: python3.11 Timeout: Ref: Timeout Tags: @@ -876,7 +876,7 @@ Resources: Properties: Description: Copies Datadog Forwarder zip to the destination S3 bucket Handler: index.handler - Runtime: python3.10 + Runtime: python3.11 Timeout: 300 Code: ZipFile: | diff --git a/aws/logs_monitoring/tools/build_bundle.sh b/aws/logs_monitoring/tools/build_bundle.sh index 5ab1f395..aff9eb19 100755 --- a/aws/logs_monitoring/tools/build_bundle.sh +++ b/aws/logs_monitoring/tools/build_bundle.sh @@ -22,7 +22,7 @@ else VERSION=$1 fi -PYTHON_VERSION="${PYTHON_VERSION:-3.10}" +PYTHON_VERSION="${PYTHON_VERSION:-3.11}" FORWARDER_PREFIX="aws-dd-forwarder" FORWARDER_DIR="../.forwarder" diff --git a/aws/logs_monitoring/tools/integration_tests/cache_test_lambda/serverless.yml b/aws/logs_monitoring/tools/integration_tests/cache_test_lambda/serverless.yml index 8d9390d4..c065ba37 100644 --- a/aws/logs_monitoring/tools/integration_tests/cache_test_lambda/serverless.yml +++ b/aws/logs_monitoring/tools/integration_tests/cache_test_lambda/serverless.yml @@ -1,7 +1,7 @@ service: integration-tests provider: name: aws - runtime: python3.10 + runtime: python3.11 functions: cache_test_lambda: diff --git a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh index 0c845411..a6ad5e08 100755 --- a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh +++ b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh @@ -7,8 +7,8 @@ set -e -PYTHON_VERSION="python3.10" -PYTHON_IMAGE="python:3.10" +PYTHON_VERSION="python3.11" +PYTHON_IMAGE="python:3.11" SKIP_FORWARDER_BUILD=false UPDATE_SNAPSHOTS=false LOG_LEVEL=info @@ -80,8 +80,8 @@ do esac done -if [ $PYTHON_VERSION != "python3.9" ] && [ $PYTHON_VERSION != "python3.10" ]; then - echo "Must use either Python 3.9 or 3.10" +if [ $PYTHON_VERSION != "python3.10" ] && [ $PYTHON_VERSION != "python3.11" ]; then + echo "Must use either Python 3.10 or 3.11" exit 1 fi diff --git a/aws/logs_monitoring/tools/publish_layers.sh b/aws/logs_monitoring/tools/publish_layers.sh index 79ebf1d0..8e8c68ea 100755 --- a/aws/logs_monitoring/tools/publish_layers.sh +++ b/aws/logs_monitoring/tools/publish_layers.sh @@ -13,7 +13,7 @@ set -e # Makes sure any subprocesses will be terminated with this process trap "pkill -P $$; exit 1;" INT -PYTHON_VERSIONS_FOR_AWS_CLI=("python3.10") +PYTHON_VERSIONS_FOR_AWS_CLI=("python3.11") LAYER_PATHS=(".forwarder/aws-dd-forwarder-${FORWARDER_VERSION}-layer.zip") AVAILABLE_LAYERS=("Datadog-Forwarder") AVAILABLE_REGIONS=$(aws ec2 describe-regions | jq -r '.[] | .[] | .RegionName')