POC to fix lambda layers (#572)

* POC for reverting lambda context propagation change

* fix build.sh

* Fix build.sh

* Fix patch

* Increase duration for creds

* Remove run on pull request

---------

Co-authored-by: Huy Vo <[email protected]>

Author: rapphil

.github/workflows/main-build.yml

@@ -89,7 +89,7 @@ jobs:
         if: ${{ matrix.language == 'java' }}
         with:
           distribution: corretto
-          java-version: '11'
+          java-version: '17'
       - name: Cache (Java)
         uses: actions/cache@v3
         if: ${{ matrix.language == 'java' }}
@@ -136,7 +136,7 @@ jobs:
       - uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           role-to-assume: ${{ secrets.INTEG_TEST_LAMBDA_ROLE_ARN }}
-          role-duration-seconds: 1200
+          role-duration-seconds: 7200
           aws-region: us-east-1
       - name: Patch ADOT
         run: ./patch-upstream.sh

.github/workflows/pr-build.yml

@@ -29,7 +29,7 @@ jobs:
         if: ${{ matrix.language == 'java' }}
         with:
           distribution: corretto
-          java-version: '11'
+          java-version: '17'
       - name: Cache (Java)
         uses: actions/cache@v3
         if: ${{ matrix.language == 'java' }}

collector.patch

@@ -37,3 +37,16 @@ index 7cdea69..553e649 100644
  			Version:     c.version,
  		},
  		ConfigProvider: c.configProvider,
+diff --git a/collector/Makefile b/collector/Makefile
+index 8a3d532..e272d83 100644
+--- a/collector/Makefile
++++ b/collector/Makefile
+@@ -44,7 +44,7 @@ package: build
+ 	@echo Package zip file for collector extension layer
+ 	mkdir -p $(BUILD_SPACE)/collector-config
+ 	cp config* $(BUILD_SPACE)/collector-config
+-	cd $(BUILD_SPACE) && zip -r opentelemetry-collector-layer-$(GOARCH).zip collector-config extensions
++	cd $(BUILD_SPACE) && zip -r collector-extension-$(GOARCH).zip collector-config extensions
+ 
+ .PHONY: publish
+ publish:

java/build.gradle.kts

@@ -28,12 +28,12 @@ val javaagentDependency by configurations.creating {
 }
 
 dependencies {
-    compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.25.0"))
-    compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.25.0-alpha"))
+    compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.26.0"))
+    compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.26.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")
+    javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:1.26.0-adot-lambda1")
 }
 
 tasks.register<Copy>("download") {

java/build.sh

@@ -2,6 +2,34 @@
 
 SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
+
+## revert https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7970
+
+git clone https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
+pushd opentelemetry-java-instrumentation
+git checkout v1.26.0 -b tag-v1.26.0
+patch -p1 < "$SOURCEDIR"/../patches/opentelemetry-java-instrumentation.patch
+git add -A
+git commit -m "Create patch version"
+./gradlew publishToMavenLocal
+popd
+
+rm -rf opentelemetry-java-instrumentation
+
+
+git clone https://github.com/aws-observability/aws-otel-java-instrumentation.git
+
+pushd aws-otel-java-instrumentation
+
+git checkout v1.26.0 -b tag-v1.26.0
+patch -p1 < "${SOURCEDIR}"/../patches/aws-otel-java-instrumentation.patch
+git add -A
+git commit -a -m "Create patch version"
+CI=false ./gradlew publishToMavenLocal -Prelease.version=1.26.0-adot-lambda1
+popd
+
+rm -rf aws-otel-java-instrumentation
+
 # Build collector
 
 pushd ../opentelemetry-lambda/collector || exit
@@ -13,12 +41,12 @@ popd || exit
 ./gradlew build
 
 # Move the ADOT Lambda Java SDK code into OTel Lambda Java folder
-mkdir -p ../opentelemetry-lambda/java/build/extensions
-cp ./build/libs/aws-otel-lambda-java-extensions.jar ../opentelemetry-lambda/java/build/extensions
+mkdir -p ../opentelemetry-lambda/java/layer-wrapper/build/extensions
+cp ./build/libs/aws-otel-lambda-java-extensions.jar ../opentelemetry-lambda/java/layer-wrapper/build/extensions
 
 # Go to OTel Lambda Java folder
 cd ../opentelemetry-lambda/java || exit
-
+patch -p2 < "${SOURCEDIR}/../patches/opentelemetry-lambda_java.patch"
 ./gradlew build
 
 # Combine Java Agent build and ADOT Collector
@@ -41,6 +69,6 @@ mv otel-handler otel-handler-upstream
 mv otel-stream-handler otel-stream-handler-upstream
 mv otel-proxy-handler otel-proxy-handler-upstream
 cp "$SOURCEDIR"/scripts/* .
-unzip -qo ../../../../collector/build/collector-extension-$1.zip
+unzip -qo ${SOURCEDIR}/../opentelemetry-lambda/collector/build/collector-extension-$1.zip
 zip -qr opentelemetry-java-wrapper.zip *
 popd || exit

opentelemetry-lambda

@@ -0,0 +1,13 @@
+diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
+index edf21b4..c5eb1c3 100644
+--- a/dependencyManagement/build.gradle.kts
++++ b/dependencyManagement/build.gradle.kts
+@@ -27,7 +27,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
+ val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
+ 
+ // This is the version of the upstream instrumentation BOM
+-val otelVersion = "1.26.0"
++val otelVersion = "1.26.0-adot-lambda1"
+ val otelSnapshotVersion = "1.27.0"
+ 
+ // All versions below are only used in testing and do not affect the released artifact.