Merge branch 'main' into rz/perf/modules-preload

Author: romtsn

CHANGELOG.md

@@ -9,9 +9,16 @@
 ### Fixes
 
 - Fix TTFD measurement when API called too early ([#4297](https://github.com/getsentry/sentry-java/pull/4297))
+- Tag sockets traffic originating from Sentry's HttpConnection ([#4340](https://github.com/getsentry/sentry-java/pull/4340))
+  - This should suppress the StrictMode's `UntaggedSocketViolation`
+- Reduce debug logs verbosity ([#4341](https://github.com/getsentry/sentry-java/pull/4341))
 - Fix unregister `SystemEventsBroadcastReceiver` when entering background ([#4338](https://github.com/getsentry/sentry-java/pull/4338))
   - This should reduce ANRs seen with this class in the stack trace for Android 14 and above
 
+### Improvements
+
+- Make user interaction tracing faster and do fewer allocations ([#4347](https://github.com/getsentry/sentry-java/pull/4347))
+
 ## 8.8.0
 
 ### Features

scripts/toggle-codec-logs.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+
+# --- Functions ---
+
+print_usage() {
+    echo "Usage: $0 [enable|disable]"
+    exit 1
+}
+
+# Check for adb
+if ! command -v adb &> /dev/null; then
+    echo "❌ adb not found. Please install Android Platform Tools and ensure adb is in your PATH."
+    exit 1
+fi
+
+# Check for connected device
+DEVICE_COUNT=$(adb devices | grep -w "device" | wc -l)
+if [ "$DEVICE_COUNT" -eq 0 ]; then
+    echo "❌ No device connected. Please connect a device and enable USB debugging."
+    exit 1
+fi
+
+# --- Handle Argument ---
+
+ACTION=$(echo "$1" | tr '[:upper:]' '[:lower:]')
+
+case "$ACTION" in
+    enable)
+        echo "✅ Enabling native logs (DEBUG)..."
+        adb shell setprop log.tag.MPEG4Writer D
+        adb shell setprop log.tag.CCodec D
+        adb shell setprop log.tag.VQApply D
+        adb shell setprop log.tag.ColorUtils D
+        adb shell setprop log.tag.MediaCodec D
+        adb shell setprop log.tag.MediaCodecList D
+        adb shell setprop log.tag.MediaWriter D
+        adb shell setprop log.tag.CCodecConfig D
+        adb shell setprop log.tag.Codec2Client D
+        adb shell setprop log.tag.CCodecBufferChannel D
+        adb shell setprop log.tag.CodecProperties D
+        adb shell setprop log.tag.CodecSeeding D
+        adb shell setprop log.tag.C2Store D
+        adb shell setprop log.tag.C2NodeImpl D
+        adb shell setprop log.tag.GraphicBufferSource D
+        adb shell setprop log.tag.BufferQueueProducer D
+        adb shell setprop log.tag.ReflectedParamUpdater D
+        adb shell setprop log.tag.hw-BpHwBinder D
+        echo "✅ Logs ENABLED"
+        ;;
+    disable)
+        echo "🚫 Disabling native logs (SILENT)..."
+        adb shell setprop log.tag.MPEG4Writer SILENT
+        adb shell setprop log.tag.CCodec SILENT
+        adb shell setprop log.tag.VQApply SILENT
+        adb shell setprop log.tag.ColorUtils SILENT
+        adb shell setprop log.tag.MediaCodec SILENT
+        adb shell setprop log.tag.MediaCodecList SILENT
+        adb shell setprop log.tag.MediaWriter SILENT
+        adb shell setprop log.tag.CCodecConfig SILENT
+        adb shell setprop log.tag.Codec2Client SILENT
+        adb shell setprop log.tag.CCodecBufferChannel SILENT
+        adb shell setprop log.tag.CodecProperties SILENT
+        adb shell setprop log.tag.CodecSeeding SILENT
+        adb shell setprop log.tag.C2Store SILENT
+        adb shell setprop log.tag.C2NodeImpl SILENT
+        adb shell setprop log.tag.GraphicBufferSource SILENT
+        adb shell setprop log.tag.BufferQueueProducer SILENT
+        adb shell setprop log.tag.ReflectedParamUpdater SILENT
+        adb shell setprop log.tag.hw-BpHwBinder SILENT
+        echo "🚫 Logs DISABLED"
+        ;;
+    *)
+        echo "❓ Unknown or missing argument: '$1'"
+        print_usage
+        ;;
+esac

sentry-android-core/api/sentry-android-core.api

@@ -111,6 +111,12 @@ public class io/sentry/android/core/AndroidProfiler$ProfileStartData {
 	public fun <init> (JJLjava/util/Date;)V
 }
 
+public final class io/sentry/android/core/AndroidSocketTagger : io/sentry/ISocketTagger {
+	public static fun getInstance ()Lio/sentry/android/core/AndroidSocketTagger;
+	public fun tagSockets ()V
+	public fun untagSockets ()V
+}
+
 public final class io/sentry/android/core/AnrIntegration : io/sentry/Integration, java/io/Closeable {
 	public fun <init> (Landroid/content/Context;)V
 	public fun close ()V

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

@@ -15,6 +15,7 @@
 import io.sentry.NoOpCompositePerformanceCollector;
 import io.sentry.NoOpConnectionStatusProvider;
 import io.sentry.NoOpContinuousProfiler;
+import io.sentry.NoOpSocketTagger;
 import io.sentry.NoOpTransactionProfiler;
 import io.sentry.NoopVersionDetector;
 import io.sentry.ScopeType;
@@ -238,6 +239,9 @@ static void initializeIntegrationsAndProcessors(
     if (options.getThreadChecker() instanceof NoOpThreadChecker) {
       options.setThreadChecker(AndroidThreadChecker.getInstance());
     }
+    if (options.getSocketTagger() instanceof NoOpSocketTagger) {
+      options.setSocketTagger(AndroidSocketTagger.getInstance());
+    }
     if (options.getPerformanceCollectors().isEmpty()) {
       options.addPerformanceCollector(new AndroidMemoryCollector());
       options.addPerformanceCollector(new AndroidCpuCollector(options.getLogger()));

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

@@ -0,0 +1,30 @@
+package io.sentry.android.core;
+
+import android.net.TrafficStats;
+import io.sentry.ISocketTagger;
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.Internal
+public final class AndroidSocketTagger implements ISocketTagger {
+
+  // just a random number to tag outgoing traffic from the Sentry SDK
+  private static final int SENTRY_TAG = 0xF001;
+
+  private static final AndroidSocketTagger instance = new AndroidSocketTagger();
+
+  private AndroidSocketTagger() {}
+
+  public static AndroidSocketTagger getInstance() {
+    return instance;
+  }
+
+  @Override
+  public void tagSockets() {
+    TrafficStats.setThreadStatsTag(SENTRY_TAG);
+  }
+
+  @Override
+  public void untagSockets() {
+    TrafficStats.clearThreadStatsTag();
+  }
+}

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

@@ -109,6 +109,8 @@ final class ManifestMetadataReader {
 
   static final String REPLAYS_MASK_ALL_IMAGES = "io.sentry.session-replay.mask-all-images";
 
+  static final String REPLAYS_DEBUG = "io.sentry.session-replay.debug";
+
   static final String FORCE_INIT = "io.sentry.force-init";
 
   static final String MAX_BREADCRUMBS = "io.sentry.max-breadcrumbs";
@@ -452,6 +454,8 @@ static void applyMetadata(
             .getSessionReplay()
             .setMaskAllImages(readBool(metadata, logger, REPLAYS_MASK_ALL_IMAGES, true));
 
+        options.getSessionReplay().setDebug(readBool(metadata, logger, REPLAYS_DEBUG, false));
+
         options.setIgnoredErrors(readList(metadata, logger, IGNORED_ERRORS));
 
         final @Nullable List<String> includes = readList(metadata, logger, IN_APP_INCLUDES);

sentry-android-core/src/main/java/io/sentry/android/core/internal/debugmeta/AssetsDebugMetaLoader.java

@@ -41,7 +41,7 @@ public AssetsDebugMetaLoader(final @NotNull Context context, final @NotNull ILog
       properties.load(is);
       return Collections.singletonList(properties);
     } catch (FileNotFoundException e) {
-      logger.log(SentryLevel.INFO, e, "%s file was not found.", DEBUG_META_PROPERTIES_FILENAME);
+      logger.log(SentryLevel.INFO, "%s file was not found.", DEBUG_META_PROPERTIES_FILENAME);
     } catch (IOException e) {
       logger.log(SentryLevel.ERROR, "Error getting Proguard UUIDs.", e);
     } catch (RuntimeException e) {

sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/ViewUtils.java

@@ -8,6 +8,7 @@
 import io.sentry.internal.gestures.GestureTargetLocator;
 import io.sentry.internal.gestures.UiElement;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Queue;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -60,6 +61,7 @@ private static boolean touchWithinBounds(
       final float y,
       final UiElement.Type targetType) {
 
+    final List<GestureTargetLocator> locators = options.getGestureTargetLocators();
     final Queue<View> queue = new LinkedList<>();
     queue.add(decorView);
 
@@ -79,7 +81,8 @@ private static boolean touchWithinBounds(
         }
       }
 
-      for (GestureTargetLocator locator : options.getGestureTargetLocators()) {
+      for (int i = 0; i < locators.size(); i++) {
+        final GestureTargetLocator locator = locators.get(i);
         final @Nullable UiElement newTarget = locator.locate(view, x, y, targetType);
         if (newTarget != null) {
           if (targetType == UiElement.Type.CLICKABLE) {

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

@@ -11,6 +11,7 @@ import io.sentry.DefaultCompositePerformanceCollector
 import io.sentry.IConnectionStatusProvider
 import io.sentry.IContinuousProfiler
 import io.sentry.ILogger
+import io.sentry.ISocketTagger
 import io.sentry.ITransactionProfiler
 import io.sentry.MainEventProcessor
 import io.sentry.NoOpContinuousProfiler
@@ -746,6 +747,13 @@ class AndroidOptionsInitializerTest {
         assertTrue { fixture.sentryOptions.threadChecker is AndroidThreadChecker }
     }
 
+    @Test
+    fun `AndroidSocketTagger is set to options`() {
+        fixture.initSut()
+
+        assertTrue { fixture.sentryOptions.socketTagger is AndroidSocketTagger }
+    }
+
     @Test
     fun `does not install ComposeGestureTargetLocator, if sentry-compose is not available`() {
         fixture.initSutWithClassLoader()
@@ -859,6 +867,7 @@ class AndroidOptionsInitializerTest {
             setModulesLoader(mock<IModulesLoader>())
             setDebugMetaLoader(mock<IDebugMetaLoader>())
             threadChecker = mock<IThreadChecker>()
+            setSocketTagger(mock<ISocketTagger>())
             compositePerformanceCollector = mock<CompositePerformanceCollector>()
         })
 
@@ -868,6 +877,7 @@ class AndroidOptionsInitializerTest {
         assertFalse { fixture.sentryOptions.modulesLoader is AssetsModulesLoader }
         assertFalse { fixture.sentryOptions.debugMetaLoader is AssetsDebugMetaLoader }
         assertFalse { fixture.sentryOptions.threadChecker is AndroidThreadChecker }
+        assertFalse { fixture.sentryOptions.socketTagger is AndroidSocketTagger }
         assertFalse { fixture.sentryOptions.compositePerformanceCollector is DefaultCompositePerformanceCollector }
     }
 }

sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayIntegration.kt

@@ -151,8 +151,7 @@ public class ReplayIntegration(
             } catch (e: Throwable) {
                 options.logger.log(
                     INFO,
-                    "ComponentCallbacks is not available, orientation changes won't be handled by Session replay",
-                    e
+                    "ComponentCallbacks is not available, orientation changes won't be handled by Session replay"
                 )
             }
         }