Merge branch 'main' into feat/profiling-remove-vendored-code

Author: lbloder

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # pin@v2
+        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # pin@v2
         with:
           languages: 'java'
 
@@ -45,4 +45,4 @@ jobs:
           ./gradlew buildForCodeQL --no-build-cache
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # pin@v2
+        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # pin@v2

CHANGELOG.md

@@ -10,6 +10,7 @@
 
 - Fallback to distinct-id as user.id logging attribute when user is not set ([#4847](https://github.com/getsentry/sentry-java/pull/4847))
 - Report Timber.tag() as `timber.tag` log attribute ([#4845](https://github.com/getsentry/sentry-java/pull/4845))
+- Session Replay: Add screenshot strategy serialization to RRWeb events ([#4851](https://github.com/getsentry/sentry-java/pull/4851))
 
 ## 8.25.0
 

sentry/src/main/java/io/sentry/rrweb/RRWebOptionsEvent.java

@@ -6,6 +6,7 @@
 import io.sentry.JsonUnknown;
 import io.sentry.ObjectReader;
 import io.sentry.ObjectWriter;
+import io.sentry.ScreenshotStrategyType;
 import io.sentry.SentryOptions;
 import io.sentry.SentryReplayOptions;
 import io.sentry.protocol.SdkVersion;
@@ -52,6 +53,12 @@ public RRWebOptionsEvent(final @NotNull SentryOptions options) {
     optionsPayload.put("quality", replayOptions.getQuality().serializedName());
     optionsPayload.put("maskedViewClasses", replayOptions.getMaskViewClasses());
     optionsPayload.put("unmaskedViewClasses", replayOptions.getUnmaskViewClasses());
+
+    final String screenshotStrategy =
+        (replayOptions.getScreenshotStrategy() == ScreenshotStrategyType.PIXEL_COPY)
+            ? "pixelCopy"
+            : "canvas";
+    optionsPayload.put("screenshotStrategy", screenshotStrategy);
   }
 
   @NotNull

sentry/src/test/resources/json/rrweb_options_event.json

@@ -12,7 +12,8 @@
       "maskedViewClasses": [],
       "nativeSdkName": "sentry.java",
       "sessionSampleRate": 0.5,
-      "quality": "low"
+      "quality": "low",
+      "screenshotStrategy": "pixelCopy"
     }
   }
 }