Add missing usage tests and asserts (#239)

Author: skarimo

src/test/java/com/datadog/api/v1/client/api/UsageMeteringApiTest.java

@@ -180,9 +180,10 @@ public void getUsageSummaryTest() throws ApiException, IOException {
         assertEquals(usage.getInfraHostTop99pSum().longValue(), 2L);
         assertEquals(usage.getContainerHwmSum().longValue(), 1L);
         assertEquals(usage.getCustomTsSum().longValue(), 4L);
+        assertEquals(usage.getRumSessionCountAggSum().longValue(), 5L);
 
         // Note the nanosecond field had to be converted from the value in the summary fixture (i.e. 0.014039s -> 14039000ns)
-        OffsetDateTime dateExpected = OffsetDateTime.of(LocalDateTime.of(2020, 02, 02, 16, 34, 14, 14039000),
+        OffsetDateTime dateExpected = OffsetDateTime.of(LocalDateTime.of(2020, 02, 02, 23, 00),
                 ZoneOffset.ofHoursMinutes(0, 0));
         UsageSummaryDate usageItem = usage.getUsage().get(0);
         assertEquals(usageItem.getDate(), dateExpected);
@@ -193,6 +194,7 @@ public void getUsageSummaryTest() throws ApiException, IOException {
         assertEquals(usageItem.getCustomTsAvg().longValue(), 6L);
         assertEquals(usageItem.getGcpHostTop99p().longValue(), 7L);
         assertEquals(usageItem.getInfraHostTop99p().longValue(), 8L);
+        assertEquals(usageItem.getRumSessionCountSum().longValue(), 9L);
 
         UsageSummaryDateOrg usageOrgItem = usageItem.getOrgs().get(0);
         assertEquals(usageOrgItem.getId(), "1b");
@@ -204,6 +206,7 @@ public void getUsageSummaryTest() throws ApiException, IOException {
         assertEquals(usageOrgItem.getCustomTsAvg().longValue(), 6L);
         assertEquals(usageOrgItem.getGcpHostTop99p().longValue(), 7L);
         assertEquals(usageOrgItem.getInfraHostTop99p().longValue(), 8L);
+        assertEquals(usageOrgItem.getRumSessionCountSum().longValue(), 9L);
     }
 
     @Test
@@ -261,6 +264,15 @@ public void getUsageTraceTest() throws ApiException {
         assertNotNull(response.getUsage());
     }
 
+    @Test
+    public void getUsageLambdaTest() throws ApiException {
+        UsageLambdaResponse response = api.getUsageLambda()
+                .startHr(startHr)
+                .endHr(endHr)
+                .execute();
+        assertNotNull(response.getUsage());
+    }
+
     @Test
     public void getUsageAnalyzedLogsErrorsTest() throws IOException {
         try {

src/test/resources/cassettes/v1/getUsageLambdaTest.freeze

@@ -0,0 +1 @@
+2020-05-27T21:24:37.647Z

src/test/resources/cassettes/v1/getUsageLambdaTest.json

@@ -0,0 +1,55 @@
+[{
+  "id" : "18ae89aa-fbdc-4151-8cc6-fc506245f02a",
+  "httpRequest" : {
+    "method" : "GET",
+    "path" : "/api/v1/usage/aws_lambda",
+    "queryStringParameters" : {
+      "start_hr" : [ "2020-04-01T12:00Z" ],
+      "end_hr" : [ "2020-04-01T13:00Z" ]
+    },
+    "headers" : {
+      "Accept" : [ "application/json;datetime-format=rfc3339" ],
+      "JAVA-TEST-NAME" : [ "getUsageLambdaTest" ],
+      "DD-OPERATION-ID" : [ "getUsageLambda" ],
+      "Connection" : [ "close" ],
+      "content-length" : [ "0" ]
+    },
+    "keepAlive" : false,
+    "secure" : true
+  },
+  "times" : {
+    "remainingTimes" : 1
+  },
+  "timeToLive" : {
+    "unlimited" : true
+  },
+  "httpResponse" : {
+    "statusCode" : 200,
+    "reasonPhrase" : "OK",
+    "headers" : {
+      "Date" : [ "Wed, 27 May 2020 21:24:44 GMT" ],
+      "Content-Type" : [ "application/json" ],
+      "Connection" : [ "keep-alive" ],
+      "Vary" : [ "Accept-Encoding" ],
+      "Pragma" : [ "no-cache" ],
+      "Cache-Control" : [ "no-cache" ],
+      "Set-Cookie" : [ "DD-PSHARD=233; Max-Age=604800; Path=/; expires=Wed, 03-Jun-2020 21:24:44 GMT; secure; HttpOnly" ],
+      "X-DD-VERSION" : [ "35.2552800" ],
+      "X-RateLimit-Limit" : [ "400" ],
+      "X-RateLimit-Period" : [ "3600" ],
+      "X-RateLimit-Reset" : [ "2116" ],
+      "X-RateLimit-Remaining" : [ "367" ],
+      "X-DD-Debug" : [ "aERr2Ftx8O/BR8oAhSymZ3bVROQEC+81YMSphOQK1me4DxXSbMIcFkB0Di4ggZ++" ],
+      "DD-POOL" : [ "dogweb" ],
+      "Content-Security-Policy" : [ "frame-ancestors 'self'; report-uri https://api.datadoghq.com/csp-report" ],
+      "X-Frame-Options" : [ "SAMEORIGIN" ],
+      "X-Content-Type-Options" : [ "nosniff" ],
+      "Strict-Transport-Security" : [ "max-age=15724800;" ],
+      "content-length" : [ "83" ]
+    },
+    "cookies" : {
+      "DD-PSHARD" : "233"
+    },
+    "body" : "{\"usage\":[{\"func_count\":0,\"hour\":\"2020-04-01T12:00:00+00:00\",\"invocations_sum\":0}]}"
+  }
+}]

src/test/resources/cassettes/v1/getUsageSummaryTest.freeze

@@ -1 +1 @@
-2020-05-27T10:28:10.845Z
+2020-05-27T21:23:59.012Z

src/test/resources/com/datadog/api/v1/client/api/usage_fixtures/usage_summary.json

@@ -5,25 +5,32 @@
   "infra_host_top99p_sum": 2,
   "container_hwm_sum": 1,
   "custom_ts_sum": 4,
-  "usage": [{
-    "date": "2020-02-02T16:34:14.014039+00:00",
-    "agent_host_top99p": 1,
-    "apm_host_top99p": 2,
-    "aws_host_top99p": 3,
-    "container_hwm": 5,
-    "custom_ts_avg": 6,
-    "gcp_host_top99p": 7,
-    "infra_host_top99p": 8,
-    "orgs": [{
-      "id": "1b",
-      "name": "datadog",
+  "rum_session_count_agg_sum": 5,
+  "usage": [
+    {
+      "date": "2020-02-02T23:00:00+00:00",
       "agent_host_top99p": 1,
       "apm_host_top99p": 2,
       "aws_host_top99p": 3,
       "container_hwm": 5,
       "custom_ts_avg": 6,
       "gcp_host_top99p": 7,
-      "infra_host_top99p": 8
-    }]
-  }]
-}
+      "infra_host_top99p": 8,
+      "rum_session_count_sum": 9,
+      "orgs": [
+        {
+          "id": "1b",
+          "name": "datadog",
+          "agent_host_top99p": 1,
+          "apm_host_top99p": 2,
+          "aws_host_top99p": 3,
+          "container_hwm": 5,
+          "custom_ts_avg": 6,
+          "gcp_host_top99p": 7,
+          "infra_host_top99p": 8,
+          "rum_session_count_sum": 9
+        }
+      ]
+    }
+  ]
+}