Skip to content

Commit f536de5

Browse files
vasireddy99vasireddy99
authored
[chore] Fix sample app script files and arns used in the canaries (#1037)
* fix sample app tf files and arns * Nodejs version 18 in workflow * Fix nodejs sample app layer arns
1 parent 532d74c commit f536de5

File tree

6 files changed

+42
-35
lines changed

6 files changed

+42
-35
lines changed

‎.github/workflows/canary.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- uses: actions/setup-node@v4
8989
if: ${{ matrix.language == 'nodejs' }}
9090
with:
91-
node-version: '16'
91+
node-version: '18'
9292
- name: Cache (NodeJS)
9393
uses: actions/cache@v4
9494
if: ${{ matrix.language == 'nodejs' }}

‎java/sample-apps/aws-sdk/deploy/agent/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ receivers:
5252
http:
5353
5454
exporters:
55-
logging:
55+
debug:
5656
awsxray:
5757
prometheusremotewrite:
5858
endpoint: "${aws_prometheus_workspace.test_amp_workspace[0].prometheus_endpoint}api/v1/remote_write"
@@ -68,7 +68,7 @@ service:
6868
exporters: [awsxray]
6969
metrics:
7070
receivers: [otlp]
71-
exporters: [logging, prometheusremotewrite]
71+
exporters: [debug, prometheusremotewrite]
7272
EOT
7373
filename = "config.yaml"
7474
}

‎nodejs/sample-apps/aws-sdk/deploy/wrapper/layer_amd64.tf‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
locals {
22
sdk_layer_arns_amd64 = {
3-
"ap-northeast-1" = "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
4-
"ap-northeast-2" = "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
5-
"ap-south-1" = "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
6-
"ap-southeast-1" = "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
7-
"ap-southeast-2" = "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
8-
"ca-central-1" = "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
9-
"eu-central-1" = "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
10-
"eu-north-1" = "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
11-
"eu-west-1" = "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
12-
"eu-west-2" = "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
13-
"eu-west-3" = "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
14-
"sa-east-1" = "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
15-
"us-east-1" = "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
16-
"us-east-2" = "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
17-
"us-west-1" = "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
18-
"us-west-2" = "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1"
3+
"ap-northeast-1" = "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
4+
"ap-northeast-2" = "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
5+
"ap-south-1" = "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
6+
"ap-southeast-1" = "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
7+
"ap-southeast-2" = "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
8+
"ca-central-1" = "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
9+
"eu-central-1" = "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
10+
"eu-north-1" = "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
11+
"eu-west-1" = "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
12+
"eu-west-2" = "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
13+
"eu-west-3" = "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
14+
"sa-east-1" = "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
15+
"us-east-1" = "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
16+
"us-east-2" = "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
17+
"us-west-1" = "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
18+
"us-west-2" = "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1"
1919
}
2020
}

‎nodejs/sample-apps/aws-sdk/deploy/wrapper/layer_arm64.tf‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
locals {
22
sdk_layer_arns_arm64 = {
3-
"ap-northeast-1" = "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
4-
"ap-northeast-2" = "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
5-
"ap-south-1" = "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
6-
"ap-southeast-1" = "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
7-
"ap-southeast-2" = "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
8-
"ca-central-1" = "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
9-
"eu-central-1" = "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
10-
"eu-north-1" = "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
11-
"eu-west-1" = "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
12-
"eu-west-2" = "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
13-
"eu-west-3" = "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
14-
"sa-east-1" = "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
15-
"us-east-1" = "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
16-
"us-east-2" = "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
17-
"us-west-1" = "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
18-
"us-west-2" = "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1"
3+
"ap-northeast-1" = "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
4+
"ap-northeast-2" = "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
5+
"ap-south-1" = "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
6+
"ap-southeast-1" = "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
7+
"ap-southeast-2" = "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
8+
"ca-central-1" = "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
9+
"eu-central-1" = "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
10+
"eu-north-1" = "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
11+
"eu-west-1" = "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
12+
"eu-west-2" = "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
13+
"eu-west-3" = "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
14+
"sa-east-1" = "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
15+
"us-east-1" = "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
16+
"us-east-2" = "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
17+
"us-west-1" = "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
18+
"us-west-2" = "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1"
1919
}
2020
}

‎nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module "app" {
1414
collector_layer_arn = null
1515
sdk_layer_arn = local.architecture_to_arns_mapping[var.architecture][data.aws_region.current.name]
1616
tracing_mode = "Active"
17+
runtime = var.runtime
1718
architecture = var.architecture
1819
}
1920

‎nodejs/sample-apps/aws-sdk/deploy/wrapper/variables.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ variable "architecture" {
99
description = "Lambda function architecture, either arm64 or x86_64"
1010
default = "x86_64"
1111
}
12+
13+
variable "runtime" {
14+
type = string
15+
description = "NodeJS runtime version used for sample Lambda Function"
16+
default = "nodejs18.x"
17+
}

0 commit comments

Comments
 (0)