From 0730bdddb0f7378eb14740953b580d305570e50b Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Thu, 9 Apr 2026 13:40:48 -0400 Subject: [PATCH 1/6] Update docker images to use Ubuntu 24.04 --- ci/input_files/build.yaml.tpl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl index 420eea64..a985be32 100644 --- a/ci/input_files/build.yaml.tpl +++ b/ci/input_files/build.yaml.tpl @@ -45,7 +45,7 @@ default: build-layer ({{ $runtime.name }}-{{ $runtime.arch }}): stage: build tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10 + image: registry.ddbuild.io/images/docker:24.0.4 artifacts: expire_in: 1 hr # Unsigned zips expire in 1 hour paths: @@ -60,7 +60,7 @@ build-layer ({{ $runtime.name }}-{{ $runtime.arch }}): check-layer-size ({{ $runtime.name }}-{{ $runtime.arch }}): stage: test tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10 + image: registry.ddbuild.io/images/docker:24.0.4 needs: - build-layer ({{ $runtime.name }}-{{ $runtime.arch }}) dependencies: @@ -92,7 +92,7 @@ unit-test ({{ $runtime.name }}-{{ $runtime.arch }}): integration-test ({{ $runtime.name }}-{{ $runtime.arch }}): stage: test tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10-py3 + image: registry.ddbuild.io/images/docker:24.0.4-py3 rules: - if: '$SKIP_E2E_TESTS == "true"' when: never @@ -117,7 +117,7 @@ integration-test ({{ $runtime.name }}-{{ $runtime.arch }}): sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}): stage: sign tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10-py3 + image: registry.ddbuild.io/images/docker:24.0.4-py3 rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' when: manual @@ -148,7 +148,7 @@ sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}): publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}): stage: publish tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10-py3 + image: registry.ddbuild.io/images/docker:24.0.4-py3 rules: - if: '$SKIP_E2E_TESTS == "true"' when: never @@ -194,7 +194,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}): publish-pypi-package: stage: publish tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10-py3 + image: registry.ddbuild.io/images/docker:24.0.4-py3 before_script: *python-before-script cache: [] rules: @@ -209,7 +209,7 @@ publish-pypi-package: layer bundle: stage: build tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10 + image: registry.ddbuild.io/images/docker:24.0.4 needs: {{ range (ds "runtimes").runtimes }} - build-layer ({{ .name }}-{{ .arch }}) @@ -230,7 +230,7 @@ layer bundle: signed layer bundle: stage: sign - image: registry.ddbuild.io/images/docker:20.10-py3 + image: registry.ddbuild.io/images/docker:24.0.4-py3 tags: ["arch:amd64"] rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' @@ -278,7 +278,7 @@ e2e-test: e2e-test-status: stage: e2e - image: registry.ddbuild.io/images/docker:20.10-py3 + image: registry.ddbuild.io/images/docker:24.0.4-py3 tags: ["arch:amd64"] timeout: 3h rules: From f53560e0fac19e90871232c2d84e3def47a082f9 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Thu, 9 Apr 2026 13:55:17 -0400 Subject: [PATCH 2/6] attempt 2 --- ci/input_files/build.yaml.tpl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl index a985be32..24df4c0d 100644 --- a/ci/input_files/build.yaml.tpl +++ b/ci/input_files/build.yaml.tpl @@ -45,7 +45,7 @@ default: build-layer ({{ $runtime.name }}-{{ $runtime.arch }}): stage: build tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:24.0.4 + image: registry.ddbuild.io/images/mirror/ubuntu:24.04 artifacts: expire_in: 1 hr # Unsigned zips expire in 1 hour paths: @@ -60,7 +60,7 @@ build-layer ({{ $runtime.name }}-{{ $runtime.arch }}): check-layer-size ({{ $runtime.name }}-{{ $runtime.arch }}): stage: test tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:24.0.4 + image: registry.ddbuild.io/images/mirror/ubuntu:24.04 needs: - build-layer ({{ $runtime.name }}-{{ $runtime.arch }}) dependencies: @@ -92,7 +92,7 @@ unit-test ({{ $runtime.name }}-{{ $runtime.arch }}): integration-test ({{ $runtime.name }}-{{ $runtime.arch }}): stage: test tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:24.0.4-py3 + image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 rules: - if: '$SKIP_E2E_TESTS == "true"' when: never @@ -117,7 +117,7 @@ integration-test ({{ $runtime.name }}-{{ $runtime.arch }}): sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}): stage: sign tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:24.0.4-py3 + image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' when: manual @@ -148,7 +148,7 @@ sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}): publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}): stage: publish tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:24.0.4-py3 + image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 rules: - if: '$SKIP_E2E_TESTS == "true"' when: never @@ -194,7 +194,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}): publish-pypi-package: stage: publish tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:24.0.4-py3 + image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 before_script: *python-before-script cache: [] rules: @@ -209,7 +209,7 @@ publish-pypi-package: layer bundle: stage: build tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:24.0.4 + image: registry.ddbuild.io/images/mirror/ubuntu:24.04 needs: {{ range (ds "runtimes").runtimes }} - build-layer ({{ .name }}-{{ .arch }}) @@ -230,7 +230,7 @@ layer bundle: signed layer bundle: stage: sign - image: registry.ddbuild.io/images/docker:24.0.4-py3 + image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 tags: ["arch:amd64"] rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' @@ -278,7 +278,7 @@ e2e-test: e2e-test-status: stage: e2e - image: registry.ddbuild.io/images/docker:24.0.4-py3 + image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 tags: ["arch:amd64"] timeout: 3h rules: From fe871879148fc6519d5351d065131e2dad0d47a1 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Mon, 13 Apr 2026 14:08:25 -0400 Subject: [PATCH 3/6] jammy? --- ci/input_files/build.yaml.tpl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl index 24df4c0d..2ffb18e7 100644 --- a/ci/input_files/build.yaml.tpl +++ b/ci/input_files/build.yaml.tpl @@ -45,7 +45,7 @@ default: build-layer ({{ $runtime.name }}-{{ $runtime.arch }}): stage: build tags: ["arch:amd64"] - image: registry.ddbuild.io/images/mirror/ubuntu:24.04 + image: registry.ddbuild.io/images/docker:20.10.13-jammy artifacts: expire_in: 1 hr # Unsigned zips expire in 1 hour paths: @@ -60,7 +60,7 @@ build-layer ({{ $runtime.name }}-{{ $runtime.arch }}): check-layer-size ({{ $runtime.name }}-{{ $runtime.arch }}): stage: test tags: ["arch:amd64"] - image: registry.ddbuild.io/images/mirror/ubuntu:24.04 + image: registry.ddbuild.io/images/docker:20.10.13-jammy needs: - build-layer ({{ $runtime.name }}-{{ $runtime.arch }}) dependencies: @@ -92,7 +92,7 @@ unit-test ({{ $runtime.name }}-{{ $runtime.arch }}): integration-test ({{ $runtime.name }}-{{ $runtime.arch }}): stage: test tags: ["arch:amd64"] - image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 rules: - if: '$SKIP_E2E_TESTS == "true"' when: never @@ -117,7 +117,7 @@ integration-test ({{ $runtime.name }}-{{ $runtime.arch }}): sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}): stage: sign tags: ["arch:amd64"] - image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' when: manual @@ -148,7 +148,7 @@ sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}): publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}): stage: publish tags: ["arch:amd64"] - image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 rules: - if: '$SKIP_E2E_TESTS == "true"' when: never @@ -194,7 +194,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}): publish-pypi-package: stage: publish tags: ["arch:amd64"] - image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 before_script: *python-before-script cache: [] rules: @@ -209,7 +209,7 @@ publish-pypi-package: layer bundle: stage: build tags: ["arch:amd64"] - image: registry.ddbuild.io/images/mirror/ubuntu:24.04 + image: registry.ddbuild.io/images/docker:20.10.13-jammy needs: {{ range (ds "runtimes").runtimes }} - build-layer ({{ .name }}-{{ .arch }}) @@ -230,7 +230,7 @@ layer bundle: signed layer bundle: stage: sign - image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 tags: ["arch:amd64"] rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' @@ -278,7 +278,7 @@ e2e-test: e2e-test-status: stage: e2e - image: registry.ddbuild.io/images/mirror/ubuntu:24.04-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 tags: ["arch:amd64"] timeout: 3h rules: From 49e207f685a41f41ab4ccb40542f84c3d4f8fb3d Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Mon, 13 Apr 2026 14:23:08 -0400 Subject: [PATCH 4/6] remove -py3 and see what happens --- ci/input_files/build.yaml.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl index 2ffb18e7..8d8b40f6 100644 --- a/ci/input_files/build.yaml.tpl +++ b/ci/input_files/build.yaml.tpl @@ -92,7 +92,7 @@ unit-test ({{ $runtime.name }}-{{ $runtime.arch }}): integration-test ({{ $runtime.name }}-{{ $runtime.arch }}): stage: test tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy rules: - if: '$SKIP_E2E_TESTS == "true"' when: never @@ -117,7 +117,7 @@ integration-test ({{ $runtime.name }}-{{ $runtime.arch }}): sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}): stage: sign tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' when: manual @@ -148,7 +148,7 @@ sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}): publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}): stage: publish tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy rules: - if: '$SKIP_E2E_TESTS == "true"' when: never @@ -194,7 +194,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}): publish-pypi-package: stage: publish tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy before_script: *python-before-script cache: [] rules: @@ -230,7 +230,7 @@ layer bundle: signed layer bundle: stage: sign - image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy tags: ["arch:amd64"] rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' @@ -278,7 +278,7 @@ e2e-test: e2e-test-status: stage: e2e - image: registry.ddbuild.io/images/docker:20.10.13-jammy-py3 + image: registry.ddbuild.io/images/docker:20.10.13-jammy tags: ["arch:amd64"] timeout: 3h rules: From 2c6a9a63e7ad798f0b98e17fdb8742f650785afc Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Mon, 20 Apr 2026 11:44:00 -0400 Subject: [PATCH 5/6] use noble 29 --- ci/input_files/build.yaml.tpl | 18 +++++------ pyproject.toml.bak | 57 +++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 pyproject.toml.bak diff --git a/ci/input_files/build.yaml.tpl b/ci/input_files/build.yaml.tpl index 8d8b40f6..8d26735a 100644 --- a/ci/input_files/build.yaml.tpl +++ b/ci/input_files/build.yaml.tpl @@ -45,7 +45,7 @@ default: build-layer ({{ $runtime.name }}-{{ $runtime.arch }}): stage: build tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy + image: registry.ddbuild.io/images/docker:29.4.0-noble artifacts: expire_in: 1 hr # Unsigned zips expire in 1 hour paths: @@ -60,7 +60,7 @@ build-layer ({{ $runtime.name }}-{{ $runtime.arch }}): check-layer-size ({{ $runtime.name }}-{{ $runtime.arch }}): stage: test tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy + image: registry.ddbuild.io/images/docker:29.4.0-noble needs: - build-layer ({{ $runtime.name }}-{{ $runtime.arch }}) dependencies: @@ -92,7 +92,7 @@ unit-test ({{ $runtime.name }}-{{ $runtime.arch }}): integration-test ({{ $runtime.name }}-{{ $runtime.arch }}): stage: test tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy + image: registry.ddbuild.io/images/docker:29.4.0-noble rules: - if: '$SKIP_E2E_TESTS == "true"' when: never @@ -117,7 +117,7 @@ integration-test ({{ $runtime.name }}-{{ $runtime.arch }}): sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}): stage: sign tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy + image: registry.ddbuild.io/images/docker:29.4.0-noble rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' when: manual @@ -148,7 +148,7 @@ sign-layer ({{ $runtime.name }}-{{ $runtime.arch }}): publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}): stage: publish tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy + image: registry.ddbuild.io/images/docker:29.4.0-noble rules: - if: '$SKIP_E2E_TESTS == "true"' when: never @@ -194,7 +194,7 @@ publish-layer-{{ $environment_name }} ({{ $runtime.name }}-{{ $runtime.arch }}): publish-pypi-package: stage: publish tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy + image: registry.ddbuild.io/images/docker:29.4.0-noble before_script: *python-before-script cache: [] rules: @@ -209,7 +209,7 @@ publish-pypi-package: layer bundle: stage: build tags: ["arch:amd64"] - image: registry.ddbuild.io/images/docker:20.10.13-jammy + image: registry.ddbuild.io/images/docker:29.4.0-noble needs: {{ range (ds "runtimes").runtimes }} - build-layer ({{ .name }}-{{ .arch }}) @@ -230,7 +230,7 @@ layer bundle: signed layer bundle: stage: sign - image: registry.ddbuild.io/images/docker:20.10.13-jammy + image: registry.ddbuild.io/images/docker:29.4.0-noble tags: ["arch:amd64"] rules: - if: '$CI_COMMIT_TAG =~ /^v.*/' @@ -278,7 +278,7 @@ e2e-test: e2e-test-status: stage: e2e - image: registry.ddbuild.io/images/docker:20.10.13-jammy + image: registry.ddbuild.io/images/docker:29.4.0-noble tags: ["arch:amd64"] timeout: 3h rules: diff --git a/pyproject.toml.bak b/pyproject.toml.bak new file mode 100644 index 00000000..f289867c --- /dev/null +++ b/pyproject.toml.bak @@ -0,0 +1,57 @@ +[tool.poetry] +name = "datadog_lambda" +version = "8.124.0.dev0" +description = "The Datadog AWS Lambda Library" +authors = ["Datadog, Inc. "] +license = "Apache-2.0" +readme = "README.md" +repository = "https://github.com/DataDog/datadog-lambda-python" +keywords = [ + "datadog", + "aws", + "lambda", + "layer", +] +packages = [ + { include = "datadog_lambda" } +] +classifiers = [ + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", +] + +[tool.poetry.dependencies] +python = ">=3.8.0,<4" +datadog = ">=0.51.0,<1.0.0" +wrapt = "^1.11.2" +ddtrace = [ + {version = ">=3.19.1,<4", python = ">=3.8,<3.10"}, + {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"} +] +ujson = ">=5.9.0" +botocore = { version = "^1.34.0", optional = true } +requests = { version ="^2.22.0", optional = true } +pytest = { version= "^8.0.0", optional = true } +pytest-benchmark = { version = "^4.0", optional = true } +flake8 = { version = "^5.0.4", optional = true } + +[tool.poetry.extras] +dev = [ + "botocore", + "flake8", + "pytest", + "pytest-benchmark", + "requests", +] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.pytest.ini_options] +addopts = "--benchmark-disable --benchmark-autosave" From 2de1856942775579c5c2e207f11c4de4c585bc55 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Mon, 20 Apr 2026 11:44:17 -0400 Subject: [PATCH 6/6] remvoe extra file --- pyproject.toml.bak | 57 ---------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 pyproject.toml.bak diff --git a/pyproject.toml.bak b/pyproject.toml.bak deleted file mode 100644 index f289867c..00000000 --- a/pyproject.toml.bak +++ /dev/null @@ -1,57 +0,0 @@ -[tool.poetry] -name = "datadog_lambda" -version = "8.124.0.dev0" -description = "The Datadog AWS Lambda Library" -authors = ["Datadog, Inc. "] -license = "Apache-2.0" -readme = "README.md" -repository = "https://github.com/DataDog/datadog-lambda-python" -keywords = [ - "datadog", - "aws", - "lambda", - "layer", -] -packages = [ - { include = "datadog_lambda" } -] -classifiers = [ - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", - "Programming Language :: Python :: 3.14", -] - -[tool.poetry.dependencies] -python = ">=3.8.0,<4" -datadog = ">=0.51.0,<1.0.0" -wrapt = "^1.11.2" -ddtrace = [ - {version = ">=3.19.1,<4", python = ">=3.8,<3.10"}, - {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"} -] -ujson = ">=5.9.0" -botocore = { version = "^1.34.0", optional = true } -requests = { version ="^2.22.0", optional = true } -pytest = { version= "^8.0.0", optional = true } -pytest-benchmark = { version = "^4.0", optional = true } -flake8 = { version = "^5.0.4", optional = true } - -[tool.poetry.extras] -dev = [ - "botocore", - "flake8", - "pytest", - "pytest-benchmark", - "requests", -] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" - -[tool.pytest.ini_options] -addopts = "--benchmark-disable --benchmark-autosave"