Merge branch 'main' into antonis/feedback-shake

Author: antonis

.claude/skills/create-java-pr/SKILL.md

@@ -123,6 +123,12 @@ Skip this step for standalone PRs.
 
 After creating the PR, update the PR description on **every other PR in the stack — including the collection branch PR** — so all PRs have the same up-to-date stack list. Follow the format and commands in `.cursor/rules/pr.mdc` § "Stack List in PR Description".
 
+**Important:** When updating PR bodies, never use shell redirects (`>`, `>>`) or pipes (`|`) or compound commands (`&&`). These create compound shell expressions that won't match permission patterns. Instead:
+- Use `gh pr view <NUMBER> --json body --jq '.body'` to get the body (output returned directly)
+- Use the `Write` tool to save it to a temp file
+- Use the `Edit` tool to modify the temp file
+- Use `gh pr edit <NUMBER> --body-file /tmp/pr-body.md` to update
+
 ## Step 6: Update Changelog
 
 First, determine whether a changelog entry is needed. **Skip this step** (and go straight to "No changelog needed" below) if the changes are not user-facing, for example:
@@ -173,8 +179,6 @@ git push
 
 If no changelog entry is needed, add `#skip-changelog` to the PR description to disable the changelog CI check:
 
-```bash
-gh pr view <PR_NUMBER> --json body --jq '.body' > /tmp/pr-body.md
-printf '\n#skip-changelog\n' >> /tmp/pr-body.md
-gh pr edit <PR_NUMBER> --body-file /tmp/pr-body.md
-```
+1. Get the current body: `gh pr view <PR_NUMBER> --json body --jq '.body'`
+2. Use the `Write` tool to save the output to `/tmp/pr-body.md`, appending `\n#skip-changelog\n` at the end
+3. Update: `gh pr edit <PR_NUMBER> --body-file /tmp/pr-body.md`

.cursor/rules/pr.mdc

@@ -206,9 +206,9 @@ Format:
 ```markdown
 ## PR Stack (<Topic>)
 
-- [#5118](https://github.com/getsentry/sentry-java/pull/5118) — Add scope-level attributes API
-- [#5120](https://github.com/getsentry/sentry-java/pull/5120) — Wire scope attributes into LoggerApi and MetricsApi
-- [#5121](https://github.com/getsentry/sentry-java/pull/5121) — Showcase scope attributes in Spring Boot 4 samples
+- #5118
+- #5120
+- #5121
 
 ---
 ```
@@ -223,19 +223,13 @@ No status column — GitHub already shows that. The `---` separates the stack li
 
 This does not apply to standalone PRs or the collection branch PR.
 
-To update the PR description, use `--body-file` to avoid shell quoting issues with special characters in the body:
+To update the PR description, use `--body-file` to avoid shell quoting issues with special characters in the body.
 
-```bash
-# Get current PR description into a temp file
-gh pr view <PR_NUMBER> --json body --jq '.body' > /tmp/pr-body.md
-
-# Edit /tmp/pr-body.md to prepend or replace the stack list section
-# (replace everything from "## PR Stack" up to and including the "---" separator,
-#  or prepend before the existing description if no stack list exists yet)
+**Important:** Do not use shell redirects (`>`, `>>`, `|`) or compound commands (`&&`, `||`). These create compound shell expressions that won't match permission patterns. Instead, use the `Write` and `Edit` tools for file manipulation:
 
-# Update the description
-gh pr edit <PR_NUMBER> --body-file /tmp/pr-body.md
-```
+1. Read the current body with `gh pr view <PR_NUMBER> --json body --jq '.body'` (the output is returned directly — use the `Write` tool to save it to `/tmp/pr-body.md`)
+2. Use the `Edit` tool to prepend or replace the stack list section in `/tmp/pr-body.md`
+3. Update the description: `gh pr edit <PR_NUMBER> --body-file /tmp/pr-body.md`
 
 ### Merging Stacked PRs (done by the user, not the agent)
 

