Skip to content

Commit d15ea94

Browse files
vasireddy99vasireddy99
authored
Update Opentelemetry-lambda sub module (#586)
1 parent 1e84ca8 commit d15ea94

File tree

13 files changed

+22
-35
lines changed

13 files changed

+22
-35
lines changed

‎collector.patch

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,3 @@ index 7cdea69..553e649 100644
3737
Version: c.version,
3838
},
3939
ConfigProvider: c.configProvider,
40-
diff --git a/collector/Makefile b/collector/Makefile
41-
index 8a3d532..e272d83 100644
42-
--- a/collector/Makefile
43-
+++ b/collector/Makefile
44-
@@ -44,7 +44,7 @@ package: build
45-
@echo Package zip file for collector extension layer
46-
mkdir -p $(BUILD_SPACE)/collector-config
47-
cp config* $(BUILD_SPACE)/collector-config
48-
- cd $(BUILD_SPACE) && zip -r opentelemetry-collector-layer-$(GOARCH).zip collector-config extensions
49-
+ cd $(BUILD_SPACE) && zip -r collector-extension-$(GOARCH).zip collector-config extensions
50-
51-
.PHONY: publish
52-
publish:

‎dotnet/integration-tests/aws-sdk/wrapper/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ locals {
55
resource "aws_lambda_layer_version" "collector_layer" {
66
count = var.enable_collector_layer ? 1 : 0
77
layer_name = var.collector_layer_name
8-
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip"
8+
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
99
compatible_runtimes = ["dotnet6", "dotnetcore3.1"]
1010
license_info = "Apache-2.0"
11-
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip")
11+
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
1212
}
1313

1414
module "hello-lambda-function" {

‎go/integration-tests/aws-sdk/wrapper/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ locals {
55
resource "aws_lambda_layer_version" "collector_layer" {
66
count = var.enable_collector_layer ? 1 : 0
77
layer_name = var.collector_layer_name
8-
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip"
8+
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
99
compatible_runtimes = ["provided.al2"]
1010
license_info = "Apache-2.0"
11-
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip")
11+
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
1212
}
1313

1414
module "hello-lambda-function" {

‎java/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ mv otel-handler otel-handler-upstream
5757
cp "$SOURCEDIR"/scripts/otel-handler .
5858
# Copy ADOT Java Agent downloaded using Gradle task
5959
cp "$SOURCEDIR"/build/javaagent/aws-opentelemetry-agent*.jar ./opentelemetry-javaagent.jar
60-
unzip -qo ../../../../collector/build/collector-extension-$1.zip
60+
unzip -qo ../../../../collector/build/opentelemetry-collector-layer-$1.zip
6161
zip -qr opentelemetry-javaagent-layer.zip *
6262
popd || exit
6363

@@ -69,6 +69,6 @@ mv otel-handler otel-handler-upstream
6969
mv otel-stream-handler otel-stream-handler-upstream
7070
mv otel-proxy-handler otel-proxy-handler-upstream
7171
cp "$SOURCEDIR"/scripts/* .
72-
unzip -qo ${SOURCEDIR}/../opentelemetry-lambda/collector/build/collector-extension-$1.zip
72+
unzip -qo ${SOURCEDIR}/../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-$1.zip
7373
zip -qr opentelemetry-java-wrapper.zip *
7474
popd || exit

‎java/integration-tests/aws-sdk/agent-confmap/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ resource "aws_lambda_layer_version" "sdk_layer" {
1515
resource "aws_lambda_layer_version" "collector_layer" {
1616
count = var.enable_collector_layer ? 1 : 0
1717
layer_name = var.collector_layer_name
18-
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip"
18+
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
1919
compatible_runtimes = ["nodejs14.x", "nodejs16.x", "nodejs18.x"]
2020
license_info = "Apache-2.0"
21-
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip")
21+
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2222
}
2323

2424
module "hello-lambda-function" {

‎java/integration-tests/aws-sdk/agent/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ resource "aws_lambda_layer_version" "sdk_layer" {
1313
resource "aws_lambda_layer_version" "collector_layer" {
1414
count = var.enable_collector_layer ? 1 : 0
1515
layer_name = var.collector_layer_name
16-
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip"
16+
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
1717
compatible_runtimes = ["nodejs14.x", "nodejs16.x", "nodejs18.x"]
1818
license_info = "Apache-2.0"
19-
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip")
19+
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2020
}
2121

2222
module "hello-lambda-function" {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ resource "aws_lambda_layer_version" "sdk_layer" {
1313
resource "aws_lambda_layer_version" "collector_layer" {
1414
count = var.enable_collector_layer ? 1 : 0
1515
layer_name = var.collector_layer_name
16-
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip"
16+
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
1717
compatible_runtimes = ["nodejs14.x", "nodejs16.x", "nodejs18.x"]
1818
license_info = "Apache-2.0"
19-
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip")
19+
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2020
}
2121

2222
module "hello-lambda-function" {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ resource "aws_lambda_layer_version" "sdk_layer" {
1313
resource "aws_lambda_layer_version" "collector_layer" {
1414
count = var.enable_collector_layer ? 1 : 0
1515
layer_name = var.collector_layer_name
16-
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip"
16+
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
1717
compatible_runtimes = ["nodejs14.x", "nodejs16.x", "nodejs18.x"]
1818
license_info = "Apache-2.0"
19-
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip")
19+
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2020
}
2121

2222
module "hello-lambda-function" {

‎nodejs/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ cp "$SOURCEDIR"/wrapper-adot/build/src/adot-extension.* ./packages/layer/build/w
2929

3030
cd ./packages/layer/build/workspace || exit
3131
rm ../layer.zip
32-
unzip -qo ../../../../../collector/build/collector-extension-$1.zip
32+
unzip -qo ../../../../../collector/build/opentelemetry-collector-layer-$1.zip
3333
zip -qr ../layer.zip *

‎nodejs/integration-tests/aws-sdk/wrapper/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ resource "aws_lambda_layer_version" "sdk_layer" {
1313
resource "aws_lambda_layer_version" "collector_layer" {
1414
count = var.enable_collector_layer ? 1 : 0
1515
layer_name = var.collector_layer_name
16-
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip"
16+
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
1717
compatible_runtimes = ["nodejs14.x", "nodejs16.x", "nodejs18.x"]
1818
license_info = "Apache-2.0"
19-
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/collector-extension-${local.architecture}.zip")
19+
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2020
}
2121

2222
module "hello-lambda-function" {

0 commit comments

Comments
 (0)