Skip to content

Commit 71d5894

Browse files
adinaueradinauer
committed
Use MeasurementUnit for Metrics
1 parent 4d16452 commit 71d5894

37 files changed

Lines changed: 214 additions & 132 deletions

File tree

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.sentry.samples.spring7.web;
22

3+
import io.sentry.MeasurementUnit;
34
import io.sentry.Sentry;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
@@ -21,13 +22,15 @@ String count() {
2122

2223
@GetMapping("gauge/{count}")
2324
String gauge(@PathVariable("count") Long count) {
24-
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
25+
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
2526
return "gauge metric tracked";
2627
}
2728

2829
@GetMapping("distribution/{count}")
29-
String distribution(@PathVariable("count") Long count) {
30-
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
30+
String distribution(@PathVariable Long count) {
31+
Sentry.metrics()
32+
.distribution(
33+
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
3134
return "distribution metric tracked";
3235
}
3336
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class MetricsSystemTest {
4949
Thread.sleep(10000)
5050

5151
testHelper.ensureMetricsReceived { event, header ->
52-
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
52+
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
5353
}
5454
}
5555
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.sentry.samples.spring.boot4;
22

3+
import io.sentry.MeasurementUnit;
34
import io.sentry.Sentry;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
@@ -21,13 +22,15 @@ String count() {
2122

2223
@GetMapping("gauge/{count}")
2324
String gauge(@PathVariable Long count) {
24-
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
25+
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
2526
return "gauge metric tracked";
2627
}
2728

2829
@GetMapping("distribution/{count}")
2930
String distribution(@PathVariable Long count) {
30-
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
31+
Sentry.metrics()
32+
.distribution(
33+
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
3134
return "distribution metric tracked";
3235
}
3336
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class MetricsSystemTest {
3636
Thread.sleep(10000)
3737

3838
testHelper.ensureMetricsReceived { event, header ->
39-
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
39+
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
4040
}
4141
}
4242

@@ -49,7 +49,7 @@ class MetricsSystemTest {
4949
Thread.sleep(10000)
5050

5151
testHelper.ensureMetricsReceived { event, header ->
52-
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
52+
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
5353
}
5454
}
5555
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.sentry.samples.spring.boot4;
22

3+
import io.sentry.MeasurementUnit;
34
import io.sentry.Sentry;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
@@ -21,13 +22,15 @@ String count() {
2122

2223
@GetMapping("gauge/{count}")
2324
String gauge(@PathVariable Long count) {
24-
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
25+
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
2526
return "gauge metric tracked";
2627
}
2728

2829
@GetMapping("distribution/{count}")
2930
String distribution(@PathVariable Long count) {
30-
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
31+
Sentry.metrics()
32+
.distribution(
33+
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
3134
return "distribution metric tracked";
3235
}
3336
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class MetricsSystemTest {
3636
Thread.sleep(10000)
3737

3838
testHelper.ensureMetricsReceived { event, header ->
39-
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
39+
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
4040
}
4141
}
4242

@@ -49,7 +49,7 @@ class MetricsSystemTest {
4949
Thread.sleep(10000)
5050

5151
testHelper.ensureMetricsReceived { event, header ->
52-
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
52+
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
5353
}
5454
}
5555
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.sentry.samples.spring.boot4;
22

3+
import io.sentry.MeasurementUnit;
34
import io.sentry.Sentry;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
@@ -21,13 +22,15 @@ String count() {
2122

2223
@GetMapping("gauge/{count}")
2324
String gauge(@PathVariable Long count) {
24-
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
25+
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
2526
return "gauge metric tracked";
2627
}
2728

2829
@GetMapping("distribution/{count}")
2930
String distribution(@PathVariable Long count) {
30-
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
31+
Sentry.metrics()
32+
.distribution(
33+
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
3134
return "distribution metric tracked";
3235
}
3336
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class MetricsSystemTest {
3636
Thread.sleep(10000)
3737

3838
testHelper.ensureMetricsReceived { event, header ->
39-
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
39+
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
4040
}
4141
}
4242

@@ -49,7 +49,7 @@ class MetricsSystemTest {
4949
Thread.sleep(10000)
5050

5151
testHelper.ensureMetricsReceived { event, header ->
52-
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
52+
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
5353
}
5454
}
5555
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.sentry.samples.spring.boot4;
22

3+
import io.sentry.MeasurementUnit;
34
import io.sentry.Sentry;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
@@ -21,13 +22,15 @@ String count() {
2122

2223
@GetMapping("gauge/{count}")
2324
String gauge(@PathVariable Long count) {
24-
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
25+
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
2526
return "gauge metric tracked";
2627
}
2728

2829
@GetMapping("distribution/{count}")
2930
String distribution(@PathVariable Long count) {
30-
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
31+
Sentry.metrics()
32+
.distribution(
33+
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
3134
return "distribution metric tracked";
3235
}
3336
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class MetricsSystemTest {
3636
Thread.sleep(10000)
3737

3838
testHelper.ensureMetricsReceived { event, header ->
39-
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
39+
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
4040
}
4141
}
4242

@@ -49,7 +49,7 @@ class MetricsSystemTest {
4949
Thread.sleep(10000)
5050

5151
testHelper.ensureMetricsReceived { event, header ->
52-
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
52+
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
5353
}
5454
}
5555
}

0 commit comments

Comments
 (0)