From 31eb10649427ad3c8c805f69ce7b08a9a8fa215e Mon Sep 17 00:00:00 2001
From: Prashant Srivastava <50466688+srprash@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:05:11 -0800
Subject: [PATCH] fix packaging of the layer artifacts (#993)

The current logic is including the full path of the
`aws-opentelemetry-javaagent.jar` in the zip. But it should be at the
root along-with the `otel-instrument` file.

Tested locally and verified the directory structure is now correct.


By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
---
 lambda-layer/build-layer.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lambda-layer/build-layer.sh b/lambda-layer/build-layer.sh
index fcdb75b3be..7a09ff48e7 100755
--- a/lambda-layer/build-layer.sh
+++ b/lambda-layer/build-layer.sh
@@ -49,7 +49,10 @@ echo "Info: Building ADOT Lambda Java SDK Layer Code"
 echo "Info: Creating the layer artifact"
 mkdir -p "$SOURCEDIR"/build/distributions/
 cp "$SOURCEDIR"/build/javaagent/aws-opentelemetry-agent*.jar "$SOURCEDIR"/build/distributions/aws-opentelemetry-javaagent.jar
-zip -r ./build/distributions/aws-opentelemetry-java-layer.zip "$SOURCEDIR"/build/distributions/aws-opentelemetry-javaagent.jar otel-instrument
+cp otel-instrument "$SOURCEDIR"/build/distributions/otel-instrument
+pushd "$SOURCEDIR"/build/distributions
+zip -r aws-opentelemetry-java-layer.zip aws-opentelemetry-javaagent.jar otel-instrument
+popd
 
 ## Cleanup
 # revert the patch applied since it is only needed while building the layer.