Skip to content

Commit 7f26d89

Browse files
vasireddy99vasireddy99
authored
[chore] Fix workflows with breaking changes and Set/modify otel propagators in the build scripts (#1024)
* go mod tidy for sample app * use debug exporter in config * use xray-lambda when using active tracing * modify compatible run times for nodejs * use OTEL Propagators in nodejs script
1 parent 4b43905 commit 7f26d89

File tree

9 files changed

+17
-12
lines changed

9 files changed

+17
-12
lines changed

‎go/build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ popd || exit
99
# Build sample app
1010

1111
cd ../opentelemetry-lambda/go/sample-apps/function || exit
12+
go mod tidy
1213
CGO_ENABLED=0 ./build.sh

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resource "aws_lambda_layer_version" "collector_layer" {
1616
count = var.enable_collector_layer ? 1 : 0
1717
layer_name = var.collector_layer_name
1818
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
19-
compatible_runtimes = ["nodejs14.x", "nodejs16.x", "nodejs18.x"]
19+
compatible_runtimes = ["nodejs16.x", "nodejs18.x", "nodejs20.x", "nodejs22.x"]
2020
license_info = "Apache-2.0"
2121
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2222
}
@@ -82,7 +82,7 @@ receivers:
8282
http:
8383
endpoint: "localhost:4318"
8484
exporters:
85-
logging:
85+
debug:
8686
awsxray:
8787
prometheusremotewrite: $${${module.remote_configuration.configuration_uri}}
8888
@@ -95,7 +95,7 @@ service:
9595
exporters: [awsxray]
9696
metrics:
9797
receivers: [otlp]
98-
exporters: [logging, prometheusremotewrite]
98+
exporters: [debug, prometheusremotewrite]
9999
telemetry:
100100
metrics:
101101
address: localhost:8888

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ resource "aws_lambda_layer_version" "collector_layer" {
1414
count = var.enable_collector_layer ? 1 : 0
1515
layer_name = var.collector_layer_name
1616
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
17-
compatible_runtimes = ["nodejs14.x", "nodejs16.x", "nodejs18.x"]
17+
compatible_runtimes = ["nodejs16.x", "nodejs18.x", "nodejs20.x", "nodejs22.x"]
1818
license_info = "Apache-2.0"
1919
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2020
}
@@ -62,7 +62,7 @@ receivers:
6262
http:
6363
endpoint: "localhost:4318"
6464
exporters:
65-
logging:
65+
debug:
6666
awsxray:
6767
prometheusremotewrite:
6868
endpoint: "${aws_prometheus_workspace.test_amp_workspace[0].prometheus_endpoint}api/v1/remote_write"
@@ -78,7 +78,7 @@ service:
7878
exporters: [awsxray]
7979
metrics:
8080
receivers: [otlp]
81-
exporters: [logging, prometheusremotewrite]
81+
exporters: [debug, prometheusremotewrite]
8282
telemetry:
8383
metrics:
8484
address: localhost:8888

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ resource "aws_lambda_layer_version" "collector_layer" {
1414
count = var.enable_collector_layer ? 1 : 0
1515
layer_name = var.collector_layer_name
1616
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
17-
compatible_runtimes = ["nodejs14.x", "nodejs16.x", "nodejs18.x"]
17+
compatible_runtimes = ["nodejs16.x", "nodejs18.x", "nodejs20.x", "nodejs22.x"]
1818
license_info = "Apache-2.0"
1919
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2020
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ resource "aws_lambda_layer_version" "collector_layer" {
1414
count = var.enable_collector_layer ? 1 : 0
1515
layer_name = var.collector_layer_name
1616
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
17-
compatible_runtimes = ["nodejs14.x", "nodejs16.x", "nodejs18.x"]
17+
compatible_runtimes = ["nodejs16.x", "nodejs18.x", "nodejs20.x", "nodejs22.x"]
1818
license_info = "Apache-2.0"
1919
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2020
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55
resource "aws_lambda_layer_version" "sdk_layer" {
66
layer_name = var.sdk_layer_name
77
filename = "${path.module}/../../../../opentelemetry-lambda/nodejs/packages/layer/build/layer.zip"
8-
compatible_runtimes = ["nodejs16.x", "nodejs18.x"]
8+
compatible_runtimes = ["nodejs16.x", "nodejs18.x", "nodejs20.x", "nodejs22.x"]
99
license_info = "Apache-2.0"
1010
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/nodejs/packages/layer/build/layer.zip")
1111
}
@@ -14,7 +14,7 @@ resource "aws_lambda_layer_version" "collector_layer" {
1414
count = var.enable_collector_layer ? 1 : 0
1515
layer_name = var.collector_layer_name
1616
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
17-
compatible_runtimes = ["nodejs16.x", "nodejs18.x"]
17+
compatible_runtimes = ["nodejs16.x", "nodejs18.x", "nodejs20.x", "nodejs22.x"]
1818
license_info = "Apache-2.0"
1919
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2020
}

‎nodejs/scripts/otel-handler‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22

33
export NODE_OPTIONS="--require /opt/adot-extension.js ${NODE_OPTIONS}"
44

5+
if [[ -z "$OTEL_PROPAGATORS" ]]; then
6+
export OTEL_PROPAGATORS="tracecontext,baggage,xray-lambda"
7+
fi
8+
59
source /opt/otel-handler-upstream

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ resource "aws_lambda_layer_version" "collector_layer" {
1414
count = var.enable_collector_layer ? 1 : 0
1515
layer_name = var.collector_layer_name
1616
filename = "${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip"
17-
compatible_runtimes = ["nodejs14.x", "nodejs16.x", "nodejs18.x"]
17+
compatible_runtimes = ["nodejs16.x", "nodejs18.x", "nodejs20.x", "nodejs22.x"]
1818
license_info = "Apache-2.0"
1919
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
2020
}

‎python/scripts/otel-instrument‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ END_DOCUMENTATION
1919
# - Set `OTEL_PROPAGATORS` if not yet set, and include the xray propagator
2020

2121
if [ -z ${OTEL_PROPAGATORS} ]; then
22-
export OTEL_PROPAGATORS="tracecontext,baggage,xray";
22+
export OTEL_PROPAGATORS="tracecontext,baggage,xray-lambda";
2323
fi
2424

2525
# - Call the upstream configure OTel script

0 commit comments

Comments
 (0)