Merge eaea0dd into 27d7cf8

stefanosiano · web-flow · commit c4bc643a4a94 · 2025-10-24T14:08:58.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Miscellaneous
+
+- Collect PerformanceCollectionData only in sampled transactions ([#4834](https://github.com/getsentry/sentry-java/pull/4834))
+
 ## 8.24.0
 
 ### Features
diff --git a/sentry/src/main/java/io/sentry/SentryTracer.java b/sentry/src/main/java/io/sentry/SentryTracer.java
@@ -90,8 +90,8 @@ public SentryTracer(
     }
 
     // We are currently sending the performance data only in profiles, but we are always sending
-    // performance measurements.
-    if (compositePerformanceCollector != null) {
+    // performance measurements (frames data in spans).
+    if (compositePerformanceCollector != null && Boolean.TRUE.equals(isSampled())) {
       compositePerformanceCollector.start(this);
     }
 
diff --git a/sentry/src/test/java/io/sentry/SentryTracerTest.kt b/sentry/src/test/java/io/sentry/SentryTracerTest.kt
@@ -1175,6 +1175,12 @@ class SentryTracerTest {
     verify(fixture.compositePerformanceCollector).start(anyOrNull<ITransaction>())
   }
 
+  @Test
+  fun `when transaction is created, but not sampled, compositePerformanceCollector is not started`() {
+    val transaction = fixture.getSut(samplingDecision = TracesSamplingDecision(false))
+    verify(fixture.compositePerformanceCollector, never()).start(anyOrNull<ITransaction>())
+  }
+
   @Test
   fun `when transaction is created and profiled compositePerformanceCollector is started`() {
     val transaction =

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,8 @@ public SentryTracer(`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// We are currently sending the performance data only in profiles, but we are always sending`
`93`		`- // performance measurements.`
`94`		`- if (compositePerformanceCollector != null) {`
	`93`	`+ // performance measurements (frames data in spans).`
	`94`	`+ if (compositePerformanceCollector != null && Boolean.TRUE.equals(isSampled())) {`
`95`	`95`	`compositePerformanceCollector.start(this);`
`96`	`96`	`}`
`97`	`97`