Skip to content

Commit dfd95af

Browse files
committed
use npm run build to build layer, fix lambda java patch
1 parent 92aa249 commit dfd95af

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

java/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ popd || exit
6565

6666
# Combine Java Wrapper build and ADOT Collector
6767
pushd ./layer-wrapper/build/distributions || exit
68-
unzip -qo opentelemetry-java-wrapper.zip
69-
rm opentelemetry-java-wrapper.zip
68+
unzip -qo opentelemetry-javawrapper-layer.zip
69+
rm opentelemetry-javawrapper-layer.zip
7070
mv otel-handler otel-handler-upstream
7171
mv otel-stream-handler otel-stream-handler-upstream
7272
mv otel-proxy-handler otel-proxy-handler-upstream
7373
cp "$SOURCEDIR"/scripts/* .
7474
unzip -qo ${SOURCEDIR}/../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-$1.zip
75-
zip -qr opentelemetry-java-wrapper.zip *
75+
zip -qr opentelemetry-javawrapper-layer.zip *
7676
popd || exit

java/integration-tests/aws-sdk/wrapper/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ locals {
44

55
resource "aws_lambda_layer_version" "sdk_layer" {
66
layer_name = var.sdk_layer_name
7-
filename = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
7+
filename = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip"
88
compatible_runtimes = ["java8.al2", "java11", "java17"]
99
license_info = "Apache-2.0"
10-
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip")
10+
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip")
1111
}
1212

1313
resource "aws_lambda_layer_version" "collector_layer" {

java/integration-tests/okhttp/wrapper/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ locals {
44

55
resource "aws_lambda_layer_version" "sdk_layer" {
66
layer_name = var.sdk_layer_name
7-
filename = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip"
7+
filename = "${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip"
88
compatible_runtimes = ["java8.al2", "java11", "java17"]
99
license_info = "Apache-2.0"
10-
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip")
10+
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip")
1111
}
1212

1313
resource "aws_lambda_layer_version" "collector_layer" {

nodejs/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cd wrapper-adot || exit
1616
npm install || exit
1717

1818
cd ../../opentelemetry-lambda/nodejs || exit
19-
npm install || exit
19+
npm install && npm run build|| exit
2020

2121
mv ./packages/layer/build/workspace/otel-handler ./packages/layer/build/workspace/otel-handler-upstream
2222
cp "$SOURCEDIR"/scripts/otel-handler ./packages/layer/build/workspace/otel-handler

patches/opentelemetry-lambda_java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ index 7693c66..e66bcba 100644
77
spotless {
88
java {
99
- googleJavaFormat()
10-
+ googleJavaFormat("1.15.0"))
10+
+ googleJavaFormat("1.15.0")
1111
}
1212
}
1313

0 commit comments

Comments
 (0)