added scope replay id and screen as url

captureFeedback does not update scope lastEventId anymore

Author: stefanosiano

sentry/src/main/java/io/sentry/ISentryClient.java

@@ -88,10 +88,20 @@ public interface ISentryClient {
    * @return The Id (SentryId object) of the event
    */
   default @NotNull SentryId captureFeedback(
-      @NotNull Feedback feedback, @Nullable Hint hint, @Nullable IScope scope) {
+      @NotNull Feedback feedback, @Nullable Hint hint, @NotNull IScope scope) {
     SentryEvent event = new SentryEvent();
     event.getContexts().setFeedback(feedback);
 
+    if (feedback.getReplayId() == null) {
+      final @NotNull SentryId replayId = scope.getReplayId();
+      if (!replayId.equals(SentryId.EMPTY_ID)) {
+        feedback.setReplayId(replayId);
+      }
+    }
+    if (feedback.getUrl() == null) {
+      feedback.setUrl(scope.getScreen());
+    }
+
     return captureEvent(event, scope, hint);
   }
 

sentry/src/main/java/io/sentry/Scopes.java

@@ -171,7 +171,7 @@ private void assignTraceContext(final @NotNull SentryEvent event) {
     getCombinedScopeView().assignTraceContext(event);
   }
 
-  private IScope buildLocalScope(
+  private @NotNull IScope buildLocalScope(
       final @NotNull IScope parentScope, final @Nullable ScopeCallback callback) {
     if (callback != null) {
       try {
@@ -249,7 +249,7 @@ private IScope buildLocalScope(
           .log(SentryLevel.WARNING, "captureFeedback called with empty message.");
     } else {
       try {
-        final IScope localScope = buildLocalScope(getCombinedScopeView(), scopeCallback);
+        final @NotNull IScope localScope = buildLocalScope(getCombinedScopeView(), scopeCallback);
 
         sentryId = getClient().captureFeedback(feedback, hint, localScope);
       } catch (Throwable e) {
@@ -258,7 +258,6 @@ private IScope buildLocalScope(
             .log(SentryLevel.ERROR, "Error while capturing feedback: " + feedback.getMessage(), e);
       }
     }
-    updateLastEventId(sentryId);
     return sentryId;
   }
 

sentry/src/main/java/io/sentry/protocol/Feedback.java

@@ -8,11 +8,11 @@
 import io.sentry.ObjectWriter;
 import io.sentry.SentryLevel;
 import io.sentry.util.CollectionUtils;
+import io.sentry.util.Objects;
 import io.sentry.vendor.gson.stream.JsonToken;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

sentry/src/test/java/io/sentry/ScopesTest.kt

@@ -609,13 +609,21 @@ class ScopesTest {
 
     //region captureFeedback tests
     @Test
-    fun `when captureFeedback is called and message is empty, lastEventId is empty`() {
+    fun `when captureFeedback is called and message is empty, client is never called`() {
         val (sut, mockClient) = getEnabledScopes()
         sut.captureFeedback(Feedback(""))
         assertEquals(SentryId.EMPTY_ID, sut.lastEventId)
         verify(mockClient, never()).captureFeedback(any(), anyOrNull(), anyOrNull())
     }
 
+    @Test
+    fun `when captureFeedback is called, lastEventId is not updated`() {
+        val (sut, mockClient) = getEnabledScopes()
+        sut.captureFeedback(Feedback("message"))
+        assertEquals(SentryId.EMPTY_ID, sut.lastEventId)
+        verify(mockClient).captureFeedback(any(), anyOrNull(), anyOrNull())
+    }
+
     @Test
     fun `when captureFeedback is called on disabled client, do nothing`() {
         val (sut, mockClient) = getEnabledScopes()

sentry/src/test/java/io/sentry/SentryClientTest.kt

@@ -295,11 +295,14 @@ class SentryClientTest {
         var sentEvent: SentryEvent? = null
         fixture.sentryOptions.setBeforeSend { e, _ -> sentEvent = e; e }
         val sut = fixture.getSut()
-        sut.captureFeedback(Feedback("message"), null, null)
+        val scope = createScope()
+        sut.captureFeedback(Feedback("message"), null, scope)
 
         val sentFeedback = sentEvent!!.contexts.feedback
         assertNotNull(sentFeedback)
         assertEquals("message", sentFeedback.message)
+        assertNull(sentFeedback.replayId)
+        assertNull(sentFeedback.url)
 
         verify(fixture.transport).send(
             check {
@@ -309,6 +312,37 @@ class SentryClientTest {
         )
     }
 
+    @Test
+    fun `when captureFeedback, scope replay id is attached to feedback`() {
+        var sentEvent: SentryEvent? = null
+        fixture.sentryOptions.setBeforeSend { e, _ -> sentEvent = e; e }
+        val replayId = SentryId()
+        val sut = fixture.getSut()
+        val scope = createScope()
+        scope.replayId = replayId
+        sut.captureFeedback(Feedback("message"), null, scope)
+
+        val sentFeedback = sentEvent!!.contexts.feedback
+        assertNotNull(sentFeedback)
+        assertEquals(replayId.toString(), sentFeedback.replayId?.toString())
+        assertNull(sentFeedback.url)
+    }
+
+    @Test
+    fun `when captureFeedback, screen is attached to feedback as url`() {
+        var sentEvent: SentryEvent? = null
+        fixture.sentryOptions.setBeforeSend { e, _ -> sentEvent = e; e }
+        val sut = fixture.getSut()
+        val scope = createScope()
+        scope.screen = "screen"
+        sut.captureFeedback(Feedback("message"), null, scope)
+
+        val sentFeedback = sentEvent!!.contexts.feedback
+        assertNotNull(sentFeedback)
+        assertEquals("screen", sentFeedback.url)
+        assertNull(sentFeedback.replayId)
+    }
+
     @Test
     fun `when event has release, value from options not applied`() {
         val event = SentryEvent()