From a2a33244a3ab17da403abaae765ac228bd3fe539 Mon Sep 17 00:00:00 2001
From: Jonathan Lee <jjllee@amazon.com>
Date: Wed, 14 Jan 2026 11:41:11 -0800
Subject: [PATCH] fix main build

---
 .github/workflows/main-build-java.yml                 | 5 +++++
 .github/workflows/main-build-nodejs.yml               | 5 +++++
 adot/collector/config.yaml                            | 3 ---
 adot/utils/expected-templates/go-aws-sdk-wrapper.json | 2 +-
 java/integration-tests/aws-sdk/agent-confmap/main.tf  | 3 ---
 java/integration-tests/aws-sdk/agent/main.tf          | 3 ---
 python/integration-tests/aws-sdk/wrapper/main.tf      | 4 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main-build-java.yml b/.github/workflows/main-build-java.yml
index 126b762cb..6307eb7f7 100644
--- a/.github/workflows/main-build-java.yml
+++ b/.github/workflows/main-build-java.yml
@@ -114,6 +114,11 @@ jobs:
           echo "uuid=$UUID" >> $GITHUB_OUTPUT
       - name: Patch ADOT
         run: ./patch-upstream.sh
+      - name: Pin Java Sample app only for test-compatibility
+        run: |
+          cd opentelemetry-lambda
+          git fetch --unshallow
+          git checkout 5cc158009047d6c5cdc9fad69b4a28e75c7c92f7 -- java/
       - name: Build layers / functions
         run: GOARCH=${{ matrix.architecture }} ./build.sh ${{ matrix.architecture }}
         working-directory: java
diff --git a/.github/workflows/main-build-nodejs.yml b/.github/workflows/main-build-nodejs.yml
index d99e6534d..022540adb 100644
--- a/.github/workflows/main-build-nodejs.yml
+++ b/.github/workflows/main-build-nodejs.yml
@@ -56,6 +56,11 @@ jobs:
           echo "uuid=$UUID" >> $GITHUB_OUTPUT
       - name: Patch ADOT
         run: ./patch-upstream.sh
+      - name: Pin Node.js Sample app only for test-compatibility
+        run: |
+          cd opentelemetry-lambda
+          git fetch --unshallow
+          git checkout 5cc158009047d6c5cdc9fad69b4a28e75c7c92f7 -- nodejs/
       - name: Login to Public ECR
         uses: docker/login-action@v3
         with:
diff --git a/adot/collector/config.yaml b/adot/collector/config.yaml
index 195b2a678..4e252032e 100644
--- a/adot/collector/config.yaml
+++ b/adot/collector/config.yaml
@@ -18,6 +18,3 @@ service:
     metrics:
       receivers: [otlp]
       exporters: [debug]
-  telemetry:
-    metrics:
-      address: localhost:8888
diff --git a/adot/utils/expected-templates/go-aws-sdk-wrapper.json b/adot/utils/expected-templates/go-aws-sdk-wrapper.json
index 774f89c69..4a7bea4c0 100644
--- a/adot/utils/expected-templates/go-aws-sdk-wrapper.json
+++ b/adot/utils/expected-templates/go-aws-sdk-wrapper.json
@@ -20,7 +20,7 @@
     }
   },
   {
-    "name":"api.github.com",
+    "name":"HTTP GET",
     "inferred":true,
     "http":{
       "request":{
diff --git a/java/integration-tests/aws-sdk/agent-confmap/main.tf b/java/integration-tests/aws-sdk/agent-confmap/main.tf
index 2c341b138..e9881a093 100644
--- a/java/integration-tests/aws-sdk/agent-confmap/main.tf
+++ b/java/integration-tests/aws-sdk/agent-confmap/main.tf
@@ -96,9 +96,6 @@ service:
     metrics:
       receivers: [otlp]
       exporters: [debug, prometheusremotewrite]
-  telemetry:
-    metrics:
-      address: localhost:8888
 EOT
     filename = "config.yaml"
   }
diff --git a/java/integration-tests/aws-sdk/agent/main.tf b/java/integration-tests/aws-sdk/agent/main.tf
index 51c913f1e..51f0e8d2c 100644
--- a/java/integration-tests/aws-sdk/agent/main.tf
+++ b/java/integration-tests/aws-sdk/agent/main.tf
@@ -79,9 +79,6 @@ service:
     metrics:
       receivers: [otlp]
       exporters: [debug, prometheusremotewrite]
-  telemetry:
-    metrics:
-      address: localhost:8888
 EOT
     filename = "config.yaml"
   }
diff --git a/python/integration-tests/aws-sdk/wrapper/main.tf b/python/integration-tests/aws-sdk/wrapper/main.tf
index 8d3ad1910..c2dff4f7c 100644
--- a/python/integration-tests/aws-sdk/wrapper/main.tf
+++ b/python/integration-tests/aws-sdk/wrapper/main.tf
@@ -68,11 +68,11 @@ module "api-gateway" {
 }
 
 resource "aws_iam_role_policy_attachment" "hello-lambda-cloudwatch-insights" {
-  role       = module.test-function.lambda_function_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.test-function.lambda_function_name
+  role       = module.test-function.lambda_role_name
   policy_arn = "arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess"
 }