CHANGELOG.md

@@ -8,14 +8,35 @@
   - Enable via `options.getFeedbackOptions().setUseShakeGesture(true)` or manifest meta-data `io.sentry.feedback.use-shake-gesture`
   - Uses the device's accelerometer — no special permissions required
 
+## 8.35.0
+
+### Fixes
+
+- Android: Remove the dependency on protobuf-lite for tombstones ([#5157](https://github.com/getsentry/sentry-java/pull/5157))
+
+### Features
+
+- Add new experimental option to capture profiles for ANRs ([#4899](https://github.com/getsentry/sentry-java/pull/4899))
+  - This feature will capture a stack profile of the main thread when it gets unresponsive
+  - The profile gets attached to the ANR event on the next app start, providing a flamegraph of the ANR issue on the sentry issue details page
+  - Enable via `options.setAnrProfilingSampleRate(<sample-rate>)` or AndroidManifest.xml: `<meta-data android:name="io.sentry.anr.profiling.sample-rate" android:value="[0.0-1.0]" />`
+  - The sample rate controls the probability of collecting a profile for each detected foreground ANR (0.0 to 1.0, null to disable)
+
+### Behavioral Changes
+
+- Add `enableAnrFingerprinting` option which assigns static fingerprints to ANR events with system-only stacktraces
+  - When enabled, ANRs whose stacktraces contain only system frames (e.g. `java.lang` or `android.os`) are grouped into a single issue instead of creating many separate issues
+  - This will help to reduce overall ANR issue noise in the Sentry dashboard
+  - **IMPORTANT:** This option is enabled by default.
+  - Disable via `options.setEnableAnrFingerprinting(false)` or AndroidManifest.xml: `<meta-data android:name="io.sentry.anr.enable-fingerprinting" android:value="false" />`
+
 ## 8.34.1
 
 ### Fixes
 
 - Common: Finalize previous session even when auto session tracking is disabled ([#5154](https://github.com/getsentry/sentry-java/pull/5154))
 - Android: Add `filterTouchesWhenObscured` to prevent Tapjacking on user feedback dialog ([#5155](https://github.com/getsentry/sentry-java/pull/5155))
 - Android: Add proguard rules to prevent error about missing Replay classes ([#5153](https://github.com/getsentry/sentry-java/pull/5153))
-- Android: Remove the dependency on protobuf-lite for tombstones ([#5157](https://github.com/getsentry/sentry-java/pull/5157))
 
 ## 8.34.0
 
@@ -54,14 +75,6 @@
     <meta-data android:name="io.sentry.screenshot.mask-all-images" android:value="true" />
     ```
 - The `ManifestMetaDataReader` now read the `DIST` ([#5107](https://github.com/getsentry/sentry-java/pull/5107))
-- Add new experimental option to capture profiles for ANRs ([#4899](https://github.com/getsentry/sentry-java/pull/4899))
-  - This feature will capture a stack profile of the main thread when it gets unresponsive
-  - The profile gets attached to the ANR event on the next app start, providing a flamegraph of the ANR issue on the sentry issue details page
-  - Enable via `options.setAnrProfilingSampleRate(<sample-rate>)` or AndroidManifest.xml: `<meta-data android:name="io.sentry.anr.profiling.sample-rate" android:value="[0.0-1.0]" />`
-  - The sample rate controls the probability of collecting a profile for each detected foreground ANR (0.0 to 1.0, null to disable)
-- Add `enableAnrFingerprinting` option to reduce ANR noise by assigning static fingerprints to ANR events with system-only stacktraces
-  - When enabled, ANRs whose stacktraces contain only system frames (e.g. `java.lang` or `android.os`) are grouped into a single issue instead of creating many separate issues
-  - Enable via `options.setEnableAnrFingerprinting(true)` or AndroidManifest.xml: `<meta-data android:name="io.sentry.anr.enable-fingerprinting" android:value="true" />`
 
 ### Fixes
 

gradle.properties

@@ -12,7 +12,7 @@ android.useAndroidX=true
 android.experimental.lint.version=8.9.0
 
 # Release information
-versionName=8.34.1
+versionName=8.35.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

sentry-samples/sentry-samples-console-opentelemetry-noagent/src/main/java/io/sentry/samples/console/Main.java

@@ -63,6 +63,8 @@ public static void main(String[] args) throws InterruptedException {
 
     Sentry.addFeatureFlag("my-feature-flag", true);
 
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
     captureMetrics();
 
     // Sending exception:

sentry-samples/sentry-samples-console-opentelemetry-noagent/src/test/kotlin/sentry/systemtest/ConsoleApplicationSystemTest.kt

@@ -111,7 +111,9 @@ class ConsoleApplicationSystemTest {
     testHelper.ensureMetricsReceived { metricsEvents, sentryEnvelopeHeader ->
       testHelper.doesContainMetric(metricsEvents, "countMetric", "counter", 1.0) &&
         testHelper.doesContainMetric(metricsEvents, "gaugeMetric", "gauge", 5.0) &&
-        testHelper.doesContainMetric(metricsEvents, "distributionMetric", "distribution", 7.0)
+        testHelper.doesContainMetric(metricsEvents, "distributionMetric", "distribution", 7.0) &&
+        testHelper.doesMetricHaveAttribute(metricsEvents, "countMetric", "user.type", "admin") &&
+        testHelper.doesMetricHaveAttribute(metricsEvents, "countMetric", "feature.version", 2)
     }
   }
 }

sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java

@@ -128,6 +128,8 @@ public static void main(String[] args) throws InterruptedException {
 
     Sentry.addFeatureFlag("my-feature-flag", true);
 
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
     captureMetrics();
 
     // Sending exception:

sentry-samples/sentry-samples-console/src/test/kotlin/io/sentry/systemtest/ConsoleApplicationSystemTest.kt

@@ -106,7 +106,9 @@ class ConsoleApplicationSystemTest {
     testHelper.ensureMetricsReceived { metricsEvents, sentryEnvelopeHeader ->
       testHelper.doesContainMetric(metricsEvents, "countMetric", "counter", 1.0) &&
         testHelper.doesContainMetric(metricsEvents, "gaugeMetric", "gauge", 5.0) &&
-        testHelper.doesContainMetric(metricsEvents, "distributionMetric", "distribution", 7.0)
+        testHelper.doesContainMetric(metricsEvents, "distributionMetric", "distribution", 7.0) &&
+        testHelper.doesMetricHaveAttribute(metricsEvents, "countMetric", "user.type", "admin") &&
+        testHelper.doesMetricHaveAttribute(metricsEvents, "countMetric", "feature.version", 2)
     }
   }
 }

sentry-samples/sentry-samples-jul/src/main/java/io/sentry/samples/jul/Main.java

@@ -23,6 +23,9 @@ public static void main(String[] args) throws Exception {
     MDC.put("userId", UUID.randomUUID().toString());
     MDC.put("requestId", UUID.randomUUID().toString());
 
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
+    Sentry.setAttribute("debug.enabled", true);
     Sentry.addFeatureFlag("my-feature-flag", true);
 
     LOGGER.warning("important warning");

sentry-samples/sentry-samples-jul/src/test/kotlin/io/sentry/systemtest/ConsoleApplicationSystemTest.kt

@@ -64,7 +64,20 @@ class ConsoleApplicationSystemTest {
 
     testHelper.ensureLogsReceived { logs, _ ->
       testHelper.doesContainLogWithBody(logs, "User has made a purchase of product: 445") &&
-        testHelper.doesContainLogWithBody(logs, "Something went wrong")
+        testHelper.doesContainLogWithBody(logs, "Something went wrong") &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "Something went wrong",
+          "user.type",
+          "admin",
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "Something went wrong",
+          "feature.version",
+          2,
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(logs, "Something went wrong", "debug.enabled", true)
     }
   }
 }