add tests, fix bugs

Author: toph-allen

R/connect.R

@@ -824,16 +824,16 @@ Connect <- R6::R6Class(
     #' @param to Optional `Date` or `POSIXt`; end of the time window. If a
     #' `Date`, coerced to `YYYY-MM-DDT23:59:59` in the caller's time zone.
     inst_content_hits = function(from = NULL, to = NULL) {
-      error_if_less_than(client$version, "2025.04.0")
+      error_if_less_than(self$version, "2025.04.0")
 
       # If this is called with date objects with no timestamp attached, it's
       # reasonable to assume that the caller is indicating the days as an
       # inclusive range.
       if (inherits(from, "Date")) {
-        from <- as.POSIXct(paste(from, "00:00:00"), tz = "")
+        from <- as.POSIXct(paste(from, "00:00:00"))
       }
       if (inherits(to, "Date")) {
-        to <- as.POSIXct(paste(to, "23:59:59"), tz = "")
+        to <- as.POSIXct(paste(to, "23:59:59"))
       }
 
       self$GET(

tests/testthat/2025.04.0/__api__/v1/instrumentation/content/hits-c331ad.json

@@ -0,0 +1,52 @@
+[
+    {
+        "id": 8966707,
+        "user_guid": null,
+        "content_guid": "475618c9",
+        "timestamp": "2025-04-30T12:49:16.269904Z",
+        "data": {
+            "path": "/hello",
+            "user_agent": "Datadog/Synthetics"
+        }
+    },
+    {
+        "id": 8966708,
+        "user_guid": null,
+        "content_guid": "475618c9",
+        "timestamp": "2025-04-30T12:49:17.002848Z",
+        "data": {
+            "path": "/world",
+            "user_agent": null
+        }
+    },
+    {
+        "id": 8967206,
+        "user_guid": null,
+        "content_guid": "475618c9",
+        "timestamp": "2025-04-30T13:01:47.40738Z",
+        "data": {
+            "path": "/chinchilla",
+            "user_agent": "Datadog/Synthetics"
+        }
+    },
+    {
+        "id": 8967210,
+        "user_guid": null,
+        "content_guid": "475618c9",
+        "timestamp": "2025-04-30T13:04:13.176791Z",
+        "data": {
+            "path": "/lava-lamp",
+            "user_agent": "Datadog/Synthetics"
+        }
+    },
+    {
+        "id": 8966214,
+        "user_guid": "fecbd383",
+        "content_guid": "b0eaf295",
+        "timestamp": "2025-04-30T12:36:13.818466Z",
+        "data": {
+            "path": null,
+            "user_agent": null
+        }
+    }
+]

tests/testthat/test-get.R

@@ -374,3 +374,80 @@ test_that("get_content only requests vanity URLs for Connect 2024.06.0 and up",
     )
   })
 })
+
+test_that("get_usage() returns usage data in the expected shape", {
+  with_mock_dir("2025.04.0", {
+    client <- connect(server = "https://connect.example", api_key = "fake")
+    usage <- get_usage(
+      client,
+      from = as.POSIXct("2025-04-01 00:00:01", tz = "UTC")
+    )
+
+    expect_equal(
+      usage,
+      tibble::tibble(
+        id = c(8966707L, 8966708L, 8967206L, 8967210L, 8966214L),
+        user_guid = c(NA, NA, NA, NA, "fecbd383"),
+        content_guid = c(
+          "475618c9",
+          "475618c9",
+          "475618c9",
+          "475618c9",
+          "b0eaf295"
+        ),
+        timestamp = c(
+          parse_connect_rfc3339("2025-04-30T12:49:16.269904Z"),
+          parse_connect_rfc3339("2025-04-30T12:49:17.002848Z"),
+          parse_connect_rfc3339("2025-04-30T13:01:47.40738Z"),
+          parse_connect_rfc3339("2025-04-30T13:04:13.176791Z"),
+          parse_connect_rfc3339("2025-04-30T12:36:13.818466Z")
+        ),
+        path = c("/hello", "/world", "/chinchilla", "/lava-lamp", NA),
+        user_agent = c(
+          "Datadog/Synthetics",
+          NA,
+          "Datadog/Synthetics",
+          "Datadog/Synthetics",
+          NA
+        )
+      )
+    )
+  })
+})
+
+test_that("Metrics firehose is called with expected parameters", {
+  with_mock_api({
+    client <- Connect$new(server = "https://connect.example", api_key = "fake")
+    # $version is loaded lazily, we need it before calling get_usage()
+    client$version
+
+    without_internet({
+      expect_GET(
+        get_usage(client),
+        "https://connect.example/__api__/v1/instrumentation/content/hits"
+      )
+      expect_GET(
+        get_usage(
+          client,
+          from = as.POSIXct("2025-04-01 00:00:01", tz = "UTC"),
+          to = as.POSIXct("2025-04-02 00:00:01", tz = "UTC")
+        ),
+        "https://connect.example/__api__/v1/instrumentation/content/hits?from=2025-04-01T00%3A00%3A01Z&to=2025-04-02T00%3A00%3A01Z"
+      )
+
+      # Dates are converted to timestamps with the system's time zone, so for
+      # repeatability we're gonna set it here.
+
+      withr::local_envvar(TZ = "UTC")
+
+      expect_GET(
+        get_usage(
+          client,
+          from = as.Date("2025-04-01"),
+          to = as.Date("2025-04-02")
+        ),
+        "https://connect.example/__api__/v1/instrumentation/content/hits?from=2025-04-01T00%3A00%3A00Z&to=2025-04-02T23%3A59%3A59Z"
+      )
+    })
+  })
+})