funcodingdev
diff --git a/‎CHANGELOG.md‎
Lines changed: 4 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎sentry-compose-helper/src/jvmMain/java/io/sentry/compose/gestures/ComposeGestureTargetLocator.java‎
Lines changed: 8 additions & 6 deletions b/‎sentry-compose-helper/src/jvmMain/java/io/sentry/compose/gestures/ComposeGestureTargetLocator.java‎
Lines changed: 8 additions & 6 deletions
@@ -7,6 +7,10 @@
 - Add new threshold parameters to monitor config ([#3181](https://github.com/getsentry/sentry-java/pull/3181))
 - Report process init time as a span for app start performance ([#3159](https://github.com/getsentry/sentry-java/pull/3159))
 
+## Fixes
+
+- Fix Jetpack Compose widgets are not being correctly identified for user interaction tracing ([#3209](https://github.com/getsentry/sentry-java/pull/3209))
+
 ## 7.3.0
 
 ### Features
 
@@ -48,15 +48,18 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {
       }
     }
 
-    @Nullable String targetTag = null;
-
     if (!(root instanceof Owner)) {
       return null;
     }
 
     final @NotNull Queue<LayoutNode> queue = new LinkedList<>();
     queue.add(((Owner) root).getRoot());
 
+    // the final tag to return
+    @Nullable String targetTag = null;
+
+    // the last known tag when iterating the node tree
+    @Nullable String lastKnownTag = null;
     while (!queue.isEmpty()) {
       final @Nullable LayoutNode node = queue.poll();
       if (node == null) {
@@ -66,7 +69,6 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {
       if (node.isPlaced() && layoutNodeBoundsContain(composeHelper, node, x, y)) {
         boolean isClickable = false;
         boolean isScrollable = false;
-        @Nullable String testTag = null;
 
         final List<ModifierInfo> modifiers = node.getModifierInfo();
         for (ModifierInfo modifierInfo : modifiers) {
@@ -83,7 +85,7 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {
                 isClickable = true;
               } else if ("SentryTag".equals(key) || "TestTag".equals(key)) {
                 if (entry.getValue() instanceof String) {
-                  testTag = (String) entry.getValue();
+                  lastKnownTag = (String) entry.getValue();
                 }
               }
             }
@@ -100,10 +102,10 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {
         }
 
         if (isClickable && targetType == UiElement.Type.CLICKABLE) {
-          targetTag = testTag;
+          targetTag = lastKnownTag;
         }
         if (isScrollable && targetType == UiElement.Type.SCROLLABLE) {
-          targetTag = testTag;
+          targetTag = lastKnownTag;
           // skip any children for scrollable targets
           break;
         }
Original file line number	Diff line number	Diff line change
`@@ -48,15 +48,18 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- @Nullable String targetTag = null;`
`52`		`-`
`53`	`51`	`if (!(root instanceof Owner)) {`
`54`	`52`	`return null;`
`55`	`53`	`}`
`56`	`54`
`57`	`55`	`final @NotNull Queue<LayoutNode> queue = new LinkedList<>();`
`58`	`56`	`queue.add(((Owner) root).getRoot());`
`59`	`57`
	`58`	`+ // the final tag to return`
	`59`	`+ @Nullable String targetTag = null;`
	`60`	`+`
	`61`	`+ // the last known tag when iterating the node tree`
	`62`	`+ @Nullable String lastKnownTag = null;`
`60`	`63`	`while (!queue.isEmpty()) {`
`61`	`64`	`final @Nullable LayoutNode node = queue.poll();`
`62`	`65`	`if (node == null) {`
`@@ -66,7 +69,6 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {`
`66`	`69`	`if (node.isPlaced() && layoutNodeBoundsContain(composeHelper, node, x, y)) {`
`67`	`70`	`boolean isClickable = false;`
`68`	`71`	`boolean isScrollable = false;`
`69`		`- @Nullable String testTag = null;`
`70`	`72`
`71`	`73`	`final List<ModifierInfo> modifiers = node.getModifierInfo();`
`72`	`74`	`for (ModifierInfo modifierInfo : modifiers) {`
`@@ -83,7 +85,7 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {`
`83`	`85`	`isClickable = true;`
`84`	`86`	`} else if ("SentryTag".equals(key) \|\| "TestTag".equals(key)) {`
`85`	`87`	`if (entry.getValue() instanceof String) {`
`86`		`- testTag = (String) entry.getValue();`
	`88`	`+ lastKnownTag = (String) entry.getValue();`
`87`	`89`	`}`
`88`	`90`	`}`
`89`	`91`	`}`
`@@ -100,10 +102,10 @@ public ComposeGestureTargetLocator(final @NotNull ILogger logger) {`
`100`	`102`	`}`
`101`	`103`
`102`	`104`	`if (isClickable && targetType == UiElement.Type.CLICKABLE) {`
`103`		`- targetTag = testTag;`
	`105`	`+ targetTag = lastKnownTag;`
`104`	`106`	`}`
`105`	`107`	`if (isScrollable && targetType == UiElement.Type.SCROLLABLE) {`
`106`		`- targetTag = testTag;`
	`108`	`+ targetTag = lastKnownTag;`
`107`	`109`	`// skip any children for scrollable targets`
`108`	`110`	`break;`
`109`	`111`	`}`