Fix method for downloading Java Agent jar (#565)

Signed-off-by: Raphael Silva <[email protected]>

Author: rapphil

java/build.gradle.kts

@@ -19,14 +19,28 @@ java {
 
 spotless {
     java {
-        googleJavaFormat("1.9")
+        googleJavaFormat("1.15.0")
     }
 }
 
+val javaagentDependency by configurations.creating {
+    extendsFrom()
+}
+
 dependencies {
     compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.25.0"))
     compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.25.0-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.26.0")
+}
+
+tasks.register<Copy>("download") {
+    from(javaagentDependency)
+    into("$buildDir/javaagent")
+}
+
+tasks.named("build") {
+    dependsOn("download")
 }

java/build.sh

@@ -19,16 +19,16 @@ cp ./build/libs/aws-otel-lambda-java-extensions.jar ../opentelemetry-lambda/java
 # Go to OTel Lambda Java folder
 cd ../opentelemetry-lambda/java || exit
 
-# Build the OTel Lambda Java folder which has ADOT Lambda Java configured code
-OTEL_VERSION=1.24.0
-./gradlew build -Potel.lambda.javaagent.dependency=software.amazon.opentelemetry:aws-opentelemetry-agent:$OTEL_VERSION
+./gradlew build
 
 # Combine Java Agent build and ADOT Collector
 pushd ./layer-javaagent/build/distributions || exit
 unzip -qo opentelemetry-javaagent-layer.zip
 rm opentelemetry-javaagent-layer.zip
 mv otel-handler otel-handler-upstream
 cp "$SOURCEDIR"/scripts/otel-handler .
+# Copy ADOT Java Agent downloaded using Gradle task
+cp "$SOURCEDIR"/build/javaagent/aws-opentelemetry-agent*.jar ./opentelemetry-javaagent.jar
 unzip -qo ../../../../collector/build/collector-extension-$1.zip
 zip -qr opentelemetry-javaagent-layer.zip *
 popd || exit