From b2297b38a5bcf596bef2d9d3e768bca24b538480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= Date: Thu, 31 Oct 2024 14:56:12 -0400 Subject: [PATCH] feat: Add Python 3.12 runtime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gábor Lipták --- .github/workflows/ci-python.yml | 2 +- collector/Makefile | 4 ++-- python/sample-apps/template.yml | 1 + python/src/otel/Dockerfile | 2 +- python/src/template.yml | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml index 6c777be1f5..0c8005f0cd 100644 --- a/.github/workflows/ci-python.yml +++ b/.github/workflows/ci-python.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: - python: ['3.8', '3.9', '3.10', '3.11'] + python: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - name: Checkout this repo diff --git a/collector/Makefile b/collector/Makefile index c88283046f..c21148fdb0 100644 --- a/collector/Makefile +++ b/collector/Makefile @@ -47,12 +47,12 @@ package: build .PHONY: publish publish: - aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs14.x nodejs16.x nodejs18.x java11 python3.8 python3.9 python3.10 python3.11 --query 'LayerVersionArn' --output text + aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs14.x nodejs16.x nodejs18.x java11 python3.8 python3.9 python3.10 python3.11 python3.12 --query 'LayerVersionArn' --output text .PHONY: publish-layer publish-layer: package @echo Publishing collector extension layer... - aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs14.x nodejs16.x nodejs18.x java11 python3.8 python3.9 python3.10 python3.11 --query 'LayerVersionArn' --output text + aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs14.x nodejs16.x nodejs18.x java11 python3.8 python3.9 python3.10 python3.11 python3.12 --query 'LayerVersionArn' --output text @echo OpenTelemetry Collector layer published. .PHONY: set-otelcol-version diff --git a/python/sample-apps/template.yml b/python/sample-apps/template.yml index 4c0360fddf..7f7a1c3619 100644 --- a/python/sample-apps/template.yml +++ b/python/sample-apps/template.yml @@ -46,5 +46,6 @@ Resources: - python3.9 - python3.10 - python3.11 + - python3.12 Metadata: BuildMethod: makefile diff --git a/python/src/otel/Dockerfile b/python/src/otel/Dockerfile index f92e728a7a..7a8fe8f8a3 100644 --- a/python/src/otel/Dockerfile +++ b/python/src/otel/Dockerfile @@ -1,4 +1,4 @@ -ARG runtime=python3.11 +ARG runtime=python3.12 FROM public.ecr.aws/sam/build-${runtime} diff --git a/python/src/template.yml b/python/src/template.yml index 717cae3b59..1b486f7d00 100644 --- a/python/src/template.yml +++ b/python/src/template.yml @@ -18,5 +18,6 @@ Resources: - python3.9 - python3.10 - python3.11 + - python3.12 Metadata: BuildMethod: makefile