From f536de5d94083a68f560df70365afb6a9a49b511 Mon Sep 17 00:00:00 2001 From: Vasi Vasireddy <41936996+vasireddy99@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:19:37 -0800 Subject: [PATCH] [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 --- .github/workflows/canary.yml | 2 +- java/sample-apps/aws-sdk/deploy/agent/main.tf | 4 +-- .../aws-sdk/deploy/wrapper/layer_amd64.tf | 32 +++++++++---------- .../aws-sdk/deploy/wrapper/layer_arm64.tf | 32 +++++++++---------- .../aws-sdk/deploy/wrapper/main.tf | 1 + .../aws-sdk/deploy/wrapper/variables.tf | 6 ++++ 6 files changed, 42 insertions(+), 35 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index f1001a7aa..619d74fe2 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -88,7 +88,7 @@ jobs: - uses: actions/setup-node@v4 if: ${{ matrix.language == 'nodejs' }} with: - node-version: '16' + node-version: '18' - name: Cache (NodeJS) uses: actions/cache@v4 if: ${{ matrix.language == 'nodejs' }} diff --git a/java/sample-apps/aws-sdk/deploy/agent/main.tf b/java/sample-apps/aws-sdk/deploy/agent/main.tf index 7fc721728..d65ffeb87 100644 --- a/java/sample-apps/aws-sdk/deploy/agent/main.tf +++ b/java/sample-apps/aws-sdk/deploy/agent/main.tf @@ -52,7 +52,7 @@ receivers: http: exporters: - logging: + debug: awsxray: prometheusremotewrite: endpoint: "${aws_prometheus_workspace.test_amp_workspace[0].prometheus_endpoint}api/v1/remote_write" @@ -68,7 +68,7 @@ service: exporters: [awsxray] metrics: receivers: [otlp] - exporters: [logging, prometheusremotewrite] + exporters: [debug, prometheusremotewrite] EOT filename = "config.yaml" } diff --git a/nodejs/sample-apps/aws-sdk/deploy/wrapper/layer_amd64.tf b/nodejs/sample-apps/aws-sdk/deploy/wrapper/layer_amd64.tf index b73784401..e3e173af1 100644 --- a/nodejs/sample-apps/aws-sdk/deploy/wrapper/layer_amd64.tf +++ b/nodejs/sample-apps/aws-sdk/deploy/wrapper/layer_amd64.tf @@ -1,20 +1,20 @@ locals { sdk_layer_arns_amd64 = { - "ap-northeast-1" = "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "ap-northeast-2" = "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "ap-south-1" = "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "ap-southeast-1" = "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "ap-southeast-2" = "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "ca-central-1" = "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "eu-central-1" = "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "eu-north-1" = "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "eu-west-1" = "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "eu-west-2" = "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "eu-west-3" = "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "sa-east-1" = "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "us-east-1" = "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "us-east-2" = "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "us-west-1" = "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" - "us-west-2" = "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-0:1" + "ap-northeast-1" = "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "ap-northeast-2" = "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "ap-south-1" = "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "ap-southeast-1" = "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "ap-southeast-2" = "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "ca-central-1" = "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "eu-central-1" = "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "eu-north-1" = "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "eu-west-1" = "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "eu-west-2" = "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "eu-west-3" = "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "sa-east-1" = "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "us-east-1" = "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "us-east-2" = "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "us-west-1" = "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" + "us-west-2" = "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-amd64-ver-1-30-1:1" } } diff --git a/nodejs/sample-apps/aws-sdk/deploy/wrapper/layer_arm64.tf b/nodejs/sample-apps/aws-sdk/deploy/wrapper/layer_arm64.tf index e869bd353..bb759b53b 100644 --- a/nodejs/sample-apps/aws-sdk/deploy/wrapper/layer_arm64.tf +++ b/nodejs/sample-apps/aws-sdk/deploy/wrapper/layer_arm64.tf @@ -1,20 +1,20 @@ locals { sdk_layer_arns_arm64 = { - "ap-northeast-1" = "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "ap-northeast-2" = "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "ap-south-1" = "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "ap-southeast-1" = "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "ap-southeast-2" = "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "ca-central-1" = "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "eu-central-1" = "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "eu-north-1" = "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "eu-west-1" = "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "eu-west-2" = "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "eu-west-3" = "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "sa-east-1" = "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "us-east-1" = "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "us-east-2" = "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "us-west-1" = "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" - "us-west-2" = "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-0:1" + "ap-northeast-1" = "arn:aws:lambda:ap-northeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "ap-northeast-2" = "arn:aws:lambda:ap-northeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "ap-south-1" = "arn:aws:lambda:ap-south-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "ap-southeast-1" = "arn:aws:lambda:ap-southeast-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "ap-southeast-2" = "arn:aws:lambda:ap-southeast-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "ca-central-1" = "arn:aws:lambda:ca-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "eu-central-1" = "arn:aws:lambda:eu-central-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "eu-north-1" = "arn:aws:lambda:eu-north-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "eu-west-1" = "arn:aws:lambda:eu-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "eu-west-2" = "arn:aws:lambda:eu-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "eu-west-3" = "arn:aws:lambda:eu-west-3:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "sa-east-1" = "arn:aws:lambda:sa-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "us-east-1" = "arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "us-east-2" = "arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "us-west-1" = "arn:aws:lambda:us-west-1:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" + "us-west-2" = "arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-nodejs-arm64-ver-1-30-1:1" } } diff --git a/nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf b/nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf index 93945b9aa..382b5f9bf 100644 --- a/nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf +++ b/nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf @@ -14,6 +14,7 @@ module "app" { collector_layer_arn = null sdk_layer_arn = local.architecture_to_arns_mapping[var.architecture][data.aws_region.current.name] tracing_mode = "Active" + runtime = var.runtime architecture = var.architecture } diff --git a/nodejs/sample-apps/aws-sdk/deploy/wrapper/variables.tf b/nodejs/sample-apps/aws-sdk/deploy/wrapper/variables.tf index 99f903ff7..33216b3c9 100644 --- a/nodejs/sample-apps/aws-sdk/deploy/wrapper/variables.tf +++ b/nodejs/sample-apps/aws-sdk/deploy/wrapper/variables.tf @@ -9,3 +9,9 @@ variable "architecture" { description = "Lambda function architecture, either arm64 or x86_64" default = "x86_64" } + +variable "runtime" { + type = string + description = "NodeJS runtime version used for sample Lambda Function" + default = "nodejs18.x" +}