From 9c3980f9cacc1223d9989c4f5670b3e1d5878617 Mon Sep 17 00:00:00 2001 From: Vasi Vasireddy Date: Thu, 2 Jan 2025 09:34:11 -0800 Subject: [PATCH 1/3] Update nodejs runtimes in tests and Otel-submodule --- .github/workflows/main-build-nodejs.yml | 4 ++-- go/build.sh | 1 - nodejs/integration-tests/aws-sdk/wrapper/main.tf | 1 + nodejs/integration-tests/aws-sdk/wrapper/variables.tf | 5 +++++ nodejs/wrapper-adot/package.json | 2 +- opentelemetry-lambda | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main-build-nodejs.yml b/.github/workflows/main-build-nodejs.yml index dc7021cc9..fff61c3dc 100644 --- a/.github/workflows/main-build-nodejs.yml +++ b/.github/workflows/main-build-nodejs.yml @@ -23,7 +23,7 @@ jobs: fail-fast: false matrix: architecture: [ amd64, arm64 ] - runtime: [nodejs16.x, nodejs18.x] + runtime: [nodejs18.x, node20.x] steps: - uses: actions/checkout@v4 with: @@ -34,7 +34,7 @@ jobs: check-latest: true - uses: actions/setup-node@v4 with: - node-version: '16' + node-version: '18' - name: Cache (NodeJS) uses: actions/cache@v4 with: diff --git a/go/build.sh b/go/build.sh index cc0fc0ed3..d6ae655a8 100755 --- a/go/build.sh +++ b/go/build.sh @@ -9,5 +9,4 @@ popd || exit # Build sample app cd ../opentelemetry-lambda/go/sample-apps/function || exit -go mod tidy CGO_ENABLED=0 ./build.sh diff --git a/nodejs/integration-tests/aws-sdk/wrapper/main.tf b/nodejs/integration-tests/aws-sdk/wrapper/main.tf index b54dfe988..c50596ec2 100644 --- a/nodejs/integration-tests/aws-sdk/wrapper/main.tf +++ b/nodejs/integration-tests/aws-sdk/wrapper/main.tf @@ -26,6 +26,7 @@ module "hello-lambda-function" { collector_layer_arn = var.enable_collector_layer ? aws_lambda_layer_version.collector_layer[0].arn : null sdk_layer_arn = aws_lambda_layer_version.sdk_layer.arn tracing_mode = var.tracing_mode + runtime = var.runtime } resource "aws_iam_role_policy_attachment" "hello-lambda-cloudwatch-insights" { diff --git a/nodejs/integration-tests/aws-sdk/wrapper/variables.tf b/nodejs/integration-tests/aws-sdk/wrapper/variables.tf index 07393d0fb..58f66f7f4 100644 --- a/nodejs/integration-tests/aws-sdk/wrapper/variables.tf +++ b/nodejs/integration-tests/aws-sdk/wrapper/variables.tf @@ -34,3 +34,8 @@ variable "enable_collector_layer" { default = false } +variable "runtime" { + type = string + description = "NodeJS runtime version used for sample Lambda Function" + default = "nodejs18.x" +} diff --git a/nodejs/wrapper-adot/package.json b/nodejs/wrapper-adot/package.json index c779a8995..60d3500a7 100644 --- a/nodejs/wrapper-adot/package.json +++ b/nodejs/wrapper-adot/package.json @@ -22,7 +22,7 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "devDependencies": { "@opentelemetry/api": "^1.9.0", diff --git a/opentelemetry-lambda b/opentelemetry-lambda index f9111c210..6a8b279f6 160000 --- a/opentelemetry-lambda +++ b/opentelemetry-lambda @@ -1 +1 @@ -Subproject commit f9111c2109e7241757f877250b4616e3c6b011aa +Subproject commit 6a8b279f6f16d3747f2ca509ab53447f763801f1 From 179f1727962b83c72bb1899be775b00c7e4c5056 Mon Sep 17 00:00:00 2001 From: Vasi Vasireddy Date: Thu, 2 Jan 2025 09:56:18 -0800 Subject: [PATCH 2/3] add nodejs22.x in tests --- .github/workflows/main-build-nodejs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main-build-nodejs.yml b/.github/workflows/main-build-nodejs.yml index fff61c3dc..29ac153b2 100644 --- a/.github/workflows/main-build-nodejs.yml +++ b/.github/workflows/main-build-nodejs.yml @@ -23,14 +23,14 @@ jobs: fail-fast: false matrix: architecture: [ amd64, arm64 ] - runtime: [nodejs18.x, node20.x] + runtime: [nodejs18.x, node20.x, nodejs22.x] steps: - uses: actions/checkout@v4 with: submodules: recursive - uses: actions/setup-go@v5 with: - go-version: '~1.21.10' + go-version: '~1.23.4' check-latest: true - uses: actions/setup-node@v4 with: From 424bfd3ecf02a9f260aa74ac57510f053e327c57 Mon Sep 17 00:00:00 2001 From: Vasi Vasireddy Date: Thu, 2 Jan 2025 09:56:36 -0800 Subject: [PATCH 3/3] update go in workflows --- .github/workflows/canary.yml | 2 +- .github/workflows/main-build-java.yml | 2 +- .github/workflows/main-build-python.yml | 2 +- .github/workflows/main-build.yml | 2 +- .github/workflows/pr-build.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/soaking.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 43fbf21e2..f1001a7aa 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -67,7 +67,7 @@ jobs: submodules: recursive - uses: actions/setup-go@v5 with: - go-version: '~1.21.10' + go-version: '~1.23.4' check-latest: true - uses: actions/setup-java@v4 if: ${{ matrix.language == 'java' }} diff --git a/.github/workflows/main-build-java.yml b/.github/workflows/main-build-java.yml index 99570368c..04fce3276 100644 --- a/.github/workflows/main-build-java.yml +++ b/.github/workflows/main-build-java.yml @@ -85,7 +85,7 @@ jobs: submodules: recursive - uses: actions/setup-go@v5 with: - go-version: '~1.21.10' + go-version: '~1.23.4' check-latest: true - uses: actions/setup-java@v4 with: diff --git a/.github/workflows/main-build-python.yml b/.github/workflows/main-build-python.yml index e3f72d2ba..29266ff77 100644 --- a/.github/workflows/main-build-python.yml +++ b/.github/workflows/main-build-python.yml @@ -30,7 +30,7 @@ jobs: submodules: recursive - uses: actions/setup-go@v5 with: - go-version: '~1.21.10' + go-version: '~1.23.4' check-latest: true - uses: actions/setup-python@v5 with: diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index 54296ca59..a550be5b2 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -40,7 +40,7 @@ jobs: submodules: recursive - uses: actions/setup-go@v5 with: - go-version: '~1.21.10' + go-version: '~1.23.4' check-latest: true - uses: actions/setup-dotnet@v4 if: ${{ matrix.language == 'dotnet' }} diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index cb356e2ac..e462a0c29 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -24,7 +24,7 @@ jobs: submodules: true - uses: actions/setup-go@v5 with: - go-version: '~1.21.10' + go-version: '~1.23.4' check-latest: true - uses: actions/setup-java@v4 if: ${{ matrix.language == 'java' }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 13bfab0aa..7e3299682 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -272,7 +272,7 @@ jobs: # above, always setup go 1.18. # if: ${{ env.TEST_LANGUAGE == 'go' }} with: - go-version: '~1.21.10' + go-version: '~1.23.4' check-latest: true - name: download layer tf file uses: actions/download-artifact@v4 diff --git a/.github/workflows/soaking.yml b/.github/workflows/soaking.yml index 62b51b5b8..673c1b042 100644 --- a/.github/workflows/soaking.yml +++ b/.github/workflows/soaking.yml @@ -67,7 +67,7 @@ jobs: submodules: recursive - uses: actions/setup-go@v5 with: - go-version: '~1.21.10' + go-version: '~1.23.4' check-latest: true - uses: actions/setup-java@v4 if: ${{ matrix.language == 'java' }}