From 0cef2b1e544a81ea55ef391a7007da37301ef033 Mon Sep 17 00:00:00 2001
From: Arun Annamalai <aruanna@amazon.com>
Date: Wed, 15 Jan 2025 13:40:04 -0800
Subject: [PATCH 1/2] fix: add java17 as compatible runtime in collector
 makefile

---
 .github/workflows/ci-python.yml            | 2 ++
 .github/workflows/release-layer-java.yml   | 2 ++
 .github/workflows/release-layer-nodejs.yml | 2 ++
 collector/Makefile                         | 4 ++--
 java/README.md                             | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
index 0c8005f0cd..4bbf8d40a8 100644
--- a/.github/workflows/ci-python.yml
+++ b/.github/workflows/ci-python.yml
@@ -26,6 +26,8 @@ jobs:
 
     strategy:
       matrix:
+        # If you add a python version here, please make sure that the collector/Makefile publish and publish-layer targets
+        # get updated as well
         python: ['3.8', '3.9', '3.10', '3.11', '3.12']
 
     steps:
diff --git a/.github/workflows/release-layer-java.yml b/.github/workflows/release-layer-java.yml
index 857824f470..5361d56808 100644
--- a/.github/workflows/release-layer-java.yml
+++ b/.github/workflows/release-layer-java.yml
@@ -102,6 +102,8 @@ jobs:
       layer-name: opentelemetry-javaagent
       component-version: ${{needs.build-layer.outputs.JAVAAGENT_VERSION}}
       # architecture:
+      # If you add a java runtime here, please make sure that the collector/Makefile publish and publish-layer targets
+      # get updated as well
       runtimes: java8.al2 java11 java17
       release-group: prod
       aws_region: ${{ matrix.aws_region }}
diff --git a/.github/workflows/release-layer-nodejs.yml b/.github/workflows/release-layer-nodejs.yml
index 83677ae334..fd4639c061 100644
--- a/.github/workflows/release-layer-nodejs.yml
+++ b/.github/workflows/release-layer-nodejs.yml
@@ -87,6 +87,8 @@ jobs:
       layer-name: opentelemetry-nodejs
       component-version: ${{needs.build-layer.outputs.NODEJS_VERSION}}
       # architecture:
+      # If you add a nodejs runtime here, please make sure that the collector/Makefile publish and publish-layer targets
+      # get updated as well
       runtimes: nodejs18.x nodejs20.x nodejs22.x
       release-group: prod
       aws_region: ${{ matrix.aws_region }}
diff --git a/collector/Makefile b/collector/Makefile
index 0e5ebd0438..39dcb2993e 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 nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 python3.8 python3.9 python3.10 python3.11 python3.12 --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 nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 java17 java21 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 nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 python3.8 python3.9 python3.10 python3.11 python3.12 --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 nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 java17 java21 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/java/README.md b/java/README.md
index 16d3fdc7c7..ebcdcd9b72 100644
--- a/java/README.md
+++ b/java/README.md
@@ -75,7 +75,7 @@ To build the wrapper layer, run
 ./gradlew :layer-wrapper:build
 ```
 
-The layer zip file will be present at `./layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip`.
+The layer zip file will be present at `./layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip`.
 
 ## Sample applications
 

From a3188fcf73d8702a685431029166a2c1224296c8 Mon Sep 17 00:00:00 2001
From: Tyler Benson <734411+tylerbenson@users.noreply.github.com>
Date: Thu, 23 Jan 2025 13:17:44 -0500
Subject: [PATCH 2/2] Add java21 to the supported runtimes list

---
 .github/workflows/release-layer-java.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-layer-java.yml b/.github/workflows/release-layer-java.yml
index 5361d56808..f6665642b1 100644
--- a/.github/workflows/release-layer-java.yml
+++ b/.github/workflows/release-layer-java.yml
@@ -104,7 +104,7 @@ jobs:
       # architecture:
       # If you add a java runtime here, please make sure that the collector/Makefile publish and publish-layer targets
       # get updated as well
-      runtimes: java8.al2 java11 java17
+      runtimes: java8.al2 java11 java17 java21
       release-group: prod
       aws_region: ${{ matrix.aws_region }}
     secrets: inherit