Fix tags missing for compose view hierarchies

Author: markushi

sentry-compose-helper/src/jvmMain/java/io/sentry/compose/gestures/ComposeGestureTargetLocator.java

@@ -75,6 +75,7 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {
         boolean isClickable = false;
         boolean isScrollable = false;
 
+        // needs to be in-sync with ComposeGestureTargetLocator
         final List<ModifierInfo> modifiers = node.getModifierInfo();
         for (ModifierInfo modifierInfo : modifiers) {
           if (modifierInfo.getModifier() instanceof SemanticsModifier) {
@@ -103,7 +104,8 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {
               isClickable = true;
             } else if ("androidx.compose.foundation.ScrollingLayoutElement".equals(type)) {
               isScrollable = true;
-            } else if ("androidx.compose.ui.platform.TestTagElement".equals(type)) {
+            } else if ("androidx.compose.ui.platform.TestTagElement".equals(type)
+                || "io.sentry.compose.SentryModifier.SentryTagModifierNodeElement".equals(type)) {
               // Newer Jetpack Compose uses TestTagElement as node elements
               // See
               // https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/TestTag.kt;l=34;drc=dcaa116fbfda77e64a319e1668056ce3b032469f

sentry-compose-helper/src/jvmMain/java/io/sentry/compose/viewhierarchy/ComposeViewHierarchyExporter.java

@@ -1,6 +1,7 @@
 package io.sentry.compose.viewhierarchy;
 
 import androidx.compose.runtime.collection.MutableVector;
+import androidx.compose.ui.Modifier;
 import androidx.compose.ui.geometry.Rect;
 import androidx.compose.ui.layout.ModifierInfo;
 import androidx.compose.ui.node.LayoutNode;
@@ -14,6 +15,7 @@
 import io.sentry.internal.viewhierarchy.ViewHierarchyExporter;
 import io.sentry.protocol.ViewHierarchyNode;
 import io.sentry.util.AutoClosableReentrantLock;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -84,9 +86,13 @@ private static void addChild(
 
   private static void setTag(
       final @NotNull LayoutNode node, final @NotNull ViewHierarchyNode vhNode) {
+    // needs to be in-sync with ComposeGestureTargetLocator
     final List<ModifierInfo> modifiers = node.getModifierInfo();
     for (ModifierInfo modifierInfo : modifiers) {
-      if (modifierInfo.getModifier() instanceof SemanticsModifier) {
+      final @NotNull Modifier modifier = modifierInfo.getModifier();
+      // Newer Jetpack Compose 1.5 uses Node modifier elements
+      final @Nullable String type = modifier.getClass().getCanonicalName();
+      if (modifier instanceof SemanticsModifier) {
         final SemanticsModifier semanticsModifierCore =
             (SemanticsModifier) modifierInfo.getModifier();
         final SemanticsConfiguration semanticsConfiguration =
@@ -99,6 +105,21 @@ private static void setTag(
             }
           }
         }
+      } else if ("androidx.compose.ui.platform.TestTagElement".equals(type)
+          || "io.sentry.compose.SentryModifier.SentryTagModifierNodeElement".equals(type)) {
+        // Newer Jetpack Compose uses TestTagElement as node elements
+        // See
+        // https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/ui/ui/src/commonMain/kotlin/androidx/compose/ui/platform/TestTag.kt;l=34;drc=dcaa116fbfda77e64a319e1668056ce3b032469f
+        try {
+          final Field tagField = modifier.getClass().getDeclaredField("tag");
+          tagField.setAccessible(true);
+          final @Nullable Object value = tagField.get(modifier);
+          if (value instanceof String) {
+            vhNode.setTag((String) value);
+          }
+        } catch (Throwable e) {
+          // ignored
+        }
       }
     }
   }

sentry-compose/proguard-rules.pro

@@ -13,6 +13,7 @@
 -keepnames class androidx.compose.foundation.CombinedClickableElement
 -keepnames class androidx.compose.foundation.ScrollingLayoutElement
 -keepnames class androidx.compose.ui.platform.TestTagElement { *; }
+-keepnames class io.sentry.compose.SentryModifier.SentryTagModifierNodeElement { *; }
 
 # R8 will warn about missing classes if people don't have androidx.compose-navigation on their
 # classpath, but this is fine, these classes are used in an internal class which is only used when