use npm run build to build layer, fix lambda java patch

aws-observability · Dec 27, 2024 · dfd95af · dfd95af
1 parent 92aa249
commit dfd95af
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/java/build.sh b/java/build.sh
@@ -65,12 +65,12 @@ popd || exit
 
 # Combine Java Wrapper build and ADOT Collector
 pushd ./layer-wrapper/build/distributions || exit
-unzip -qo opentelemetry-java-wrapper.zip
-rm opentelemetry-java-wrapper.zip
+unzip -qo opentelemetry-javawrapper-layer.zip
+rm opentelemetry-javawrapper-layer.zip
 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 ${SOURCEDIR}/../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-$1.zip
-zip -qr opentelemetry-java-wrapper.zip *
+zip -qr opentelemetry-javawrapper-layer.zip *
 popd || exit
diff --git a/java/integration-tests/aws-sdk/wrapper/main.tf b/java/integration-tests/aws-sdk/wrapper/main.tf
@@ -4,10 +4,10 @@ locals {
 
 resource "aws_lambda_layer_version" "sdk_layer" {
   layer_name          = var.sdk_layer_name
-  filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
+  filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip"
   compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
-  source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip")
+  source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip")
 }
 
 resource "aws_lambda_layer_version" "collector_layer" {

diff --git a/java/integration-tests/okhttp/wrapper/main.tf b/java/integration-tests/okhttp/wrapper/main.tf
@@ -4,10 +4,10 @@ locals {
 
 resource "aws_lambda_layer_version" "sdk_layer" {
   layer_name          = var.sdk_layer_name
-  filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
+  filename            = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip"
   compatible_runtimes = ["java8.al2", "java11", "java17"]
   license_info        = "Apache-2.0"
-  source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip")
+  source_code_hash    = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip")
 }
 
 resource "aws_lambda_layer_version" "collector_layer" {

diff --git a/nodejs/build.sh b/nodejs/build.sh
@@ -16,7 +16,7 @@ cd wrapper-adot || exit
 npm install || exit
 
 cd ../../opentelemetry-lambda/nodejs || exit
-npm install || exit
+npm install && npm run build|| exit
 
 mv ./packages/layer/build/workspace/otel-handler ./packages/layer/build/workspace/otel-handler-upstream
 cp "$SOURCEDIR"/scripts/otel-handler ./packages/layer/build/workspace/otel-handler

diff --git a/patches/opentelemetry-lambda_java.patch b/patches/opentelemetry-lambda_java.patch
@@ -7,7 +7,7 @@ index 7693c66..e66bcba 100644
          spotless {
              java {
 -                googleJavaFormat()
-+                googleJavaFormat("1.15.0"))
++                googleJavaFormat("1.15.0")
              }
          }