Cache internal fields

Author: markushi

sentry-compose-helper/api/sentry-compose-helper.api

@@ -1,6 +1,6 @@
 public class io/sentry/compose/SentryComposeHelper {
 	public fun <init> (Lio/sentry/ILogger;)V
-	public static fun extractTag (Landroidx/compose/ui/Modifier;)Ljava/lang/String;
+	public fun extractTag (Landroidx/compose/ui/Modifier;)Ljava/lang/String;
 	public fun getLayoutNodeBoundsInWindow (Landroidx/compose/ui/node/LayoutNode;)Landroidx/compose/ui/geometry/Rect;
 }
 

sentry-compose-helper/src/jvmMain/java/io/sentry/compose/SentryComposeHelper.java

@@ -1,5 +1,6 @@
 package io.sentry.compose;
 
+import androidx.annotation.NonNull;
 import androidx.compose.ui.Modifier;
 import androidx.compose.ui.geometry.Rect;
 import androidx.compose.ui.layout.LayoutCoordinatesKt;
@@ -15,27 +16,32 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@SuppressWarnings("KotlinInternalInJava")
 public class SentryComposeHelper {
 
   private final @NotNull ILogger logger;
-  private Field layoutDelegateField = null;
+  private final @Nullable Field layoutDelegateField;
+  private final @Nullable Field testTagElementField;
+  private final @Nullable Field sentryTagElementField;
 
   @Nullable
-  public static String extractTag(final @NotNull Modifier modifier) {
+  public String extractTag(final @NotNull Modifier modifier) {
     final @Nullable String type = modifier.getClass().getCanonicalName();
     // 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
-    if ("androidx.compose.ui.platform.TestTagElement".equals(type)
-        || "io.sentry.compose.SentryModifier.SentryTagModifierNodeElement".equals(type)) {
-      try {
-        final Field tagField = modifier.getClass().getDeclaredField("tag");
-        tagField.setAccessible(true);
-        final @Nullable Object value = tagField.get(modifier);
+    try {
+      if ("androidx.compose.ui.platform.TestTagElement".equals(type)
+          && testTagElementField != null) {
+        final @Nullable Object value = testTagElementField.get(modifier);
+        return (String) value;
+      } else if ("io.sentry.compose.SentryModifier.SentryTagModifierNodeElement".equals(type)
+          && sentryTagElementField != null) {
+        final @Nullable Object value = sentryTagElementField.get(modifier);
         return (String) value;
-      } catch (Throwable e) {
-        // ignored
       }
+    } catch (Throwable e) {
+      // ignored
     }
 
     // Older versions use SemanticsModifier
@@ -56,13 +62,11 @@ public static String extractTag(final @NotNull Modifier modifier) {
 
   public SentryComposeHelper(final @NotNull ILogger logger) {
     this.logger = logger;
-    try {
-      final Class<?> clazz = Class.forName("androidx.compose.ui.node.LayoutNode");
-      layoutDelegateField = clazz.getDeclaredField("layoutDelegate");
-      layoutDelegateField.setAccessible(true);
-    } catch (Exception e) {
-      logger.log(SentryLevel.WARNING, "Could not find LayoutNode.layoutDelegate field");
-    }
+    layoutDelegateField =
+        loadField(logger, "androidx.compose.ui.node.LayoutNode", "layoutDelegate");
+    testTagElementField = loadField(logger, "androidx.compose.ui.platform.TestTagElement", "tag");
+    sentryTagElementField =
+        loadField(logger, "io.sentry.compose.SentryModifier.SentryTagModifierNodeElement", "tag");
   }
 
   public @Nullable Rect getLayoutNodeBoundsInWindow(@NotNull final LayoutNode node) {
@@ -77,4 +81,18 @@ public SentryComposeHelper(final @NotNull ILogger logger) {
     }
     return null;
   }
+
+  @Nullable
+  private static Field loadField(
+      @NonNull ILogger logger, final @NotNull String className, final @NotNull String fieldName) {
+    try {
+      final Class<?> clazz = Class.forName(className);
+      final @Nullable Field field = clazz.getDeclaredField(fieldName);
+      field.setAccessible(true);
+      return field;
+    } catch (Exception e) {
+      logger.log(SentryLevel.WARNING, "Could not load " + className + "." + fieldName + " field");
+    }
+    return null;
+  }
 }

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

@@ -76,7 +76,7 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {
 
         final List<ModifierInfo> modifiers = node.getModifierInfo();
         for (ModifierInfo modifierInfo : modifiers) {
-          final @Nullable String tag = SentryComposeHelper.extractTag(modifierInfo.getModifier());
+          final @Nullable String tag = composeHelper.extractTag(modifierInfo.getModifier());
           if (tag != null) {
             lastKnownTag = tag;
           }

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

@@ -55,7 +55,7 @@ private static void addChild(
       @NotNull final LayoutNode node) {
     if (node.isPlaced()) {
       final ViewHierarchyNode vhNode = new ViewHierarchyNode();
-      setTag(node, vhNode);
+      setTag(composeHelper, node, vhNode);
       setBounds(composeHelper, node, parentNode, vhNode);
 
       if (vhNode.getTag() != null) {
@@ -79,11 +79,13 @@ private static void addChild(
   }
 
   private static void setTag(
-      final @NotNull LayoutNode node, final @NotNull ViewHierarchyNode vhNode) {
+      final @NotNull SentryComposeHelper helper,
+      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) {
-      final @Nullable String tag = SentryComposeHelper.extractTag(modifierInfo.getModifier());
+      final @Nullable String tag = helper.extractTag(modifierInfo.getModifier());
       if (tag != null) {
         vhNode.setTag(tag);
       }