Move everything to the new labels API internally.

Author: atheriel

R/plumber.R

@@ -41,14 +41,14 @@ register_plumber_metrics <- function(app, registry = global_registry()) {
   # * https://www.npmjs.com/package/prometheus-api-metrics
   # * https://github.com/tdeekens/promster
   requests <- counter_metric(
-    "http_request", "Running total of HTTP requests.", path = "/",
-    method = "GET", status = "200", registry = registry
+    "http_request", "Running total of HTTP requests.",
+    labels = c("path", "method", "status"), registry = registry
   )
   duration <- histogram_metric(
     "http_request_duration_seconds", "Duration of HTTP requests, in seconds.",
     # These are what node.js's prom-client uses.
     buckets = c(0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10),
-    path = "/", method = "GET", status = "200", registry = registry
+    labels = c("path", "method", "status"), registry = registry
   )
 
   preroute_hook <- function(req, res) {

tests/testthat/test-metrics.R

@@ -85,7 +85,8 @@ testthat::test_that("Metrics with labels work as expected", {
   testthat::expect_equal(length(collect_metrics(reg)), 0)
 
   counter <- counter_metric(
-    "count", "Custom counter.", method = "GET", endpoint = "/", registry = reg
+    "count", "Custom counter.", labels = c("method", "endpoint"),
+    registry = reg
   )
   testthat::expect_equal(counter$inc(5, method = "GET", endpoint = "/"), 5)
   testthat::expect_equal(
@@ -94,7 +95,7 @@ testthat::test_that("Metrics with labels work as expected", {
   testthat::expect_equal(counter$inc(method = "POST", endpoint = "/"), 1)
 
   gauge <- gauge_metric(
-    "value", "Custom gauge.", method = "GET", endpoint = "/", registry = reg
+    "value", "Custom gauge.", labels = c("method", "endpoint"), registry = reg
   )
   testthat::expect_equal(gauge$set(5, method = "GET", endpoint = "/"), 5)
   testthat::expect_equal(
@@ -103,7 +104,8 @@ testthat::test_that("Metrics with labels work as expected", {
   testthat::expect_equal(gauge$inc(method = "POST", endpoint = "/"), 1)
 
   hist <- histogram_metric(
-    "dist", "Custom histogram.", method = "GET", endpoint = "/", registry = reg
+    "dist", "Custom histogram.", labels = c("method", "endpoint"),
+    registry = reg
   )
   testthat::expect_equal(
     hist$observe(51.7, method = "GET", endpoint = "/"), 51.7
@@ -214,7 +216,8 @@ testthat::test_that("Histogram metrics render correctly in legacy format", {
   reg <- registry()
 
   hist <- histogram_metric(
-    "dist", "Custom histogram.", method = "GET", endpoint = "/", registry = reg
+    "dist", "Custom histogram.", labels = c("method", "endpoint"),
+    registry = reg
   )
   hist$observe(51.7, method = "GET", endpoint = "/")
   hist$observe(10, method = "GET", endpoint = "/",ignored = "value")

tests/testthat/test-pushgateway.R

@@ -7,7 +7,8 @@ testthat::test_that("Pushgateway interaction works as expected", {
   )
   counter$inc(5)
   hist <- histogram_metric(
-    "dist", "Custom histogram.", method = "GET", endpoint = "/", registry = reg
+    "dist", "Custom histogram.", labels = c("method", "endpoint"),
+    registry = reg
   )
   hist$observe(51.7, method = "GET", endpoint = "/")
   hist$observe(10, method = "GET", endpoint = "/",ignored = "value")