reordering patches to avoid conflict + some refactoring

Author: srprash

lambda-layer/build-layer.sh

@@ -4,6 +4,7 @@ SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 
 ## Get OTel version
+echo "Info: Getting OTEL Version"
 file="$SOURCEDIR/../.github/patches/versions"
 version=$(awk -F'=v' '/OTEL_JAVA_INSTRUMENTATION_VERSION/ {print $2}' "$file")
 echo "Found OTEL Version: ${version}"
@@ -15,16 +16,17 @@ fi
 
 
 ## Clone and Patch the OpenTelemetry Java Instrumentation Repository
+echo "Info: Cloning and Patching OpenTelemetry Java Instrumentation Repository"
 git clone https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
 pushd opentelemetry-java-instrumentation
 git checkout v${version} -b tag-v${version}
 
-# This patch is for Lambda related context propagation
-patch -p1 < "$SOURCEDIR"/patches/opentelemetry-java-instrumentation.patch
-
 # There is another patch in the .github/patches directory for other changes. We should apply them too for consistency.
 patch -p1 < "$SOURCEDIR"/../.github/patches/opentelemetry-java-instrumentation.patch
 
+# This patch is for Lambda related context propagation
+patch -p1 < "$SOURCEDIR"/patches/opentelemetry-java-instrumentation.patch
+
 git add -A
 git commit -m "Create patch version"
 ./gradlew publishToMavenLocal
@@ -33,16 +35,19 @@ rm -rf opentelemetry-java-instrumentation
 
 
 ## Build the ADOT Java from current source
+echo "Info: Building ADOT Java from current source"
 pushd "$SOURCEDIR"/..
 patch  -p1 < "${SOURCEDIR}"/patches/aws-otel-java-instrumentation.patch
 CI=false ./gradlew publishToMavenLocal -Prelease.version=${version}-adot-lambda1
 popd
 
 
 ## Build ADOT Lambda Java SDK Layer Code
-./gradlew build
+echo "Info: Building ADOT Lambda Java SDK Layer Code"
+./gradlew build -PotelVersion=${version}
 
 
 ## Copy ADOT Java Agent downloaded using Gradle task and bundle it with the Lambda handler script
+echo "Info: Creating the layer artifact"
 cp "$SOURCEDIR"/build/javaagent/aws-opentelemetry-agent*.jar ./opentelemetry-javaagent.jar
 zip -qr opentelemetry-javaagent-layer.zip opentelemetry-javaagent.jar otel-instrument

lambda-layer/build.gradle.kts

@@ -27,13 +27,15 @@ val javaagentDependency by configurations.creating {
   extendsFrom()
 }
 
+val otelVersion: String by project
+
 dependencies {
-  compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.32.1"))
-  compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.32.1-alpha"))
+  compileOnly(platform("io.opentelemetry:opentelemetry-bom:$otelVersion"))
+  compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:$otelVersion-alpha"))
   // Already included in wrapper so compileOnly
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-aws")
-  javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:1.32.1-adot-lambda1")
+  javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:$otelVersion-adot-lambda1")
 }
 
 tasks.register<Copy>("download") {

lambda-layer/patches/opentelemetry-java-instrumentation.patch

@@ -636,8 +636,8 @@ index cc1414c0bf..db8a59b046 100644
 --- a/version.gradle.kts
 +++ b/version.gradle.kts
 @@ -1,5 +1,5 @@
--val stableVersion = "1.33.6"
--val alphaVersion = "1.33.6-alpha"
+-val stableVersion = "1.33.6-adot1"
+-val alphaVersion = "1.33.6-adot1-alpha"
 +val stableVersion = "1.33.6-adot-lambda1"
 +val alphaVersion = "1.33.6-adot-lambda1-alpha"