Skip to content

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

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

Open
adinauer wants to merge 1 commit into
base: 01-12-automatically_use_sentryoptions.metrics.beforesendmetriccallback_spring_beans
Choose a base branch
from
+94 −184
Open

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

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
12 changes: 6 additions & 6 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
Expand Up @@ -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";
}
}
6 changes: 0 additions & 6 deletions ...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 @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
12 changes: 6 additions & 6 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
Expand Up @@ -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";
}
}
6 changes: 0 additions & 6 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 @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
12 changes: 6 additions & 6 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
Expand Up @@ -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";
}
}
6 changes: 0 additions & 6 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 @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
12 changes: 6 additions & 6 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
Expand Up @@ -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";
}
}
6 changes: 0 additions & 6 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 @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
12 changes: 6 additions & 6 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
Expand Up @@ -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";
}
}
6 changes: 0 additions & 6 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 @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
12 changes: 6 additions & 6 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
Expand Up @@ -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";
}
}
6 changes: 0 additions & 6 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 @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
12 changes: 6 additions & 6 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
Expand Up @@ -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";
}
}
6 changes: 0 additions & 6 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 @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
12 changes: 6 additions & 6 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
Expand Up @@ -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";
}
}
6 changes: 0 additions & 6 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 @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
Loading
Loading