Rename service name

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"

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

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"

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" {
       }
     }
   }
-}
+}

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

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"

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

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"

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