Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.24.3'
go-version: '~1.26.2'
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
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.24.3'
go-version: '~1.26.2'
check-latest: true
- uses: actions/setup-java@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build-nodejs.yml
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.24.3'
go-version: '~1.26.2'
check-latest: true
- uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build-python.yml
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.24.3'
go-version: '~1.26.2'
check-latest: true
- uses: actions/setup-python@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build.yml
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.24.3'
go-version: '~1.26.2'
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
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.24.3'
go-version: '~1.26.2'
check-latest: true
- uses: actions/setup-java@v4
if: ${{ matrix.language == 'java' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ jobs:
# above, always setup go 1.18.
# if: ${{ env.TEST_LANGUAGE == 'go' }}
with:
go-version: '~1.24.3'
go-version: '~1.26.2'
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
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.24.3'
go-version: '~1.26.2'
check-latest: true
- uses: actions/setup-java@v4
if: ${{ matrix.language == 'java' }}
Expand Down
3 changes: 0 additions & 3 deletions adot/collector/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ service:
metrics:
receivers: [otlp]
exporters: [debug]
telemetry:
metrics:
address: localhost:8888
9 changes: 7 additions & 2 deletions adot/utils/expected-templates/nodejs-aws-sdk-wrapper.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
"name": "lambda-nodejs.*"
},
{
"name": "s3"
"name": "STS",
"origin": "AWS::STS",
"inferred": true,
"aws": {
"operation": "GetCallerIdentity"
}
}
]
]
3 changes: 0 additions & 3 deletions java/integration-tests/aws-sdk/agent/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ service:
metrics:
receivers: [otlp]
exporters: [debug, prometheusremotewrite]
telemetry:
metrics:
address: localhost:8888
EOT
filename = "config.yaml"
}
Expand Down
50 changes: 41 additions & 9 deletions nodejs/integration-tests/aws-sdk/wrapper/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,54 @@ resource "aws_lambda_layer_version" "collector_layer" {
source_code_hash = filebase64sha256("${path.module}/../../../../opentelemetry-lambda/collector/build/opentelemetry-collector-layer-${local.architecture}.zip")
}

module "hello-lambda-function" {
source = "../../../../opentelemetry-lambda/nodejs/sample-apps/aws-sdk/deploy/wrapper"
# NOTE: The upstream `nodejs/sample-apps/aws-sdk/deploy/wrapper` module was
# refactored (OTel Collector v0.151.0) to build layer ARNs internally from
# published layer versions and no longer accepts `collector_layer_arn` /
# `sdk_layer_arn` inputs. The integration/soak test must attach the layers we
# just built locally, so we instantiate the Lambda function directly here -
# mirroring the python integration test - instead of consuming that module.
module "test-function" {
source = "terraform-aws-modules/lambda/aws"
version = "7.19.0"

architectures = compact([var.architecture])
function_name = var.function_name
handler = "index.handler"
runtime = var.runtime

create_package = false
local_existing_package = "${path.module}/../../../../opentelemetry-lambda/nodejs/sample-apps/aws-sdk/build/function.zip"

memory_size = 384
timeout = 20

layers = compact([
var.enable_collector_layer ? aws_lambda_layer_version.collector_layer[0].arn : null,
aws_lambda_layer_version.sdk_layer.arn
])

environment_variables = {
AWS_LAMBDA_EXEC_WRAPPER = "/opt/otel-handler"
}

tracing_mode = var.tracing_mode
}

module "api-gateway" {
source = "../../../../opentelemetry-lambda/utils/terraform/api-gateway-proxy"

name = var.function_name
architecture = var.architecture
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
function_name = module.test-function.lambda_function_name
function_invoke_arn = module.test-function.lambda_function_invoke_arn
enable_xray_tracing = var.tracing_mode == "Active"
}

resource "aws_iam_role_policy_attachment" "hello-lambda-cloudwatch-insights" {
role = module.hello-lambda-function.function_role_name
role = module.test-function.lambda_role_name
policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
}

resource "aws_iam_role_policy_attachment" "test_xray" {
role = module.hello-lambda-function.function_role_name
role = module.test-function.lambda_role_name
policy_arn = "arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess"
}
4 changes: 2 additions & 2 deletions nodejs/integration-tests/aws-sdk/wrapper/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
output "api-gateway-url" {
value = module.hello-lambda-function.api-gateway-url
value = module.api-gateway.api_gateway_url
}

output "function_role_name" {
value = module.hello-lambda-function.function_role_name
value = module.test-function.lambda_role_name
}

output "collector_layer_arn" {
Expand Down
Loading