Merge branch 'main' into feat/bump-otel-1_51_0

Author: adinauer

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # pin@v2
+        uses: github/codeql-action/init@39edc492dbe16b1465b0cafca41432d857bdb31a # pin@v2
         with:
           languages: 'java'
 
@@ -45,4 +45,4 @@ jobs:
           ./gradlew buildForCodeQL --no-build-cache
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # pin@v2
+        uses: github/codeql-action/analyze@39edc492dbe16b1465b0cafca41432d857bdb31a # pin@v2

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- Optimize scope when maxBreadcrumb is 0 ([#4504](https://github.com/getsentry/sentry-java/pull/4504))
 - Fix javadoc on TransportResult ([#4528](https://github.com/getsentry/sentry-java/pull/4528))
 
 ### Dependencies
@@ -15,6 +16,10 @@
   - `opentelemetry-semconv` to `1.34.0`
   - We are now configuring OpenTelemetry to still behave the same way it did before for span names it generates in GraphQL auto instrumentation ([#4537](https://github.com/getsentry/sentry-java/pull/4537))
 
+### Internal
+
+- Flattened PerformanceCollectionData ([#4505](https://github.com/getsentry/sentry-java/pull/4505))
+
 ## 8.16.0
 
 ### Features

sentry-android-core/src/main/java/io/sentry/android/core/AndroidCpuCollector.java

@@ -3,12 +3,10 @@
 import android.os.SystemClock;
 import android.system.Os;
 import android.system.OsConstants;
-import io.sentry.CpuCollectionData;
 import io.sentry.ILogger;
 import io.sentry.IPerformanceSnapshotCollector;
 import io.sentry.PerformanceCollectionData;
 import io.sentry.SentryLevel;
-import io.sentry.SentryNanotimeDate;
 import io.sentry.util.FileUtils;
 import io.sentry.util.Objects;
 import java.io.File;
@@ -72,11 +70,8 @@ public void collect(final @NotNull PerformanceCollectionData performanceCollecti
     // number from 0 to 100, so we are going to multiply it by 100
     final double cpuUsagePercentage = cpuNanosDiff / (double) realTimeNanosDiff;
 
-    CpuCollectionData cpuData =
-        new CpuCollectionData(
-            (cpuUsagePercentage / (double) numCores) * 100.0, new SentryNanotimeDate());
-
-    performanceCollectionData.addCpuData(cpuData);
+    performanceCollectionData.setCpuUsagePercentage(
+        (cpuUsagePercentage / (double) numCores) * 100.0);
   }
 
   /** Read the /proc/self/stat file and parses the result. */

sentry-android-core/src/main/java/io/sentry/android/core/AndroidMemoryCollector.java

@@ -2,9 +2,7 @@
 
 import android.os.Debug;
 import io.sentry.IPerformanceSnapshotCollector;
-import io.sentry.MemoryCollectionData;
 import io.sentry.PerformanceCollectionData;
-import io.sentry.SentryNanotimeDate;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -18,8 +16,7 @@ public void setup() {}
   public void collect(final @NotNull PerformanceCollectionData performanceCollectionData) {
     long usedMemory = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
     long usedNativeMemory = Debug.getNativeHeapSize() - Debug.getNativeHeapFreeSize();
-    MemoryCollectionData memoryData =
-        new MemoryCollectionData(usedMemory, usedNativeMemory, new SentryNanotimeDate());
-    performanceCollectionData.addMemoryData(memoryData);
+    performanceCollectionData.setUsedHeapMemory(usedMemory);
+    performanceCollectionData.setUsedNativeMemory(usedNativeMemory);
   }
 }

sentry-android-core/src/main/java/io/sentry/android/core/AndroidProfiler.java

@@ -4,14 +4,11 @@
 import android.os.Debug;
 import android.os.Process;
 import android.os.SystemClock;
-import io.sentry.CpuCollectionData;
 import io.sentry.DateUtils;
 import io.sentry.ILogger;
 import io.sentry.ISentryExecutorService;
 import io.sentry.ISentryLifecycleToken;
-import io.sentry.MemoryCollectionData;
 import io.sentry.PerformanceCollectionData;
-import io.sentry.SentryDate;
 import io.sentry.SentryLevel;
 import io.sentry.SentryNanotimeDate;
 import io.sentry.SentryUUID;
@@ -156,7 +153,7 @@ public void onFrameMetricCollected(
                   // profileStartNanos is calculated through SystemClock.elapsedRealtimeNanos(),
                   // but frameEndNanos uses System.nanotime(), so we convert it to get the timestamp
                   // relative to profileStartNanos
-                  final SentryDate timestamp = new SentryNanotimeDate();
+                  final long timestampNanos = new SentryNanotimeDate().nanoTimestamp();
                   final long frameTimestampRelativeNanos =
                       frameEndNanos
                           - System.nanoTime()
@@ -171,17 +168,17 @@ public void onFrameMetricCollected(
                   if (isFrozen) {
                     frozenFrameRenderMeasurements.addLast(
                         new ProfileMeasurementValue(
-                            frameTimestampRelativeNanos, durationNanos, timestamp));
+                            frameTimestampRelativeNanos, durationNanos, timestampNanos));
                   } else if (isSlow) {
                     slowFrameRenderMeasurements.addLast(
                         new ProfileMeasurementValue(
-                            frameTimestampRelativeNanos, durationNanos, timestamp));
+                            frameTimestampRelativeNanos, durationNanos, timestampNanos));
                   }
                   if (refreshRate != lastRefreshRate) {
                     lastRefreshRate = refreshRate;
                     screenFrameRateMeasurements.addLast(
                         new ProfileMeasurementValue(
-                            frameTimestampRelativeNanos, refreshRate, timestamp));
+                            frameTimestampRelativeNanos, refreshRate, timestampNanos));
                   }
                 }
               });
