Skip to content

feat(metrics): [Trace Metrics 28] Use MeasurementUnit for Metrics #5022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adinauer wants to merge 1 commit into
base: 01-12-automatically_use_sentryoptions.metrics.beforesendmetriccallback_spring_beans
Choose a base branch
from
+214 −132
Draft

feat(metrics): [Trace Metrics 28] Use MeasurementUnit for Metrics #5022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/MetricController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.sentry.samples.spring7.web;

import io.sentry.MeasurementUnit;
import io.sentry.Sentry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -21,13 +22,15 @@ String count() {

@GetMapping("gauge/{count}")
String gauge(@PathVariable("count") Long count) {
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
return "gauge metric tracked";
}

@GetMapping("distribution/{count}")
String distribution(@PathVariable("count") Long count) {
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
String distribution(@PathVariable Long count) {
Sentry.metrics()
.distribution(
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
return "distribution metric tracked";
}
}
2 changes: 1 addition & 1 deletion ...samples/sentry-samples-spring-7/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
}
}
}
7 changes: 5 additions & 2 deletions ...-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/MetricController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.sentry.samples.spring.boot4;

import io.sentry.MeasurementUnit;
import io.sentry.Sentry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -21,13 +22,15 @@ String count() {

@GetMapping("gauge/{count}")
String gauge(@PathVariable Long count) {
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
return "gauge metric tracked";
}

@GetMapping("distribution/{count}")
String distribution(@PathVariable Long count) {
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
Sentry.metrics()
.distribution(
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
return "distribution metric tracked";
}
}
4 changes: 2 additions & 2 deletions ...ng-boot-4-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
}
}

Expand All @@ -49,7 +49,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
}
}
}
7 changes: 5 additions & 2 deletions ...g-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/MetricController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.sentry.samples.spring.boot4;

import io.sentry.MeasurementUnit;
import io.sentry.Sentry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -21,13 +22,15 @@ String count() {

@GetMapping("gauge/{count}")
String gauge(@PathVariable Long count) {
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
return "gauge metric tracked";
}

@GetMapping("distribution/{count}")
String distribution(@PathVariable Long count) {
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
Sentry.metrics()
.distribution(
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
return "distribution metric tracked";
}
}
4 changes: 2 additions & 2 deletions ...les-spring-boot-4-opentelemetry/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
}
}

Expand All @@ -49,7 +49,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
}
}
}
7 changes: 5 additions & 2 deletions ...-spring-boot-4-webflux/src/main/java/io/sentry/samples/spring/boot4/MetricController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.sentry.samples.spring.boot4;

import io.sentry.MeasurementUnit;
import io.sentry.Sentry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -21,13 +22,15 @@ String count() {

@GetMapping("gauge/{count}")
String gauge(@PathVariable Long count) {
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
return "gauge metric tracked";
}

@GetMapping("distribution/{count}")
String distribution(@PathVariable Long count) {
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
Sentry.metrics()
.distribution(
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
return "distribution metric tracked";
}
}
4 changes: 2 additions & 2 deletions ...y-samples-spring-boot-4-webflux/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
}
}

Expand All @@ -49,7 +49,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
}
}
}
7 changes: 5 additions & 2 deletions ...-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/MetricController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.sentry.samples.spring.boot4;

import io.sentry.MeasurementUnit;
import io.sentry.Sentry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -21,13 +22,15 @@ String count() {

@GetMapping("gauge/{count}")
String gauge(@PathVariable Long count) {
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
return "gauge metric tracked";
}

@GetMapping("distribution/{count}")
String distribution(@PathVariable Long count) {
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
Sentry.metrics()
.distribution(
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
return "distribution metric tracked";
}
}
4 changes: 2 additions & 2 deletions ...es/sentry-samples-spring-boot-4/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
}
}

Expand All @@ -49,7 +49,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
}
}
}
7 changes: 5 additions & 2 deletions ...lemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/MetricController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.sentry.samples.spring.boot.jakarta;

import io.sentry.MeasurementUnit;
import io.sentry.Sentry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -21,13 +22,15 @@ String count() {

@GetMapping("gauge/{count}")
String gauge(@PathVariable Long count) {
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
return "gauge metric tracked";
}

@GetMapping("distribution/{count}")
String distribution(@PathVariable Long count) {
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
Sentry.metrics()
.distribution(
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
return "distribution metric tracked";
}
}
4 changes: 2 additions & 2 deletions ...t-jakarta-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
}
}

Expand All @@ -49,7 +49,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
}
}
}
7 changes: 5 additions & 2 deletions ...a-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/MetricController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.sentry.samples.spring.boot.jakarta;

import io.sentry.MeasurementUnit;
import io.sentry.Sentry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -21,13 +22,15 @@ String count() {

@GetMapping("gauge/{count}")
String gauge(@PathVariable Long count) {
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
return "gauge metric tracked";
}

@GetMapping("distribution/{count}")
String distribution(@PathVariable Long count) {
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
Sentry.metrics()
.distribution(
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
return "distribution metric tracked";
}
}
4 changes: 2 additions & 2 deletions ...ring-boot-jakarta-opentelemetry/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
}
}

Expand All @@ -49,7 +49,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
}
}
}
7 changes: 5 additions & 2 deletions ...ng-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/MetricController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.sentry.samples.spring.boot.jakarta;

import io.sentry.MeasurementUnit;
import io.sentry.Sentry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -21,13 +22,15 @@ String count() {

@GetMapping("gauge/{count}")
String gauge(@PathVariable Long count) {
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
return "gauge metric tracked";
}

@GetMapping("distribution/{count}")
String distribution(@PathVariable Long count) {
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
Sentry.metrics()
.distribution(
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
return "distribution metric tracked";
}
}
4 changes: 2 additions & 2 deletions ...try-samples-spring-boot-jakarta/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
}
}

Expand All @@ -49,7 +49,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
}
}
}
7 changes: 5 additions & 2 deletions ...t-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/MetricController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.sentry.samples.spring.boot;

import io.sentry.MeasurementUnit;
import io.sentry.Sentry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -21,13 +22,15 @@ String count() {

@GetMapping("gauge/{count}")
String gauge(@PathVariable Long count) {
Sentry.metrics().gauge("memory.free", count.doubleValue(), "byte");
Sentry.metrics().gauge("memory.free", count.doubleValue(), MeasurementUnit.Information.BYTE);
return "gauge metric tracked";
}

@GetMapping("distribution/{count}")
String distribution(@PathVariable Long count) {
Sentry.metrics().distribution("distributionMetric", count.doubleValue(), "child");
Sentry.metrics()
.distribution(
"distributionMetric", count.doubleValue(), MeasurementUnit.Duration.MILLISECOND);
return "distribution metric tracked";
}
}
4 changes: 2 additions & 2 deletions ...ring-boot-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0)
testHelper.doesContainMetric(event, "memory.free", "gauge", 14.0, "byte")
}
}

Expand All @@ -49,7 +49,7 @@ class MetricsSystemTest {
Thread.sleep(10000)

testHelper.ensureMetricsReceived { event, header ->
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0)
testHelper.doesContainMetric(event, "distributionMetric", "distribution", 23.0, "millisecond")
}
}
}
Loading
Loading