Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jan 2, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c3980f
Update nodejs runtimes in tests and Otel-submodule
vasireddy99 Jan 2, 2025
179f172
add nodejs22.x in tests
vasireddy99 Jan 2, 2025
424bfd3
update go in workflows
vasireddy99 Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build-java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main-build-nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/soaking.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
1 change: 0 additions & 1 deletion go/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions nodejs/integration-tests/aws-sdk/wrapper/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
5 changes: 5 additions & 0 deletions nodejs/integration-tests/aws-sdk/wrapper/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion nodejs/wrapper-adot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-lambda
Open in desktop
Submodule opentelemetry-lambda updated 6 files
+1 −1 .github/workflows/release-layer-nodejs.yml
+2 −2 collector/Makefile
+1 −1 go/sample-apps/function/go.mod
+0 −1,405 go/sample-apps/function/go.sum
+1 −2 nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf
+7 −0 nodejs/sample-apps/aws-sdk/deploy/wrapper/variables.tf
Loading