ensure not to break status JSON key names

DataDog · Nov 28, 2023 · 880fb5a · 880fb5a
1 parent cf5fca1
commit 880fb5a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/cmd/agent/gui/views/templates/generalStatus.tmpl b/cmd/agent/gui/views/templates/generalStatus.tmpl
@@ -481,7 +481,7 @@
   <div class="stat">
     <span class="stat_title">APM</span>
     <span class="stat_data">
-      {{- with .apmStatus -}}
+      {{- with .apmStats -}}
         {{- if .error }}
           Not running or unreachable on localhost:{{.port}}<br>
           Error: {{.error}}<br>

diff --git a/pkg/status/render/fixtures/agent_status.json b/pkg/status/render/fixtures/agent_status.json
@@ -555,7 +555,7 @@
 		 "SketchesFlushErrors":0,
 		 "SketchesFlushed":0
 	},
-	"apmStatus":{
+	"apmStats":{
 		 "Event":{
 
 		 },

diff --git a/pkg/status/render/templates/trace-agent.tmpl b/pkg/status/render/templates/trace-agent.tmpl
@@ -5,7 +5,7 @@ NOTE: Changes made to this template should be reflected on the following templat
 =========
 APM Agent
 =========
-{{- with .apmStatus }}
+{{- with .apmStats }}
 {{- if .error }}
 
   Status: Not running or unreachable on localhost:{{.port}}.

diff --git a/pkg/status/status.go b/pkg/status/status.go
@@ -83,7 +83,7 @@ func GetStatus(verbose bool, invAgent inventoryagent.Component) (map[string]inte
 	}
 
 	stats["processAgentStatus"] = GetProcessAgentStatus()
-	stats["apmStatus"] = apm.GetAPMStatus()
+	stats["apmStats"] = apm.GetAPMStatus()
 
 	if !config.Datadog.GetBool("no_proxy_nonexact_match") {
 		stats["TransportWarnings"] = httputils.GetNumberOfWarnings() > 0