Fix live metrics (#2407)

Author: trask

agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/quickpulse/QuickPulseDataFetcher.java

@@ -161,11 +161,13 @@ private static List<QuickPulseMetrics> addMetricsToQuickPulseEnvelope(
     List<QuickPulseMetrics> metricsList = new ArrayList<>();
     metricsList.add(
         new QuickPulseMetrics("\\ApplicationInsights\\Requests/Sec", counters.requests, 1));
-    metricsList.add(
-        new QuickPulseMetrics(
-            "\\ApplicationInsights\\Request Duration",
-            (long) counters.requestsDuration,
-            (int) counters.requests));
+    if (counters.requests != 0) {
+      metricsList.add(
+          new QuickPulseMetrics(
+              "\\ApplicationInsights\\Request Duration",
+              counters.requestsDuration / counters.requests,
+              counters.requests));
+    }
     metricsList.add(
         new QuickPulseMetrics(
             "\\ApplicationInsights\\Requests Failed/Sec", counters.unsuccessfulRequests, 1));
@@ -176,11 +178,13 @@ private static List<QuickPulseMetrics> addMetricsToQuickPulseEnvelope(
             1));
     metricsList.add(
         new QuickPulseMetrics("\\ApplicationInsights\\Dependency Calls/Sec", counters.rdds, 1));
-    metricsList.add(
-        new QuickPulseMetrics(
-            "\\ApplicationInsights\\Dependency Call Duration",
-            (long) counters.rddsDuration,
-            (int) counters.rdds));
+    if (counters.rdds != 0) {
+      metricsList.add(
+          new QuickPulseMetrics(
+              "\\ApplicationInsights\\Dependency Call Duration",
+              counters.rddsDuration / counters.rdds,
+              counters.rdds));
+    }
     metricsList.add(
         new QuickPulseMetrics(
             "\\ApplicationInsights\\Dependency Calls Failed/Sec", counters.unsuccessfulRdds, 1));
@@ -194,8 +198,7 @@ private static List<QuickPulseMetrics> addMetricsToQuickPulseEnvelope(
     metricsList.add(
         new QuickPulseMetrics("\\Memory\\Committed Bytes", counters.memoryCommitted, 1));
     metricsList.add(
-        new QuickPulseMetrics(
-            "\\Processor(_Total)\\% Processor Time", (long) counters.cpuUsage, 1));
+        new QuickPulseMetrics("\\Processor(_Total)\\% Processor Time", counters.cpuUsage, 1));
 
     return metricsList;
   }

agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/quickpulse/model/QuickPulseMetrics.java

