From 70bc5a1de872af9c44cdef8509bff25c850ba351 Mon Sep 17 00:00:00 2001
From: Ping Xiang <64551395+pxaws@users.noreply.github.com>
Date: Thu, 13 Feb 2025 17:26:44 -0800
Subject: [PATCH 1/7] Shorten remote deployment names

---
 terraform/dotnet/eks/linux/main.tf                       | 2 +-
 .../k8s/deploy/resources/dotnet-remote-service-depl.yaml | 2 +-
 terraform/java/eks-otlp-ocb/main.tf                      | 2 +-
 terraform/java/eks/main.tf                               | 9 ++++++---
 .../java/k8s/deploy/resources/remote-service-depl.yaml   | 2 +-
 terraform/node/eks/main.tf                               | 2 +-
 .../node/k8s/deploy/resources/remote-service-depl.yaml   | 2 +-
 terraform/python/eks/main.tf                             | 2 +-
 .../k8s/deploy/resources/python-remote-service-depl.yaml | 2 +-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/terraform/dotnet/eks/linux/main.tf b/terraform/dotnet/eks/linux/main.tf
index dc717ec6e..5e06eeb74 100644
--- a/terraform/dotnet/eks/linux/main.tf
+++ b/terraform/dotnet/eks/linux/main.tf
@@ -153,7 +153,7 @@ resource "kubernetes_service" "dotnet_app_service" {
 resource "kubernetes_deployment" "dotnet_r_app_deployment" {
 
   metadata {
-    name      = "dotnet-r-app-deployment-${var.test_id}"
+    name      = "dotnet-remote-${var.test_id}"
     namespace = var.test_namespace
     labels    = {
       app = "remote-app"
diff --git a/terraform/dotnet/k8s/deploy/resources/dotnet-remote-service-depl.yaml b/terraform/dotnet/k8s/deploy/resources/dotnet-remote-service-depl.yaml
index b3e9c1163..9a5d889d4 100644
--- a/terraform/dotnet/k8s/deploy/resources/dotnet-remote-service-depl.yaml
+++ b/terraform/dotnet/k8s/deploy/resources/dotnet-remote-service-depl.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: dotnet-sample-r-app-deployment-${TESTING_ID}
+  name: remote-${TESTING_ID}
   namespace: dotnet-sample-app-namespace
 spec:
   replicas: 1
diff --git a/terraform/java/eks-otlp-ocb/main.tf b/terraform/java/eks-otlp-ocb/main.tf
index 96b244de1..f150e389e 100644
--- a/terraform/java/eks-otlp-ocb/main.tf
+++ b/terraform/java/eks-otlp-ocb/main.tf
@@ -154,7 +154,7 @@ resource "kubernetes_service" "sample_app_service" {
 resource "kubernetes_deployment" "sample_remote_app_deployment" {
 
   metadata {
-    name      = "sample-r-app-deployment-${var.test_id}"
+    name      = "sample-remote-${var.test_id}"
     namespace = var.test_namespace
     labels    = {
       app = "remote-app"
diff --git a/terraform/java/eks/main.tf b/terraform/java/eks/main.tf
index 1a9a738d9..ae0062893 100644
--- a/terraform/java/eks/main.tf
+++ b/terraform/java/eks/main.tf
@@ -205,11 +205,14 @@ resource "kubernetes_deployment" "sample_remote_app_deployment" {
   }
 }
 
-resource "kubernetes_service" "sample_remote_app_service" {
+resource "kubernetes_service" "sample_remote_app_deployment" {
   depends_on = [ kubernetes_deployment.sample_remote_app_deployment ]
 
   metadata {
-    name = "sample-remote-app-service"
+    # use the same name as the deployment to handle the edge case when the deployment name is longer than 47 characters
+    # in this edge case, we just use the service name (rather than deployment name) as RemoteService
+    # see https://github.com/aws/amazon-cloudwatch-agent/pull/1553
+    name      = "sample-r-app-deployment-${var.test_id}"
     namespace = var.test_namespace
   }
   spec {
@@ -260,4 +263,4 @@ resource "kubernetes_deployment" "traffic_generator" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/terraform/java/k8s/deploy/resources/remote-service-depl.yaml b/terraform/java/k8s/deploy/resources/remote-service-depl.yaml
index b70e985d1..c5d25a537 100644
--- a/terraform/java/k8s/deploy/resources/remote-service-depl.yaml
+++ b/terraform/java/k8s/deploy/resources/remote-service-depl.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: sample-r-app-deployment-${TESTING_ID}
+  name: sample-remote-${TESTING_ID}
   namespace: sample-app-namespace
 spec:
   replicas: 1
diff --git a/terraform/node/eks/main.tf b/terraform/node/eks/main.tf
index d2864af7c..ee79bc8f0 100644
--- a/terraform/node/eks/main.tf
+++ b/terraform/node/eks/main.tf
@@ -165,7 +165,7 @@ resource "kubernetes_service" "sample_app_service" {
 resource "kubernetes_deployment" "sample_remote_app_deployment" {
 
   metadata {
-    name      = "sample-r-app-deployment-${var.test_id}"
+    name      = "sample-remote-${var.test_id}"
     namespace = var.test_namespace
     labels    = {
       app = "remote-app"
diff --git a/terraform/node/k8s/deploy/resources/remote-service-depl.yaml b/terraform/node/k8s/deploy/resources/remote-service-depl.yaml
index 02c570dd9..832366ad2 100644
--- a/terraform/node/k8s/deploy/resources/remote-service-depl.yaml
+++ b/terraform/node/k8s/deploy/resources/remote-service-depl.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: sample-r-app-deployment-${TESTING_ID}
+  name: sample-remote-${TESTING_ID}
   namespace: sample-app-namespace
 spec:
   replicas: 1
diff --git a/terraform/python/eks/main.tf b/terraform/python/eks/main.tf
index 0fbafde7f..b80204298 100644
--- a/terraform/python/eks/main.tf
+++ b/terraform/python/eks/main.tf
@@ -170,7 +170,7 @@ resource "kubernetes_service" "python_app_service" {
 resource "kubernetes_deployment" "python_r_app_deployment" {
 
   metadata {
-    name      = "python-r-app-deployment-${var.test_id}"
+    name      = "python-remote-${var.test_id}"
     namespace = var.test_namespace
     labels    = {
       app = "remote-app"
diff --git a/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml b/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml
index b8e4d2e6e..bb0e7fc50 100644
--- a/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml
+++ b/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: python-sample-r-app-deployment-${TESTING_ID}
+  name: python-remote-${TESTING_ID}
   namespace: python-sample-app-namespace
 spec:
   replicas: 1

From 0e970692093ccf42b106151410abdadf694cc79d Mon Sep 17 00:00:00 2001
From: Ping Xiang <pinxiang@amazon.com>
Date: Fri, 14 Feb 2025 17:18:00 +0000
Subject: [PATCH 2/7] test java eks

---
 .github/workflows/test-java.yml | 34 +++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/workflows/test-java.yml

diff --git a/.github/workflows/test-java.yml b/.github/workflows/test-java.yml
new file mode 100644
index 000000000..a44c11bcb
--- /dev/null
+++ b/.github/workflows/test-java.yml
@@ -0,0 +1,34 @@
+## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+## SPDX-License-Identifier: Apache-2.0
+
+## This workflow aims to run the Application Signals end-to-end tests as a canary to
+## test the artifacts for App Signals enablement. It will deploy a sample app and remote
+## service onto an EKS cluster, call the APIs, and validate the generated telemetry,
+## including logs, metrics, and traces.
+name: Test Java
+on:
+  # schedule:
+  #   - cron: '8,33 * * * *' # run the workflow at 8th and 33th minute of every hour
+  workflow_dispatch: # be able to run the workflow on demand
+  push:
+    branches:
+      - rename-remote-service
+
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  eks:
+    strategy:
+      fail-fast: false
+      matrix:
+        aws-region: ['us-east-1']
+    uses: ./.github/workflows/java-eks-retry.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ matrix.aws-region }}
+      test-cluster-name: 'e2e-playground'
+      caller-workflow-name: 'appsignals-e2e-eks-canary-test'
+      java-version: '11'

From d668478fea4783958b299198c3b0b47d241729b1 Mon Sep 17 00:00:00 2001
From: Ping Xiang <pinxiang@amazon.com>
Date: Fri, 14 Feb 2025 18:46:42 +0000
Subject: [PATCH 3/7] test python eks

---
 .github/workflows/test-java.yml   |  8 ++++----
 .github/workflows/test-python.yml | 34 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/test-python.yml

diff --git a/.github/workflows/test-java.yml b/.github/workflows/test-java.yml
index a44c11bcb..1e416a34c 100644
--- a/.github/workflows/test-java.yml
+++ b/.github/workflows/test-java.yml
@@ -5,14 +5,14 @@
 ## test the artifacts for App Signals enablement. It will deploy a sample app and remote
 ## service onto an EKS cluster, call the APIs, and validate the generated telemetry,
 ## including logs, metrics, and traces.
-name: Test Java
+name: Test Python
 on:
   # schedule:
   #   - cron: '8,33 * * * *' # run the workflow at 8th and 33th minute of every hour
   workflow_dispatch: # be able to run the workflow on demand
-  push:
-    branches:
-      - rename-remote-service
+  # push:
+  #   branches:
+  #     - rename-remote-service
 
 
 permissions:
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
new file mode 100644
index 000000000..38286b42e
--- /dev/null
+++ b/.github/workflows/test-python.yml
@@ -0,0 +1,34 @@
+## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+## SPDX-License-Identifier: Apache-2.0
+
+## This workflow aims to run the Application Signals Python end-to-end tests as a canary to
+## test the artifacts for Application Signals enablement. It will deploy a sample app and remote
+## service onto an EKS cluster, call the APIs, and validate the generated telemetry,
+## including logs, metrics, and traces.
+name: Python EKS Test
+on:
+  # schedule:
+  #   - cron: '18,43 * * * *' # run the workflow at 18th and 43th minute of every hour
+  # workflow_dispatch: # be able to run the workflow on demand
+  push:
+    branches:
+      - rename-remote-service
+
+permissions:
+  id-token: write
+  contents: read
+
+
+jobs:
+  eks:
+    strategy:
+      fail-fast: false
+      matrix:
+        aws-region: ['us-east-1']
+    uses: ./.github/workflows/python-eks-retry.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ matrix.aws-region }}
+      test-cluster-name: 'e2e-playground'
+      caller-workflow-name: 'appsignals-python-e2e-eks-canary-test'
+      python-version: '3.10'

From 5af1c77a0be5f4fafa16fbf942e0566558b444a8 Mon Sep 17 00:00:00 2001
From: Ping Xiang <pinxiang@amazon.com>
Date: Fri, 14 Feb 2025 18:56:08 +0000
Subject: [PATCH 4/7] test node eks

---
 .github/workflows/test-node.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .github/workflows/test-node.yml

diff --git a/.github/workflows/test-node.yml b/.github/workflows/test-node.yml
new file mode 100644
index 000000000..9c5c71fd3
--- /dev/null
+++ b/.github/workflows/test-node.yml
@@ -0,0 +1,32 @@
+## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+## SPDX-License-Identifier: Apache-2.0
+
+## This workflow aims to run the Application Signals end-to-end tests as a canary to
+## test the artifacts for App Signals enablement. It will deploy a sample app and remote
+## service onto an EKS cluster, call the APIs, and validate the generated telemetry,
+## including logs, metrics, and traces.
+name: Node EKS Enablement Canary Testing
+on:
+  # schedule:
+  #   - cron: '12,37 * * * *' # run the workflow at 12th and 37th minute of every hour
+  # workflow_dispatch: # be able to run the workflow on demand
+  push:
+    branches:
+      - rename-remote-service
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  eks:
+    strategy:
+      fail-fast: false
+      matrix:
+        aws-region: ['us-east-1']
+    uses: ./.github/workflows/node-eks-retry.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ matrix.aws-region }}
+      test-cluster-name: 'e2e-playground'
+      caller-workflow-name: 'appsignals-node-e2e-eks-canary-test'

From 33230e4b5c094f20542df8ca5d7c70db3914d17b Mon Sep 17 00:00:00 2001
From: Ping Xiang <pinxiang@amazon.com>
Date: Fri, 14 Feb 2025 19:38:15 +0000
Subject: [PATCH 5/7] test dotnet eks

---
 .github/workflows/test-dotnet.yml | 37 +++++++++++++++++++++++++++++++
 .github/workflows/test-node.yml   |  8 +++----
 .github/workflows/test-python.yml |  8 +++----
 3 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/test-dotnet.yml

diff --git a/.github/workflows/test-dotnet.yml b/.github/workflows/test-dotnet.yml
new file mode 100644
index 000000000..e02392598
--- /dev/null
+++ b/.github/workflows/test-dotnet.yml
@@ -0,0 +1,37 @@
+## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+## SPDX-License-Identifier: Apache-2.0
+
+## This workflow aims to run the Application Signals DotNet end-to-end tests as a canary to
+## test the artifacts for Application Signals enablement. It will deploy a sample app and remote
+## service onto an EKS cluster, call the APIs, and validate the generated telemetry,
+## including logs, metrics, and traces.
+name: Dotnet EKS Test
+on:
+  # schedule:
+  #   - cron: '4,29 * * * *' # run the workflow at 4th and 29th minute of every hour
+  # workflow_dispatch: # be able to run the workflow on demand
+  push:
+    branches:
+      - rename-remote-service
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
+
+permissions:
+  id-token: write
+  contents: read
+
+
+jobs:
+  eks:
+    strategy:
+      fail-fast: false
+      matrix:
+        aws-region: ['us-east-1']
+    uses: ./.github/workflows/dotnet-eks-retry.yml
+    secrets: inherit
+    with:
+      aws-region: ${{ matrix.aws-region }}
+      test-cluster-name: 'e2e-playground'
+      caller-workflow-name: 'appsignals-dotnet-e2e-eks-canary-test'
\ No newline at end of file
diff --git a/.github/workflows/test-node.yml b/.github/workflows/test-node.yml
index 9c5c71fd3..1dfd05368 100644
--- a/.github/workflows/test-node.yml
+++ b/.github/workflows/test-node.yml
@@ -9,10 +9,10 @@ name: Node EKS Enablement Canary Testing
 on:
   # schedule:
   #   - cron: '12,37 * * * *' # run the workflow at 12th and 37th minute of every hour
-  # workflow_dispatch: # be able to run the workflow on demand
-  push:
-    branches:
-      - rename-remote-service
+  workflow_dispatch: # be able to run the workflow on demand
+  # push:
+  #   branches:
+  #     - rename-remote-service
 
 permissions:
   id-token: write
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
index 38286b42e..fd3ad7d46 100644
--- a/.github/workflows/test-python.yml
+++ b/.github/workflows/test-python.yml
@@ -9,10 +9,10 @@ name: Python EKS Test
 on:
   # schedule:
   #   - cron: '18,43 * * * *' # run the workflow at 18th and 43th minute of every hour
-  # workflow_dispatch: # be able to run the workflow on demand
-  push:
-    branches:
-      - rename-remote-service
+  workflow_dispatch: # be able to run the workflow on demand
+  # push:
+  #   branches:
+  #     - rename-remote-service
 
 permissions:
   id-token: write

From c43340e5a3acc56cf1e0df7d0bcc1704d35d4bc1 Mon Sep 17 00:00:00 2001
From: Ping Xiang <pinxiang@amazon.com>
Date: Fri, 14 Feb 2025 20:28:16 +0000
Subject: [PATCH 6/7] remove test workflows

---
 .github/workflows/test-dotnet.yml | 37 -------------------------------
 .github/workflows/test-java.yml   | 34 ----------------------------
 .github/workflows/test-node.yml   | 32 --------------------------
 .github/workflows/test-python.yml | 34 ----------------------------
 4 files changed, 137 deletions(-)
 delete mode 100644 .github/workflows/test-dotnet.yml
 delete mode 100644 .github/workflows/test-java.yml
 delete mode 100644 .github/workflows/test-node.yml
 delete mode 100644 .github/workflows/test-python.yml

diff --git a/.github/workflows/test-dotnet.yml b/.github/workflows/test-dotnet.yml
deleted file mode 100644
index e02392598..000000000
--- a/.github/workflows/test-dotnet.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-## SPDX-License-Identifier: Apache-2.0
-
-## This workflow aims to run the Application Signals DotNet end-to-end tests as a canary to
-## test the artifacts for Application Signals enablement. It will deploy a sample app and remote
-## service onto an EKS cluster, call the APIs, and validate the generated telemetry,
-## including logs, metrics, and traces.
-name: Dotnet EKS Test
-on:
-  # schedule:
-  #   - cron: '4,29 * * * *' # run the workflow at 4th and 29th minute of every hour
-  # workflow_dispatch: # be able to run the workflow on demand
-  push:
-    branches:
-      - rename-remote-service
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: false
-
-permissions:
-  id-token: write
-  contents: read
-
-
-jobs:
-  eks:
-    strategy:
-      fail-fast: false
-      matrix:
-        aws-region: ['us-east-1']
-    uses: ./.github/workflows/dotnet-eks-retry.yml
-    secrets: inherit
-    with:
-      aws-region: ${{ matrix.aws-region }}
-      test-cluster-name: 'e2e-playground'
-      caller-workflow-name: 'appsignals-dotnet-e2e-eks-canary-test'
\ No newline at end of file
diff --git a/.github/workflows/test-java.yml b/.github/workflows/test-java.yml
deleted file mode 100644
index 1e416a34c..000000000
--- a/.github/workflows/test-java.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-## SPDX-License-Identifier: Apache-2.0
-
-## This workflow aims to run the Application Signals end-to-end tests as a canary to
-## test the artifacts for App Signals enablement. It will deploy a sample app and remote
-## service onto an EKS cluster, call the APIs, and validate the generated telemetry,
-## including logs, metrics, and traces.
-name: Test Python
-on:
-  # schedule:
-  #   - cron: '8,33 * * * *' # run the workflow at 8th and 33th minute of every hour
-  workflow_dispatch: # be able to run the workflow on demand
-  # push:
-  #   branches:
-  #     - rename-remote-service
-
-
-permissions:
-  id-token: write
-  contents: read
-
-jobs:
-  eks:
-    strategy:
-      fail-fast: false
-      matrix:
-        aws-region: ['us-east-1']
-    uses: ./.github/workflows/java-eks-retry.yml
-    secrets: inherit
-    with:
-      aws-region: ${{ matrix.aws-region }}
-      test-cluster-name: 'e2e-playground'
-      caller-workflow-name: 'appsignals-e2e-eks-canary-test'
-      java-version: '11'
diff --git a/.github/workflows/test-node.yml b/.github/workflows/test-node.yml
deleted file mode 100644
index 1dfd05368..000000000
--- a/.github/workflows/test-node.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-## SPDX-License-Identifier: Apache-2.0
-
-## This workflow aims to run the Application Signals end-to-end tests as a canary to
-## test the artifacts for App Signals enablement. It will deploy a sample app and remote
-## service onto an EKS cluster, call the APIs, and validate the generated telemetry,
-## including logs, metrics, and traces.
-name: Node EKS Enablement Canary Testing
-on:
-  # schedule:
-  #   - cron: '12,37 * * * *' # run the workflow at 12th and 37th minute of every hour
-  workflow_dispatch: # be able to run the workflow on demand
-  # push:
-  #   branches:
-  #     - rename-remote-service
-
-permissions:
-  id-token: write
-  contents: read
-
-jobs:
-  eks:
-    strategy:
-      fail-fast: false
-      matrix:
-        aws-region: ['us-east-1']
-    uses: ./.github/workflows/node-eks-retry.yml
-    secrets: inherit
-    with:
-      aws-region: ${{ matrix.aws-region }}
-      test-cluster-name: 'e2e-playground'
-      caller-workflow-name: 'appsignals-node-e2e-eks-canary-test'
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
deleted file mode 100644
index fd3ad7d46..000000000
--- a/.github/workflows/test-python.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-## Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-## SPDX-License-Identifier: Apache-2.0
-
-## This workflow aims to run the Application Signals Python end-to-end tests as a canary to
-## test the artifacts for Application Signals enablement. It will deploy a sample app and remote
-## service onto an EKS cluster, call the APIs, and validate the generated telemetry,
-## including logs, metrics, and traces.
-name: Python EKS Test
-on:
-  # schedule:
-  #   - cron: '18,43 * * * *' # run the workflow at 18th and 43th minute of every hour
-  workflow_dispatch: # be able to run the workflow on demand
-  # push:
-  #   branches:
-  #     - rename-remote-service
-
-permissions:
-  id-token: write
-  contents: read
-
-
-jobs:
-  eks:
-    strategy:
-      fail-fast: false
-      matrix:
-        aws-region: ['us-east-1']
-    uses: ./.github/workflows/python-eks-retry.yml
-    secrets: inherit
-    with:
-      aws-region: ${{ matrix.aws-region }}
-      test-cluster-name: 'e2e-playground'
-      caller-workflow-name: 'appsignals-python-e2e-eks-canary-test'
-      python-version: '3.10'

From e61403cb68652f72fa3c513a9c1e17ffc437ee92 Mon Sep 17 00:00:00 2001
From: Ping Xiang <pinxiang@amazon.com>
Date: Fri, 14 Feb 2025 21:49:40 +0000
Subject: [PATCH 7/7] remove k8s changes

---
 .../dotnet/k8s/deploy/resources/dotnet-remote-service-depl.yaml | 2 +-
 terraform/java/k8s/deploy/resources/remote-service-depl.yaml    | 2 +-
 terraform/node/k8s/deploy/resources/remote-service-depl.yaml    | 2 +-
 .../python/k8s/deploy/resources/python-remote-service-depl.yaml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/terraform/dotnet/k8s/deploy/resources/dotnet-remote-service-depl.yaml b/terraform/dotnet/k8s/deploy/resources/dotnet-remote-service-depl.yaml
index 9a5d889d4..b3e9c1163 100644
--- a/terraform/dotnet/k8s/deploy/resources/dotnet-remote-service-depl.yaml
+++ b/terraform/dotnet/k8s/deploy/resources/dotnet-remote-service-depl.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: remote-${TESTING_ID}
+  name: dotnet-sample-r-app-deployment-${TESTING_ID}
   namespace: dotnet-sample-app-namespace
 spec:
   replicas: 1
diff --git a/terraform/java/k8s/deploy/resources/remote-service-depl.yaml b/terraform/java/k8s/deploy/resources/remote-service-depl.yaml
index c5d25a537..b70e985d1 100644
--- a/terraform/java/k8s/deploy/resources/remote-service-depl.yaml
+++ b/terraform/java/k8s/deploy/resources/remote-service-depl.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: sample-remote-${TESTING_ID}
+  name: sample-r-app-deployment-${TESTING_ID}
   namespace: sample-app-namespace
 spec:
   replicas: 1
diff --git a/terraform/node/k8s/deploy/resources/remote-service-depl.yaml b/terraform/node/k8s/deploy/resources/remote-service-depl.yaml
index 832366ad2..02c570dd9 100644
--- a/terraform/node/k8s/deploy/resources/remote-service-depl.yaml
+++ b/terraform/node/k8s/deploy/resources/remote-service-depl.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: sample-remote-${TESTING_ID}
+  name: sample-r-app-deployment-${TESTING_ID}
   namespace: sample-app-namespace
 spec:
   replicas: 1
diff --git a/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml b/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml
index bb0e7fc50..b8e4d2e6e 100644
--- a/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml
+++ b/terraform/python/k8s/deploy/resources/python-remote-service-depl.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: python-remote-${TESTING_ID}
+  name: python-sample-r-app-deployment-${TESTING_ID}
   namespace: python-sample-app-namespace
 spec:
   replicas: 1