fix: put back terraform as a deployment option

Author: maxday

nodejs/sample-apps/aws-sdk/README.md

@@ -22,6 +22,27 @@ Follow these steps to deploy the demo stack via CDK:
 
 ---
 
+## 🚀 Deploy Using Terraform
+
+Follow these steps to deploy the demo stack via Terraform:
+
+1. **Install dependencies**
+   `npm install`
+
+2. **Build the Lambda function artifact**
+   `npm run build`
+
+3. **Move to deploy/wrapper folder**
+   `cd deploy/wrapper`
+
+4. **Terraform init**
+   `terraform init`
+
+5. **Terraform apply**
+   `terraform apply`
+
+---
+
 ## 🛠️ Manual Deployment via AWS Console
 
 If you'd prefer to deploy manually:
@@ -43,9 +64,9 @@ If you'd prefer to deploy manually:
    OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318/  
    OTEL_TRACES_EXPORTER=console
    OTEL_METRICS_EXPORTER=console
-   OTEL_LOG_LEVEL=INFO  
-   OTEL_TRACES_SAMPLER=always_on  
-   AWS_LAMBDA_EXEC_WRAPPER=/opt/otel-handler  
+   OTEL_LOG_LEVEL=INFO
+   OTEL_TRACES_SAMPLER=always_on
+   AWS_LAMBDA_EXEC_WRAPPER=/opt/otel-handler
 ```
 6. **Attach the Node.js instrumentation layer**  
    - Refer to the latest ARN in the OpenTelemetry Lambda releases, ie:  

nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf

@@ -0,0 +1,47 @@
+locals {
+  collector_layer_arn = "arn:aws:lambda:${data.aws_region.current.name}:${var.account_id}:layer:opentelemetry-collector-arm64-0_15_0:1"
+  sdk_layer_arn      = "arn:aws:lambda:${data.aws_region.current.name}:${var.account_id}:layer:opentelemetry-nodejs-0_14_0:1"
+}
+
+data "aws_region" "current" {}
+
+module "hello-lambda-function" {
+  source  = "terraform-aws-modules/lambda/aws"
+  version = "7.21.0"
+
+  architectures = compact([var.architecture])
+  function_name = var.name
+  handler       = "index.handler"
+  runtime       = var.runtime
+
+  create_package         = false
+  local_existing_package = "${path.module}/../../build/function.zip"
+
+  memory_size = 384
+  timeout     = 20
+
+  layers = compact([
+    local.collector_layer_arn,
+    local.sdk_layer_arn
+  ])
+
+  environment_variables = {
+    AWS_LAMBDA_EXEC_WRAPPER     = "/opt/otel-handler"
+    OTEL_TRACES_EXPORTER        = "console"
+    OTEL_METRICS_EXPORTER       = "console"
+    OTEL_LOG_LEVEL              = "DEBUG"
+    OTEL_EXPORTER_OTLP_ENDPOINT = "http://localhost:4318/"
+    OTEL_TRACES_SAMPLER         = "always_on"
+  }
+
+  tracing_mode = var.tracing_mode
+}
+
+module "api-gateway" {
+  source = "../../../../../utils/terraform/api-gateway-proxy"
+
+  name                = var.name
+  function_name       = module.hello-lambda-function.lambda_function_name
+  function_invoke_arn = module.hello-lambda-function.lambda_function_invoke_arn
+  enable_xray_tracing = var.tracing_mode == "Active"
+}

nodejs/sample-apps/aws-sdk/deploy/wrapper/outputs.tf

@@ -0,0 +1,7 @@
+output "api-gateway-url" {
+  value = module.api-gateway.api_gateway_url
+}
+
+output "function_role_name" {
+  value = module.hello-lambda-function.lambda_role_name
+}

nodejs/sample-apps/aws-sdk/deploy/wrapper/variables.tf

@@ -0,0 +1,29 @@
+variable "name" {
+  type        = string
+  description = "Name of created function and API Gateway"
+  default     = "hello-nodejs-awssdk"
+}
+
+variable "account_id" {
+  type        = string
+  description = "AWS account ID where the Lambda layers are published"
+  default     = "184161586896"
+}
+
+variable "tracing_mode" {
+  type        = string
+  description = "Lambda function tracing mode"
+  default     = "PassThrough"
+}
+
+variable "architecture" {
+  type        = string
+  description = "Lambda function architecture, valid values are arm64 or x86_64"
+  default     = "arm64"
+}
+
+variable "runtime" {
+  type        = string
+  description = "NodeJS runtime version used for sample Lambda Function"
+  default     = "nodejs22.x"
+}

nodejs/sample-apps/aws-sdk/lib/otel-sample-lambda-stack.ts

@@ -10,7 +10,7 @@ export class OtelSampleLambdaStack extends cdk.Stack {
     super(scope, id, props);
 
     const region = cdk.Stack.of(this).region;
-    const architecture = 'amd64'; // or 'arm64' for ARM architecture
+    const architecture = lambda.Architecture.ARM_64;
     const collectorLayerArn = `arn:aws:lambda:${region}:${AWS_ACCOUNT_ID}:layer:opentelemetry-collector-${architecture}-0_15_0:1`; // Update with the latest version if needed
     const nodejsInstrumentationLayerArn = `arn:aws:lambda:${region}:${AWS_ACCOUNT_ID}:layer:opentelemetry-nodejs-0_14_0:1`; // Update with the latest version if needed
 
@@ -24,6 +24,7 @@ export class OtelSampleLambdaStack extends cdk.Stack {
       ],
       timeout: cdk.Duration.seconds(30),
       memorySize: 256,
+      architecture,
       environment: {
         OTEL_EXPORTER_OTLP_ENDPOINT: 'http://localhost:4318/',
         OTEL_TRACES_EXPORTER: 'console',

nodejs/sample-apps/aws-sdk/package.json

@@ -12,7 +12,7 @@
     "lint:fix": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .ts --fix",
     "build": "npm run clean && npm run compile && npm run postcompile",
     "compile": "tsc -p .",
-    "postcompile": "copyfiles 'package*.json' build/src/ && npm install --production --ignore-scripts --prefix build/src/ && cd build/src && bestzip ../function.zip *"
+    "postcompile": "copyfiles 'package*.json' build/lambda/ && npm install --production --ignore-scripts --prefix build/lambda/ && cd build/lambda && bestzip ../function.zip *"
   },
   "keywords": [
     "opentelemetry",