@@ -318,32 +315,28 @@ private void putPerformanceCollectionDataInMeasurements(
           new ArrayDeque<>(performanceCollectionData.size());
 
       synchronized (performanceCollectionData) {
-        for (PerformanceCollectionData performanceData : performanceCollectionData) {
-          CpuCollectionData cpuData = performanceData.getCpuData();
-          MemoryCollectionData memoryData = performanceData.getMemoryData();
-          if (cpuData != null) {
+        for (final @NotNull PerformanceCollectionData data : performanceCollectionData) {
+          final long nanoTimestamp = data.getNanoTimestamp();
+          final long relativeStartNs = nanoTimestamp + timestampDiff;
+          final @Nullable Double cpuUsagePercentage = data.getCpuUsagePercentage();
+          final @Nullable Long usedHeapMemory = data.getUsedHeapMemory();
+          final @Nullable Long usedNativeMemory = data.getUsedNativeMemory();
+
+          if (cpuUsagePercentage != null) {
             cpuUsageMeasurements.add(
-                new ProfileMeasurementValue(
-                    cpuData.getTimestamp().nanoTimestamp() + timestampDiff,
-                    cpuData.getCpuUsagePercentage(),
-                    cpuData.getTimestamp()));
+                new ProfileMeasurementValue(relativeStartNs, cpuUsagePercentage, nanoTimestamp));
           }
-          if (memoryData != null && memoryData.getUsedHeapMemory() > -1) {
+          if (usedHeapMemory != null) {
             memoryUsageMeasurements.add(
-                new ProfileMeasurementValue(
-                    memoryData.getTimestamp().nanoTimestamp() + timestampDiff,
-                    memoryData.getUsedHeapMemory(),
-                    memoryData.getTimestamp()));
+                new ProfileMeasurementValue(relativeStartNs, usedHeapMemory, nanoTimestamp));
           }
-          if (memoryData != null && memoryData.getUsedNativeMemory() > -1) {
+          if (usedNativeMemory != null) {
             nativeMemoryUsageMeasurements.add(
-                new ProfileMeasurementValue(
-                    memoryData.getTimestamp().nanoTimestamp() + timestampDiff,
-                    memoryData.getUsedNativeMemory(),
-                    memoryData.getTimestamp()));
+                new ProfileMeasurementValue(relativeStartNs, usedNativeMemory, nanoTimestamp));
           }
         }
       }
+
       if (!cpuUsageMeasurements.isEmpty()) {
         measurementsMap.put(
             ProfileMeasurement.ID_CPU_USAGE,

sentry-android-core/src/test/java/io/sentry/android/core/AndroidContinuousProfilerTest.kt

@@ -5,17 +5,14 @@ import android.os.Build
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.sentry.CompositePerformanceCollector
-import io.sentry.CpuCollectionData
 import io.sentry.DataCategory
 import io.sentry.IConnectionStatusProvider
 import io.sentry.ILogger
 import io.sentry.IScopes
-import io.sentry.MemoryCollectionData
 import io.sentry.PerformanceCollectionData
 import io.sentry.ProfileLifecycle
 import io.sentry.Sentry
 import io.sentry.SentryLevel
-import io.sentry.SentryNanotimeDate
 import io.sentry.SentryTracer
 import io.sentry.TracesSampler
 import io.sentry.TransactionContext
@@ -427,10 +424,11 @@ class AndroidContinuousProfilerTest {
   @Test
   fun `profiler sends chunk with measurements`() {
     val performanceCollector = mock<CompositePerformanceCollector>()
-    val collectionData = PerformanceCollectionData()
+    val collectionData = PerformanceCollectionData(10)
 
-    collectionData.addMemoryData(MemoryCollectionData(2, 3, SentryNanotimeDate()))
-    collectionData.addCpuData(CpuCollectionData(3.0, SentryNanotimeDate()))
+    collectionData.usedHeapMemory = 2
+    collectionData.usedNativeMemory = 3
+    collectionData.cpuUsagePercentage = 3.0
     whenever(performanceCollector.stop(any<String>())).thenReturn(listOf(collectionData))
 
     fixture.options.compositePerformanceCollector = performanceCollector

sentry-android-core/src/test/java/io/sentry/android/core/AndroidCpuCollectorTest.kt

@@ -28,20 +28,19 @@ class AndroidCpuCollectorTest {
 
   @Test
   fun `collect works only after setup`() {
-    val data = PerformanceCollectionData()
+    val data = PerformanceCollectionData(10)
     fixture.getSut().collect(data)
-    assertNull(data.cpuData)
+    assertNull(data.cpuUsagePercentage)
   }
 
   @Test
   fun `when collect cpu is collected`() {
-    val data = PerformanceCollectionData()
+    val data = PerformanceCollectionData(10)
     val collector = fixture.getSut()
     collector.setup()
     collector.collect(data)
-    val cpuData = data.cpuData
+    val cpuData = data.cpuUsagePercentage
     assertNotNull(cpuData)
-    assertNotEquals(0.0, cpuData.cpuUsagePercentage)
-    assertNotEquals(0, cpuData.timestamp.nanoTimestamp())
+    assertNotEquals(0.0, cpuData)
   }
 }

sentry-android-core/src/test/java/io/sentry/android/core/AndroidMemoryCollectorTest.kt

@@ -17,15 +17,14 @@ class AndroidMemoryCollectorTest {
 
   @Test
   fun `when collect, both native and heap memory are collected`() {
-    val data = PerformanceCollectionData()
+    val data = PerformanceCollectionData(10)
     val usedNativeMemory = Debug.getNativeHeapSize() - Debug.getNativeHeapFreeSize()
     val usedMemory = fixture.runtime.totalMemory() - fixture.runtime.freeMemory()
     fixture.collector.collect(data)
-    val memoryData = data.memoryData
-    assertNotNull(memoryData)
-    assertNotEquals(-1, memoryData.usedNativeMemory)
-    assertEquals(usedNativeMemory, memoryData.usedNativeMemory)
-    assertEquals(usedMemory, memoryData.usedHeapMemory)
-    assertNotEquals(0, memoryData.timestamp.nanoTimestamp())
+    assertNotNull(data.usedHeapMemory)
+    assertNotNull(data.usedNativeMemory)
+    assertNotEquals(-1, data.usedNativeMemory)
+    assertEquals(usedNativeMemory, data.usedNativeMemory)
+    assertEquals(usedMemory, data.usedHeapMemory)
   }
 }

sentry-android-core/src/test/java/io/sentry/android/core/AndroidProfilerTest.kt

@@ -3,12 +3,9 @@ package io.sentry.android.core
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.sentry.CpuCollectionData
 import io.sentry.ILogger
 import io.sentry.ISentryExecutorService
-import io.sentry.MemoryCollectionData
 import io.sentry.PerformanceCollectionData
-import io.sentry.SentryDate
 import io.sentry.SentryExecutorService
 import io.sentry.SentryLevel
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector
@@ -276,15 +273,15 @@ class AndroidProfilerTest {
   fun `profiler includes performance measurements when passed on end`() {
     val profiler = fixture.getSut()
     val performanceCollectionData = ArrayList<PerformanceCollectionData>()
-    var singleData = PerformanceCollectionData()
-    val t1 = mock<SentryDate>()
-    val t2 = mock<SentryDate>()
-    singleData.addMemoryData(MemoryCollectionData(2, 3, t1))
-    singleData.addCpuData(CpuCollectionData(1.4, t1))
+    var singleData = PerformanceCollectionData(10)
+    singleData.usedHeapMemory = 2
+    singleData.usedNativeMemory = 3
+    singleData.cpuUsagePercentage = 1.4
     performanceCollectionData.add(singleData)
 
-    singleData = PerformanceCollectionData()
-    singleData.addMemoryData(MemoryCollectionData(3, 4, t2))
+    singleData = PerformanceCollectionData(20)
+    singleData.usedHeapMemory = 3
+    singleData.usedNativeMemory = 4
     performanceCollectionData.add(singleData)
 
     profiler.start()

sentry-android-core/src/test/java/io/sentry/android/core/AndroidTransactionProfilerTest.kt

@@ -4,11 +4,9 @@ import android.content.Context
 import android.os.Build
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.sentry.CpuCollectionData
 import io.sentry.ILogger
 import io.sentry.IScopes
 import io.sentry.ISentryExecutorService
-import io.sentry.MemoryCollectionData
 import io.sentry.PerformanceCollectionData
 import io.sentry.ProfilingTraceData
 import io.sentry.SentryLevel
@@ -472,13 +470,15 @@ class AndroidTransactionProfilerTest {
   fun `profiler includes performance measurements when passed on transaction finish`() {
     val profiler = fixture.getSut(context)
     val performanceCollectionData = ArrayList<PerformanceCollectionData>()
-    var singleData = PerformanceCollectionData()
-    singleData.addMemoryData(MemoryCollectionData(2, 3, mock()))
-    singleData.addCpuData(CpuCollectionData(1.4, mock()))
+    var singleData = PerformanceCollectionData(10)
+    singleData.usedHeapMemory = 2
+    singleData.usedNativeMemory = 3
+    singleData.cpuUsagePercentage = 1.4
     performanceCollectionData.add(singleData)
 
-    singleData = PerformanceCollectionData()
-    singleData.addMemoryData(MemoryCollectionData(3, 4, mock()))
+    singleData = PerformanceCollectionData(20)
+    singleData.usedHeapMemory = 3
+    singleData.usedNativeMemory = 4
     performanceCollectionData.add(singleData)
 
     profiler.start()