From 4fedba10b740e23f61369f0e3d440a9bb413dd48 Mon Sep 17 00:00:00 2001
From: "Mengyi Zhou (bjrara)" <zmengyi@amazon.com>
Date: Fri, 17 May 2024 07:54:10 -0700
Subject: [PATCH] Update app_signals to application_signals (#40)

---
 .../amazon-cloudwatch-observability/templates/_helpers.tpl  | 6 +++---
 charts/amazon-cloudwatch-observability/values.yaml          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/amazon-cloudwatch-observability/templates/_helpers.tpl b/charts/amazon-cloudwatch-observability/templates/_helpers.tpl
index 603eec6..803c0e8 100644
--- a/charts/amazon-cloudwatch-observability/templates/_helpers.tpl
+++ b/charts/amazon-cloudwatch-observability/templates/_helpers.tpl
@@ -17,8 +17,8 @@ Helper function to modify cloudwatch-agent config
 {{- $agent := set $configCopy "agent" $agentRegion }}
 {{- end }}
 
-{{- $appSignals := pluck "app_signals" $configCopy.logs.metrics_collected | first }}
-{{- if and (hasKey $configCopy.logs.metrics_collected "app_signals") (empty $appSignals.hosted_in) }}
+{{- $appSignals := pluck "application_signals" $configCopy.logs.metrics_collected | first }}
+{{- if and (hasKey $configCopy.logs.metrics_collected "application_signals") (empty $appSignals.hosted_in) }}
 {{- $clusterName := .Values.clusterName | required ".Values.clusterName is required." -}}
 {{- $appSignals := set $appSignals "hosted_in" .Values.clusterName }}
 {{- end }}
@@ -36,7 +36,7 @@ Helper function to modify cloudwatch-agent config
 Helper function to modify customer supplied agent config if ContainerInsights or ApplicationSignals is enabled
 */}}
 {{- define "cloudwatch-agent.modify-config" -}}
-{{- if and (hasKey .Config "logs") (or (and (hasKey .Config.logs "metrics_collected") (hasKey .Config.logs.metrics_collected "app_signals")) (and (hasKey .Config.logs "metrics_collected") (hasKey .Config.logs.metrics_collected "kubernetes"))) }}
+{{- if and (hasKey .Config "logs") (or (and (hasKey .Config.logs "metrics_collected") (hasKey .Config.logs.metrics_collected "application_signals")) (and (hasKey .Config.logs "metrics_collected") (hasKey .Config.logs.metrics_collected "kubernetes"))) }}
 {{- include "cloudwatch-agent.config-modifier" . }}
 {{- else }}
 {{- default "" .Config | toJson | quote }}
diff --git a/charts/amazon-cloudwatch-observability/values.yaml b/charts/amazon-cloudwatch-observability/values.yaml
index 7cda5ce..5674ae5 100644
--- a/charts/amazon-cloudwatch-observability/values.yaml
+++ b/charts/amazon-cloudwatch-observability/values.yaml
@@ -185,12 +185,12 @@ agent:
           "kubernetes": {
             "enhanced_container_insights": true
           },
-          "app_signals": { }
+          "application_signals": { }
         }
       },
       "traces": {
         "traces_collected": {
-          "app_signals": { }
+          "application_signals": { }
         }
       }
     }