diff --git a/.github/workflows/aws_integration_test.yml b/.github/workflows/aws_integration_test.yml index c4b375cc..451fddf2 100644 --- a/.github/workflows/aws_integration_test.yml +++ b/.github/workflows/aws_integration_test.yml @@ -28,4 +28,4 @@ jobs: - name: AWS Python integration tests run: | - ./aws/logs_monitoring/tools/integration_tests/integration_tests.sh --python-version=3.12 + ./aws/logs_monitoring/tools/integration_tests/integration_tests.sh --python-version=3.13 diff --git a/.github/workflows/aws_lint.yml b/.github/workflows/aws_lint.yml index f80d9710..b9b5e904 100644 --- a/.github/workflows/aws_lint.yml +++ b/.github/workflows/aws_lint.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v3 with: - python-version: "3.12" + python-version: "3.13" - name: Install pip run: | diff --git a/.github/workflows/aws_unit_test.yml b/.github/workflows/aws_unit_test.yml index ef406d7f..2f9556a7 100644 --- a/.github/workflows/aws_unit_test.yml +++ b/.github/workflows/aws_unit_test.yml @@ -8,10 +8,10 @@ jobs: steps: - name: Checkout source uses: actions/checkout@v3 - - name: Setup Python 3.12 + - name: Setup Python 3.13 uses: actions/setup-python@v3 with: - python-version: 3.12 + python-version: 3.13 - name: AWS Python unit tests env: diff --git a/aws/logs_monitoring/setup.py b/aws/logs_monitoring/setup.py index 2fc4a9a5..b61ec319 100644 --- a/aws/logs_monitoring/setup.py +++ b/aws/logs_monitoring/setup.py @@ -12,10 +12,10 @@ author="Datadog, Inc.", author_email="dev@datadoghq.com", classifiers=[ - "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ], keywords="datadog aws lambda layer", - python_requires=">=3.12, <3.13", + python_requires=">=3.13, <3.14", extras_require={ "dev": ["nose2==0.9.1", "flake8==3.7.9", "requests==2.22.0", "boto3==1.10.33"] }, diff --git a/aws/logs_monitoring/template.yaml b/aws/logs_monitoring/template.yaml index 86b2a6ff..60907cf0 100644 --- a/aws/logs_monitoring/template.yaml +++ b/aws/logs_monitoring/template.yaml @@ -419,7 +419,7 @@ Resources: - {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]} - ZipFile: " " MemorySize: !Ref MemorySize - Runtime: python3.12 + Runtime: python3.13 Architectures: - arm64 Timeout: !Ref Timeout @@ -838,7 +838,7 @@ Resources: Properties: Description: Copies Datadog Forwarder zip to the destination S3 bucket Handler: index.handler - Runtime: python3.12 + Runtime: python3.13 Timeout: 600 Code: ZipFile: | diff --git a/aws/logs_monitoring/tools/build_bundle.sh b/aws/logs_monitoring/tools/build_bundle.sh index b379dbfe..1f0669c4 100755 --- a/aws/logs_monitoring/tools/build_bundle.sh +++ b/aws/logs_monitoring/tools/build_bundle.sh @@ -42,7 +42,7 @@ else VERSION=$1 fi -PYTHON_VERSION="${PYTHON_VERSION:-3.12}" +PYTHON_VERSION="${PYTHON_VERSION:-3.13}" 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 37a90a14..6bcab84f 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.12 + runtime: python3.13 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 fd8db608..70e88421 100755 --- a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh +++ b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh @@ -7,9 +7,9 @@ set -e -PYTHON_VERSION="python3.12" -PYTHON_VERSION_TAG="3.12" -PYTHON_IMAGE="python:3.12" +PYTHON_VERSION="python3.13" +PYTHON_VERSION_TAG="3.13" +PYTHON_IMAGE="python:3.13" SKIP_FORWARDER_BUILD=false UPDATE_SNAPSHOTS=false LOG_LEVEL=info @@ -36,7 +36,7 @@ for arg in "$@"; do SKIP_FORWARDER_BUILD=true shift ;; - + # -u or --update # Update the snapshots to reflect this test run diff --git a/aws/logs_monitoring/tools/publish_layers.sh b/aws/logs_monitoring/tools/publish_layers.sh index 6dd93b59..7be1488a 100755 --- a/aws/logs_monitoring/tools/publish_layers.sh +++ b/aws/logs_monitoring/tools/publish_layers.sh @@ -92,7 +92,7 @@ user_confirm() { # Makes sure any subprocesses will be terminated with this process trap "pkill -P $$; exit 1;" INT -PYTHON_VERSIONS_FOR_AWS_CLI=("python3.12") +PYTHON_VERSIONS_FOR_AWS_CLI=("python3.13") LAYER_PATHS=(".forwarder/aws-dd-forwarder-${FORWARDER_VERSION}-layer.zip") AVAILABLE_LAYERS=("Datadog-Forwarder") AVAILABLE_REGIONS=$(aws ec2 describe-regions | jq -r '.[] | .[] | .RegionName') diff --git a/aws/logs_monitoring/trace_forwarder/scripts/build_linux_go_bin.sh b/aws/logs_monitoring/trace_forwarder/scripts/build_linux_go_bin.sh index 5998bf94..aa15db53 100755 --- a/aws/logs_monitoring/trace_forwarder/scripts/build_linux_go_bin.sh +++ b/aws/logs_monitoring/trace_forwarder/scripts/build_linux_go_bin.sh @@ -17,7 +17,7 @@ rm -rf ./bin # between different python runtimes. if [[ $(docker image ls | grep -c golang) -lt 1 ]]; then - docker buildx build --platform linux/arm64 -t golang . --no-cache --build-arg "runtime=python:3.12" + docker buildx build --platform linux/arm64 -t golang . --no-cache --build-arg "runtime=python:3.13" fi id=$(docker create --platform linux/arm64 golang) diff --git a/aws/logs_monitoring/trace_forwarder/scripts/run_tests.sh b/aws/logs_monitoring/trace_forwarder/scripts/run_tests.sh index 23ec52b2..dabc3cbc 100755 --- a/aws/logs_monitoring/trace_forwarder/scripts/run_tests.sh +++ b/aws/logs_monitoring/trace_forwarder/scripts/run_tests.sh @@ -11,5 +11,5 @@ set -e # Change to the parent of the directory this script is in cd $(dirname "$0")/.. -docker buildx build --platform linux/arm64 -t datadog-go-layer . --build-arg runtime=python:3.12 +docker buildx build --platform linux/arm64 -t datadog-go-layer . --build-arg runtime=python:3.13 docker run --rm datadog-go-layer go test -v ./... diff --git a/aws/rds_enhanced_monitoring/rds-enhanced-sam-template.yaml b/aws/rds_enhanced_monitoring/rds-enhanced-sam-template.yaml index 22443fbe..cc318ea5 100644 --- a/aws/rds_enhanced_monitoring/rds-enhanced-sam-template.yaml +++ b/aws/rds_enhanced_monitoring/rds-enhanced-sam-template.yaml @@ -20,7 +20,7 @@ Resources: KeyId: !Ref KMSKeyId Architectures: - arm64 - Runtime: python3.12 + Runtime: python3.13 Timeout: 10 KmsKeyArn: !Sub diff --git a/aws/vpc_flow_log_monitoring/vpc-flow-log-sam-template.yaml b/aws/vpc_flow_log_monitoring/vpc-flow-log-sam-template.yaml index b084dbaa..023ac684 100644 --- a/aws/vpc_flow_log_monitoring/vpc-flow-log-sam-template.yaml +++ b/aws/vpc_flow_log_monitoring/vpc-flow-log-sam-template.yaml @@ -18,7 +18,7 @@ Resources: Policies: KMSDecryptPolicy: KeyId: !Ref KMSKeyId - Runtime: python3.12 + Runtime: python3.13 Architectures: - arm64 Timeout: 10