Merge pull request #5024 from getsentry/01-13-rename_sample_api_param_remove_sleep

feat(metrics): [Trace Metrics 29] Rename sample API param, remove sleep

Author: adinauer

sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/MetricController.java

@@ -19,15 +19,15 @@ String count() {
     return "count metric increased";
   }
 
-  @GetMapping("gauge/{count}")
-  String gauge(@PathVariable("count") Long count) {
-    Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
+  @GetMapping("gauge/{value}")
+  String gauge(@PathVariable("value") Long value) {
+    Sentry.metrics().gauge("memory.free", value.doubleValue(), "byte");
     return "gauge metric tracked";
   }
 
-  @GetMapping("distribution/{count}")
-  String distribution(@PathVariable("count") Long count) {
-    Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
+  @GetMapping("distribution/{value}")
+  String distribution(@PathVariable("value") Long value) {
+    Sentry.metrics().distribution("distributionMetric", value.doubleValue(), "child");
     return "distribution metric tracked";
   }
 }

sentry-samples/sentry-samples-spring-7/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt

@@ -20,8 +20,6 @@ class MetricsSystemTest {
     assertEquals("count metric increased", restClient.getCountMetric())
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
     }
@@ -33,8 +31,6 @@ class MetricsSystemTest {
     assertEquals("gauge metric tracked", restClient.getGaugeMetric(14))
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
     }
@@ -46,8 +42,6 @@ class MetricsSystemTest {
     assertEquals("distribution metric tracked", restClient.getDistributionMetric(23))
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
     }

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/MetricController.java

@@ -19,15 +19,15 @@ String count() {
     return "count metric increased";
   }
 
-  @GetMapping("gauge/{count}")
-  String gauge(@PathVariable Long count) {
-    Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
+  @GetMapping("gauge/{value}")
+  String gauge(@PathVariable Long value) {
+    Sentry.metrics().gauge("memory.free", value.doubleValue(), "byte");
     return "gauge metric tracked";
   }
 
-  @GetMapping("distribution/{count}")
-  String distribution(@PathVariable Long count) {
-    Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
+  @GetMapping("distribution/{value}")
+  String distribution(@PathVariable Long value) {
+    Sentry.metrics().distribution("distributionMetric", value.doubleValue(), "child");
     return "distribution metric tracked";
   }
 }

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt

@@ -20,8 +20,6 @@ class MetricsSystemTest {
     assertEquals("count metric increased", restClient.getCountMetric())
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
     }
@@ -33,8 +31,6 @@ class MetricsSystemTest {
     assertEquals("gauge metric tracked", restClient.getGaugeMetric(14))
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
     }
@@ -46,8 +42,6 @@ class MetricsSystemTest {
     assertEquals("distribution metric tracked", restClient.getDistributionMetric(23))
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
     }

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/MetricController.java

@@ -19,15 +19,15 @@ String count() {
     return "count metric increased";
   }
 
-  @GetMapping("gauge/{count}")
-  String gauge(@PathVariable Long count) {
-    Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
+  @GetMapping("gauge/{value}")
+  String gauge(@PathVariable Long value) {
+    Sentry.metrics().gauge("memory.free", value.doubleValue(), "byte");
     return "gauge metric tracked";
   }
 
-  @GetMapping("distribution/{count}")
-  String distribution(@PathVariable Long count) {
-    Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
+  @GetMapping("distribution/{value}")
+  String distribution(@PathVariable Long value) {
+    Sentry.metrics().distribution("distributionMetric", value.doubleValue(), "child");
     return "distribution metric tracked";
   }
 }

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt

@@ -20,8 +20,6 @@ class MetricsSystemTest {
     assertEquals("count metric increased", restClient.getCountMetric())
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
     }
@@ -33,8 +31,6 @@ class MetricsSystemTest {
     assertEquals("gauge metric tracked", restClient.getGaugeMetric(14))
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
     }
@@ -46,8 +42,6 @@ class MetricsSystemTest {
     assertEquals("distribution metric tracked", restClient.getDistributionMetric(23))
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
     }

sentry-samples/sentry-samples-spring-boot-4-webflux/src/main/java/io/sentry/samples/spring/boot4/MetricController.java

@@ -19,15 +19,15 @@ String count() {
     return "count metric increased";
   }
 
-  @GetMapping("gauge/{count}")
-  String gauge(@PathVariable Long count) {
-    Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
+  @GetMapping("gauge/{value}")
+  String gauge(@PathVariable Long value) {
+    Sentry.metrics().gauge("memory.free", value.doubleValue(), "byte");
     return "gauge metric tracked";
   }
 
-  @GetMapping("distribution/{count}")
-  String distribution(@PathVariable Long count) {
-    Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
+  @GetMapping("distribution/{value}")
+  String distribution(@PathVariable Long value) {
+    Sentry.metrics().distribution("distributionMetric", value.doubleValue(), "child");
     return "distribution metric tracked";
   }
 }

sentry-samples/sentry-samples-spring-boot-4-webflux/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt

@@ -20,8 +20,6 @@ class MetricsSystemTest {
     assertEquals("count metric increased", restClient.getCountMetric())
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
     }
@@ -33,8 +31,6 @@ class MetricsSystemTest {
     assertEquals("gauge metric tracked", restClient.getGaugeMetric(14))
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
     }
@@ -46,8 +42,6 @@ class MetricsSystemTest {
     assertEquals("distribution metric tracked", restClient.getDistributionMetric(23))
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
     }

sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/MetricController.java

@@ -19,15 +19,15 @@ String count() {
     return "count metric increased";
   }
 
-  @GetMapping("gauge/{count}")
-  String gauge(@PathVariable Long count) {
-    Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
+  @GetMapping("gauge/{value}")
+  String gauge(@PathVariable Long value) {
+    Sentry.metrics().gauge("memory.free", value.doubleValue(), "byte");
     return "gauge metric tracked";
   }
 
-  @GetMapping("distribution/{count}")
-  String distribution(@PathVariable Long count) {
-    Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
+  @GetMapping("distribution/{value}")
+  String distribution(@PathVariable Long value) {
+    Sentry.metrics().distribution("distributionMetric", value.doubleValue(), "child");
     return "distribution metric tracked";
   }
 }

sentry-samples/sentry-samples-spring-boot-4/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt

@@ -20,8 +20,6 @@ class MetricsSystemTest {
     assertEquals("count metric increased", restClient.getCountMetric())
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
     }
@@ -33,8 +31,6 @@ class MetricsSystemTest {
     assertEquals("gauge metric tracked", restClient.getGaugeMetric(14))
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
     }
@@ -46,8 +42,6 @@ class MetricsSystemTest {
     assertEquals("distribution metric tracked", restClient.getDistributionMetric(23))
     assertEquals(200, restClient.lastKnownStatusCode)
 
-    Thread.sleep(10000)
-
     testHelper.ensureMetricsReceived { event, header ->
       testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
     }