Compute apmStats in the server.

- Handle communicating with the trace-agent in the status package - Update the GUI to rende the apmStats using the informatoin from the server rather than using AJAX
DataDog · Nov 29, 2023 · 3e90daf · 3e90daf
1 parent 759d87b
commit 3e90daf
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 83 deletions.
diff --git a/cmd/agent/gui/views/private/js/apm.js b/cmd/agent/gui/views/private/js/apm.js
diff --git a/cmd/agent/gui/views/private/js/ejs.min.js b/cmd/agent/gui/views/private/js/ejs.min.js
diff --git a/cmd/agent/gui/views/private/js/javascript.js b/cmd/agent/gui/views/private/js/javascript.js
@@ -124,7 +124,7 @@ function checkStatus() {
     if (checkStatus.uptime > last_ts) {
       $("#restart_status").hide()
     }
-    checkStatus.uptime = last_ts 
+    checkStatus.uptime = last_ts
   },function() {
     $("#agent_status").html("Not connected<br> to Agent");
     $("#agent_status").css({
@@ -153,28 +153,6 @@ function loadStatus(page) {
   sendMessage("agent/status/" + page, "", "post",
   function(data, status, xhr){
       $("#" + page + "_status").html(DOMPurify.sanitize(data));
-
-      // Get the trace-agent status
-      sendMessage("agent/getConfig/apm_config.receiver_port", "", "GET",
-          function(data, status, xhr) {
-              var apmPort = data["apm_config.debug.port"];
-              if (apmPort == null) {
-                  apmPort = "5012";
-              }
-              var url = "http://127.0.0.1:"+apmPort+"/debug/vars"
-              $.ajax({
-                url: url,
-                type: "GET",
-                success: function(data) {
-                    $("#apmStats > .stat_data").html(ejs.render(apmTemplate, data));
-                },
-                error: function() {
-                    $("#apmStats > .stat_data").text("Status: Not running or not on localhost.");
-                }
-              })
-          }, function() {
-              $("#apmStats > .stat_data").html("Could not obtain trace-agent port from API.");
-          })
   },function(){
       $("#" + page + "_status").html("<span class='center'>An error occurred.</span>");
   });

diff --git a/cmd/agent/gui/views/templates/generalStatus.tmpl b/cmd/agent/gui/views/templates/generalStatus.tmpl
@@ -478,9 +478,61 @@
     </span>
   </div>
 
-  <div class="stat" id="apmStats">
+  <div class="stat">
     <span class="stat_title">APM</span>
-    <span class="stat_data">Loading...</span>
+    <span class="stat_data">
+      {{- with .apmStats -}}
+        {{- if .error }}
+          Not running or unreachable on localhost:{{.port}}<br>
+          Error: {{.error}}<br>
+        {{- else}}
+          Status: Running<br>
+          Pid: {{.pid}}<br>
+          Uptime: {{.uptime}} seconds<br>
+          Mem alloc: {{humanize .memstats.Alloc}} bytes<br>
+          Hostname: {{.config.Hostname}}<br>
+          Receiver: {{.config.ReceiverHost}}:{{.config.ReceiverPort}}<br>
+          Endpoints:
+          <span class="stat_subdata">
+            {{- range $i, $e := .config.Endpoints}}
+              {{ $e.Host }}<br />
+            {{- end }}
+          </span>
+          <span class="stat_subtitle">Receiver (previous minute)</span>
+          <span class="stat_subdata">
+            {{- if eq (len .receiver) 0}}
+              No traces received in the previous minute.<br>
+            {{ else }}
+              {{ range $i, $ts := .receiver }}
+                From {{if $ts.Lang}}{{ $ts.Lang }} {{ $ts.LangVersion }} ({{ $ts.Interpreter }}), client {{ $ts.TracerVersion }}{{else}}unknown clients{{end}}
+                <span class="stat_subdata">
+                  Traces received: {{ $ts.TracesReceived }} ({{ humanize $ts.TracesBytes }} bytes)<br>
+                  Spans received: {{ $ts.SpansReceived }}
+                  {{ with $ts.WarnString }}
+                    <br>WARNING: {{ . }}</br>
+                  {{ end }}
+                </span>
+              {{ end }}
+            {{ end }}
+
+            {{range $key, $value := .ratebyservice_filtered -}}
+              {{- if eq $key "service:,env:" -}}
+                Default priority sampling rate: {{percent $value}}%
+              {{- else}}
+                Priority sampling rate for '{{ $key }}': {{percent $value}}%
+              {{- end}}
+            {{- end }}
+          </span>
+          <span class="stat_subtitle">Writer (previous minute)</span>
+          <span class="stat_subdata">
+            Traces: {{.trace_writer.Payloads}} payloads, {{.trace_writer.Traces}} traces, {{.trace_writer.Events}} events, {{humanize .trace_writer.Bytes}} bytes<br>
+            {{- if gt .trace_writer.Errors 0.0}}WARNING: Traces API errors (1 min): {{.trace_writer.Errors}}{{end}}
+            Stats: {{.stats_writer.Payloads}} payloads, {{.stats_writer.StatsBuckets}} stats buckets, {{humanize .stats_writer.Bytes}} bytes<br>
+            {{- if gt .stats_writer.Errors 0.0}}WARNING: Stats API errors (1 min): {{.stats_writer.Errors}}{{end}}
+          </span>
+        {{- end }}
+      {{ end }}
+    </span>
   </div>
 
   <div class="stat">
@@ -532,7 +584,8 @@
         {{- end }}
         {{ end }}
     </span>
-</div>
+   </div>
+
 
 
   <div class="stat">

diff --git a/cmd/agent/gui/views/templates/index.tmpl b/cmd/agent/gui/views/templates/index.tmpl
@@ -8,7 +8,6 @@
     <link rel="stylesheet" href="view/css/stylesheet.css">
     <script src="view/js/polyfills.js"> </script>
     <script src="view/js/jquery-3.5.1.min.js"> </script>
-    <script src="view/js/ejs.min.js"> </script>
     <script src="view/js/apm.js"> </script>
     <script src="view/js/codemirror.js"> </script>
     <script src="view/js/yaml.js"> </script>

diff --git a/pkg/status/apm/apm.go b/pkg/status/apm/apm.go
@@ -24,7 +24,7 @@ var (
 	clientInitOnce sync.Once
 )
 
-func getHTTPClient() *http.Client {
+func client() *http.Client {
 	clientInitOnce.Do(func() {
 		httpClient = apiutil.GetClient(false)
 	})
@@ -38,9 +38,9 @@ func getHTTPClient() *http.Client {
 func GetAPMStatus() map[string]interface{} {
 	port := config.Datadog.GetInt("apm_config.debug.port")
 
-	client := getHTTPClient()
+	c := client()
 	url := fmt.Sprintf("http://localhost:%d/debug/vars", port)
-	resp, err := apiutil.DoGet(client, url, apiutil.CloseConnection)
+	resp, err := apiutil.DoGet(c, url, apiutil.CloseConnection)
 	if err != nil {
 		return map[string]interface{}{
 			"port":  port,