[chore] Update upstream otel sub-module, add support for nodejs 22.x runtime (#1031)

vasireddy99 · web-flow · commit 35782f1c3531 · 2025-01-02T10:27:26.000-08:00
* Update nodejs runtimes in tests and Otel-submodule

* add nodejs22.x in tests

* update go in workflows
diff --git 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
@@ -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-nodejs.yml b/.github/workflows/main-build-nodejs.yml
@@ -23,18 +23,18 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [ amd64, arm64 ]
-        runtime: [nodejs16.x, nodejs18.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:
-          node-version: '16'
+          node-version: '18'
       - name: Cache (NodeJS)
         uses: actions/cache@v4
         with:
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-Subproject commit f9111c2109e7241757f877250b4616e3c6b011aa
+Subproject commit 6a8b279f6f16d3747f2ca509ab53447f763801f1

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ module "hello-lambda-function" {`
`26`	`26`	`collector_layer_arn = var.enable_collector_layer ? aws_lambda_layer_version.collector_layer[0].arn : null`
`27`	`27`	`sdk_layer_arn = aws_lambda_layer_version.sdk_layer.arn`
`28`	`28`	`tracing_mode = var.tracing_mode`
	`29`	`+ runtime = var.runtime`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`resource "aws_iam_role_policy_attachment" "hello-lambda-cloudwatch-insights" {`