@@ -29,12 +29,12 @@ public class QuickPulseMetrics {
   private final String name;
 
   @JsonProperty(value = "Value")
-  private final long value;
+  private final double value;
 
   @JsonProperty(value = "Weight")
-  private final int weight;
+  private final long weight;
 
-  public QuickPulseMetrics(String name, long value, int weight) {
+  public QuickPulseMetrics(String name, double value, long weight) {
     this.name = name;
     this.value = value;
     this.weight = weight;
@@ -44,11 +44,11 @@ public String getName() {
     return name;
   }
 
-  public long getValue() {
+  public double getValue() {
     return value;
   }
 
-  public int getWeight() {
+  public long getWeight() {
     return weight;
   }
 }

agent/azure-monitor-exporter/src/test/java/com/azure/monitor/opentelemetry/exporter/implementation/quickpulse/QuickPulseIntegrationTests.java

@@ -113,7 +113,7 @@ public void testPostRequest() throws InterruptedException {
     String expectedPostRequestBody =
         "\\[\\{\"Documents\":\\[\\{\"__type\":\"RequestTelemetryDocument\",\"DocumentType\":\"Request\",\"Version\":\"1.0\",\"OperationId\":null,\"Properties\":\\{\"customProperty\":\"customValue\"\\},\"Name\":\"request-test\",\"Success\":true,\"Duration\":\"PT.*S\",\"ResponseCode\":\"200\",\"OperationName\":null,\"Url\":\"foo\"\\},\\{\"__type\":\"DependencyTelemetryDocument\",\"DocumentType\":\"RemoteDependency\",\"Version\":\"1.0\",\"OperationId\":null,\"Properties\":\\{\"customProperty\":\"customValue\"\\},\"Name\":\"dep-test\",\"Target\":null,\"Success\":true,\"Duration\":\"PT.*S\",\"ResultCode\":null,\"CommandName\":\"dep-test-cmd\",\"DependencyTypeName\":null,\"OperationName\":null\\},\\{\"__type\":\"ExceptionTelemetryDocument\",\"DocumentType\":\"Exception\",\"Version\":\"1.0\",\"OperationId\":null,\"Properties\":null,\"Exception\":\"\",\"ExceptionMessage\":\"test\",\"ExceptionType\":\"java.lang.Exception\"\\}\\],\"InstrumentationKey\":\""
             + instrumentationKey
-            + "\",\"Metrics\":\\[\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Requests\\\\\\/Sec\",\"Value\":\\d+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Request Duration\",\"Value\":\\d+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Requests Failed\\\\\\/Sec\",\"Value\":\\d+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Requests Succeeded\\\\\\/Sec\",\"Value\":\\d+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Dependency Calls\\\\\\/Sec\",\"Value\":\\d+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Dependency Call Duration\",\"Value\":\\d+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Dependency Calls Failed\\\\\\/Sec\",\"Value\":\\d+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Dependency Calls Succeeded\\\\\\/Sec\",\"Value\":\\d+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Exceptions\\\\\\/Sec\",\"Value\":\\d+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\Memory\\\\\\\\Committed Bytes\",\"Value\":\\d+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\Processor\\(_Total\\)\\\\\\\\% Processor Time\",\"Value\":-?\\d+,\"Weight\":\\d+\\}\\],\"InvariantVersion\":1,\"Timestamp\":\"\\\\\\/Date\\(\\d+\\)\\\\\\/\",\"Version\":\"[^\"]*\",\"StreamId\":null,\"MachineName\":\"machine1\",\"Instance\":\"instance1\",\"RoleName\":null\\}\\]";
+            + "\",\"Metrics\":\\[\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Requests\\\\\\/Sec\",\"Value\":[0-9.]+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Request Duration\",\"Value\":[0-9.]+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Requests Failed\\\\\\/Sec\",\"Value\":[0-9.]+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Requests Succeeded\\\\\\/Sec\",\"Value\":[0-9.]+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Dependency Calls\\\\\\/Sec\",\"Value\":[0-9.]+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Dependency Call Duration\",\"Value\":[0-9.]+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Dependency Calls Failed\\\\\\/Sec\",\"Value\":[0-9.]+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Dependency Calls Succeeded\\\\\\/Sec\",\"Value\":[0-9.]+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\ApplicationInsights\\\\\\\\Exceptions\\\\\\/Sec\",\"Value\":[0-9.]+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\Memory\\\\\\\\Committed Bytes\",\"Value\":[0-9.E]+,\"Weight\":\\d+\\},\\{\"Name\":\"\\\\\\\\Processor\\(_Total\\)\\\\\\\\% Processor Time\",\"Value\":-?[0-9.]+,\"Weight\":\\d+\\}\\],\"InvariantVersion\":1,\"Timestamp\":\"\\\\\\/Date\\(\\d+\\)\\\\\\/\",\"Version\":\"[^\"]*\",\"StreamId\":null,\"MachineName\":\"machine1\",\"Instance\":\"instance1\",\"RoleName\":null\\}\\]";
     QuickPulsePingSender pingSender =
         getQuickPulsePingSenderWithValidator(
             new ValidationPolicy(pingCountDown, expectedPingRequestBody));