Skip to content

Commit 83cc8d8

Browse files
authored
[AWSX] feat(logs forwarder): Support Python3.14 (#1048)
* [AWSX] feat(logs forwarder): Support Python3.14 * update readme | downgrade py version for lint action * ignore cfn-lint E3030 related to py3.14 * upgrade forwarder|layer version
1 parent 9733787 commit 83cc8d8

25 files changed

Lines changed: 48 additions & 44 deletions

.github/workflows/aws_integration_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828

2929
- name: AWS Python integration tests
3030
run: |
31-
./aws/logs_monitoring/tools/integration_tests/integration_tests.sh --python-version=3.13
31+
./aws/logs_monitoring/tools/integration_tests/integration_tests.sh --python-version=3.14

.github/workflows/aws_lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ jobs:
3535
run: |
3636
pip install cfn-lint==1.19.0
3737
cfn-lint --version
38-
cfn-lint -t aws/logs_monitoring/template.yaml
39-
cfn-lint -t aws/rds_enhanced_monitoring/rds-enhanced-sam-template.yaml
40-
cfn-lint -t aws/vpc_flow_log_monitoring/vpc-flow-log-sam-template.yaml
38+
cfn-lint -i E3030 -t aws/logs_monitoring/template.yaml
39+
cfn-lint -i E3030 -t aws/rds_enhanced_monitoring/rds-enhanced-sam-template.yaml
40+
cfn-lint -i E3030 -t aws/vpc_flow_log_monitoring/vpc-flow-log-sam-template.yaml

.github/workflows/aws_unit_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
steps:
99
- name: Checkout source
1010
uses: actions/checkout@v3
11-
- name: Setup Python 3.13
11+
- name: Setup Python 3.14
1212
uses: actions/setup-python@v3
1313
with:
14-
python-version: 3.13
14+
python-version: 3.14
1515

1616
- name: AWS Python unit tests
1717
env:

aws/logs_monitoring/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,10 @@ The <a href="#cloudformation-parameters">environment variables provided on this
178178

179179
If you encounter issues upgrading to the latest version, check the Troubleshooting section.
180180

181+
### Upgrade to 5.2.0+
182+
183+
Starting version 5.2.0+ Lambda function has been updated to require **Python 3.14**. If upgrading an older forwarder installation to 5.2.0+, ensure AWS Lambda function is configured to use Python 3.14
184+
181185
### Upgrade to v5.0.0+
182186

183187
**Version 5.0.0 is a major release with breaking changes.** Before upgrading, review the [CHANGELOG.md][25] for detailed information about breaking changes and migration requirements.

aws/logs_monitoring/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ bytecode
33
cattrs
44
certifi
55
charset-normalizer
6-
datadog-lambda==8.120.0
6+
datadog-lambda==8.121.0
77
datadog==0.52.0
88
ddsketch==3.0.1
9-
ddtrace==3.16.2
9+
ddtrace==3.19.5
1010
deprecated
1111
envier
1212
exceptiongroup

aws/logs_monitoring/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ def get_enrich_cloudwatch_tags():
339339
DD_CUSTOM_TAGS = "ddtags"
340340
DD_SERVICE = "service"
341341
DD_HOST = "host"
342-
DD_FORWARDER_VERSION = "5.1.1"
342+
DD_FORWARDER_VERSION = "5.2.0"
343343

344344
# CONST STRINGS
345345
AWS_STRING = "aws"

aws/logs_monitoring/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
author="Datadog, Inc.",
1313
author_email="dev@datadoghq.com",
1414
classifiers=[
15-
"Programming Language :: Python :: 3.13",
15+
"Programming Language :: Python :: 3.14",
1616
],
1717
keywords="datadog aws lambda layer",
18-
python_requires=">=3.13, <3.14",
18+
python_requires=">=3.14, <3.15",
1919
extras_require={
2020
"dev": ["nose2==0.9.1", "flake8==3.7.9", "requests==2.22.0", "boto3==1.10.33"]
2121
},

aws/logs_monitoring/template.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Description: Pushes logs, metrics and traces from AWS to Datadog.
33
Mappings:
44
Constants:
55
DdForwarder:
6-
Version: 5.1.1
7-
LayerVersion: "93"
6+
Version: 5.2.0
7+
LayerVersion: "94"
88
Parameters:
99
DdApiKey:
1010
Type: String
@@ -457,7 +457,7 @@ Resources:
457457
- {DdForwarderVersion: !FindInMap [Constants, DdForwarder, Version]}
458458
- ZipFile: " "
459459
MemorySize: !Ref MemorySize
460-
Runtime: python3.13
460+
Runtime: python3.14
461461
Architectures:
462462
- arm64
463463
Timeout: !Ref Timeout
@@ -869,7 +869,7 @@ Resources:
869869
Properties:
870870
Description: Copies Datadog Forwarder zip to the destination S3 bucket
871871
Handler: index.handler
872-
Runtime: python3.13
872+
Runtime: python3.14
873873
Timeout: 600
874874
Code:
875875
ZipFile: |

aws/logs_monitoring/tools/build_bundle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ else
4242
VERSION=$1
4343
fi
4444

45-
PYTHON_VERSION="${PYTHON_VERSION:-3.13}"
45+
PYTHON_VERSION="${PYTHON_VERSION:-3.14}"
4646
FORWARDER_PREFIX="aws-dd-forwarder"
4747
FORWARDER_DIR="../.forwarder"
4848

aws/logs_monitoring/tools/integration_tests/cache_test_lambda/serverless.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
service: integration-tests
22
provider:
33
name: aws
4-
runtime: python3.13
4+
runtime: python3.14
55

66
functions:
77
cache_test_lambda:

0 commit comments

Comments
 (0)