Skip to content

Commit ea9f456

Browse files
giortzisgclaude
giortzisg
and
claude
committed
merge: Resolve changelog conflict with main
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2 parents 360fc94 + 08ffa5a commit ea9f456

76 files changed

Lines changed: 3924 additions & 957 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 55 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
---
22
name: create-java-pr
3-
description: Create a pull request in sentry-java. Use when asked to "create pr", "prepare pr", "prep pr", "open pr", "ready for pr", "prepare for review", "finalize changes". Handles branch creation, code formatting, API dump, committing, pushing, PR creation, and changelog.
3+
description: Create a pull request in sentry-java. Use when asked to "create pr", "prepare pr", "prep pr", "open pr", "ready for pr", "prepare for review", "finalize changes". Handles branch creation, code formatting, API dump, committing, pushing, PR creation, changelog, and stacked PRs.
44
---
55

66
# Create Pull Request (sentry-java)
77

88
Prepare local changes and create a pull request for the sentry-java repo.
99

10+
**Required reading:** Before proceeding, read `.cursor/rules/pr.mdc` for the full PR and stacked PR workflow details. That file is the source of truth for PR conventions, stack comment format, branch naming, and merge strategy.
11+
12+
## Step 0: Determine PR Type
13+
14+
Ask the user (or infer from context) whether this is:
15+
16+
- **Standalone PR** — a regular PR targeting `main`. Follow Steps 1–6 as written.
17+
- **First PR of a new stack** — ask for a topic name (e.g. "Global Attributes"). Create a collection branch from `main`, then branch the first PR off it. The first PR targets the collection branch.
18+
- **Next PR in an existing stack** — identify the previous stack branch and topic. This PR targets the previous stack branch.
19+
20+
If the user mentions "stack", "stacked PR", or provides a topic name with a number (e.g. `[Topic 2]`), treat it as a stacked PR. See `.cursor/rules/pr.mdc` § "Stacked PRs" for full details.
21+
1022
## Step 1: Ensure Feature Branch
1123

1224
```bash
@@ -21,6 +33,8 @@ git checkout -b <type>/<short-description>
2133

2234
Derive the branch name from the changes being made. Use `feat/`, `fix/`, `ref/`, etc. matching the commit type conventions.
2335

36+
**For stacked PRs:** For the first PR in a new stack, first create and push the collection branch (see `.cursor/rules/pr.mdc` § "Creating the Collection Branch"), then branch the PR off it. For subsequent PRs, branch off the previous stack branch. Use the naming conventions from `.cursor/rules/pr.mdc` § "Branch Naming".
37+
2438
## Step 2: Format Code and Regenerate API Files
2539

2640
```bash
@@ -92,13 +106,38 @@ Invoke the `sentry-skills:create-pr` skill to create a draft PR. When providing
92106

93107
Fill in each section based on the changes being PR'd. Check any checklist items that apply.
94108

95-
Then continue to Step 6.
109+
**For stacked PRs:**
110+
111+
- Pass `--base <previous-stack-branch>` so the PR targets the previous branch (first PR in a stack targets the collection branch).
112+
- Use the stacked PR title format: `<type>(<scope>): [<Topic> <N>] <Subject>` (see `.cursor/rules/pr.mdc` § "PR Title Naming").
113+
- Include the stack list at the top of the PR body, before the `## :scroll: Description` section (see `.cursor/rules/pr.mdc` § "Stack List in PR Description" for the format).
114+
115+
Then continue to Step 5.5 (stacked PRs only) or Step 6.
116+
117+
## Step 5.5: Update Stack List on All PRs (stacked PRs only)
118+
119+
Skip this step for standalone PRs.
120+
121+
After creating the PR, update the PR description on **every other PR in the stack** 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".
96122

97123
## Step 6: Update Changelog
98124

99-
After the PR is created, add an entry to `CHANGELOG.md` under the `## Unreleased` section.
125+
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:
126+
127+
- Test-only changes (new tests, test refactors, test fixtures)
128+
- CI/CD or build configuration changes
129+
- Documentation-only changes
130+
- Code comments or formatting-only changes
131+
- Internal refactors with no behavior change visible to SDK users
132+
- Sample app changes
133+
134+
If unsure, ask the user.
135+
136+
### If changelog is needed
137+
138+
Add an entry to `CHANGELOG.md` under the `## Unreleased` section.
100139

101-
### Determine the subsection
140+
#### Determine the subsection
102141

103142
| Change Type | Subsection |
104143
|---|---|
@@ -109,15 +148,15 @@ After the PR is created, add an entry to `CHANGELOG.md` under the `## Unreleased
109148

110149
Create the subsection under `## Unreleased` if it does not already exist.
111150

112-
### Entry format
151+
#### Entry format
113152

114153
```markdown
115154
- <Short description of the change> ([#<PR_NUMBER>](https://github.com/getsentry/sentry-java/pull/<PR_NUMBER>))
116155
```
117156

118157
Use the PR number returned by `sentry-skills:create-pr`. Match the style of existing entries — sentence case, ending with the PR link, no trailing period.
119158

120-
### Commit and push
159+
#### Commit and push
121160

122161
Stage `CHANGELOG.md`, commit with message `changelog`, and push:
123162

@@ -126,3 +165,13 @@ git add CHANGELOG.md
126165
git commit -m "changelog"
127166
git push
128167
```
168+
169+
### No changelog needed
170+
171+
If no changelog entry is needed, add `#skip-changelog` to the PR description to disable the changelog CI check:
172+
173+
```bash
174+
gh pr view <PR_NUMBER> --json body --jq '.body' > /tmp/pr-body.md
175+
printf '\n#skip-changelog\n' >> /tmp/pr-body.md
176+
gh pr edit <PR_NUMBER> --body-file /tmp/pr-body.md
177+
```

‎.cursor/rules/pr.mdc‎

Lines changed: 47 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -120,21 +120,25 @@ Stacked PRs split a large feature into small, easy-to-review PRs where each buil
120120
### Structure
121121

122122
```
123-
main → stack-pr-1 → stack-pr-2 → stack-pr-3 → ...
123+
main ← collection-branch ← stack-pr-1 ← stack-pr-2 ← stack-pr-3 ← ...
124124
```
125125

126-
- The first PR in the stack targets `main` as its base branch.
126+
- A **collection branch** is created from `main` and targets `main`. It serves as the base for the entire stack.
127+
- The first PR in the stack targets the collection branch (not `main`).
127128
- Each subsequent PR targets the previous stack PR's branch as its base.
128129
- Each PR contains only incremental changes on top of the previous one.
129130

131+
The collection branch exists so that individual stack PRs can be **merge-committed** (not squashed). PRs targeting `main` use squash merging, but that causes repeated merge conflicts when syncing the stack. Merge commits on non-`main` branches avoid this. The collection branch itself is squash-merged into `main` at the end.
132+
130133
### Branch Naming
131134

132-
Prefer a shared prefix for the feature, with descriptive suffixes per PR. The type prefix (`feat/`, `fix/`, etc.) may vary depending on the nature of each PR's changes:
135+
Prefer a shared prefix for the feature, with descriptive suffixes per PR. The collection branch uses the shared prefix. The type prefix (`feat/`, `fix/`, etc.) may vary depending on the nature of each PR's changes:
133136

134137
```
135-
feat/scope-attributes # PR 1
136-
feat/scope-attributes-logger # PR 2
137-
fix/attribute-type-detection # PR 3 (fix, different name — that's fine)
138+
feat/scope-attributes # collection branch → targets main
139+
feat/scope-attributes-api # PR 1 → targets collection branch
140+
feat/scope-attributes-logger # PR 2 → targets PR 1
141+
fix/attribute-type-detection # PR 3 (fix, different name — that's fine) → targets PR 2
138142
```
139143

140144
### PR Title Naming
@@ -158,30 +162,42 @@ Do **not** rely on branch name patterns — later PRs in a stack may use differe
158162
```bash
159163
gh pr list --head "$(git branch --show-current)" --json number,title,baseRefName --jq '.[0]'
160164
```
161-
2. Read the stack comment on that PR — it lists every PR in the stack.
162-
3. If there is no stack comment yet, walk the chain in both directions:
165+
2. Read the PR description — the stack list is at the top of the body.
166+
3. If there is no stack list yet, walk the chain in both directions:
163167
```bash
164168
# Find the PR whose head branch is the current PR's base (go up)
165169
gh pr list --head <baseRefName> --json number,title,baseRefName
166170

167171
# Find PRs whose base branch is the current PR's head (go down)
168172
gh pr list --base <currentBranch> --json number,title,headRefName
169173
```
170-
Repeat until you reach `main` going up and find no more PRs going down.
174+
Repeat until you reach the collection branch going up and find no more PRs going down.
175+
176+
### Creating the Collection Branch
177+
178+
Before the first stacked PR, create the collection branch with an empty commit (so GitHub allows opening a PR) and create the collection PR:
179+
180+
```bash
181+
git checkout main
182+
git checkout -b feat/<topic>
183+
git commit --allow-empty -m "collection: <topic>"
184+
git push -u origin HEAD
185+
gh pr create --base main --draft --title "<type>(<scope>): <Topic>" --body "Collection PR for the <Topic> stack. Squash-merge this once all stack PRs are merged."
186+
```
171187

172188
### Creating a New Stacked PR
173189

174-
1. Start from the tip of the previous stack branch (or `main` for the first PR).
190+
1. Start from the tip of the previous stack branch (or the collection branch for the first PR).
175191
2. Create a new branch, make changes, format, commit, and push.
176-
3. Create the PR with `--base <previous-branch>`:
192+
3. Create the PR with `--base <previous-branch>` (the collection branch for the first PR):
177193
```bash
178194
gh pr create --base feat/previous-branch --draft --title "<type>(<scope>): [<Topic> <N>] <Subject>" --body "..."
179195
```
180-
4. Add the stack comment to the new PR and update it on all existing PRs in the stack (see below).
196+
4. Add the stack list to the top of the new PR's description and update it on all existing PRs in the stack (see below).
181197

182-
### Stack Comment
198+
### Stack List in PR Description
183199

184-
Every PR in the stack must have a comment listing all PRs in the stack. When a new PR is added, update the comment on **all** PRs in the stack.
200+
Every PR in the stack must have a stack list **at the top of its description** (before the `## :scroll: Description` section). When a new PR is added, update the description on **all** PRs in the stack.
185201

186202
Format:
187203

@@ -191,26 +207,33 @@ Format:
191207
- [#5118](https://github.com/getsentry/sentry-java/pull/5118) — Add scope-level attributes API
192208
- [#5120](https://github.com/getsentry/sentry-java/pull/5120) — Wire scope attributes into LoggerApi and MetricsApi
193209
- [#5121](https://github.com/getsentry/sentry-java/pull/5121) — Showcase scope attributes in Spring Boot 4 samples
210+
211+
---
194212
```
195213

196-
No status column — GitHub already shows that.
214+
No status column — GitHub already shows that. The `---` separates the stack list from the rest of the PR description.
197215

198-
To add or update the stack comment on a PR:
216+
To update the PR description, use `--body-file` to avoid shell quoting issues with special characters in the body:
199217

200218
```bash
201-
# Find existing stack comment (if any)
202-
gh api repos/getsentry/sentry-java/issues/<PR_NUMBER>/comments --jq '.[] | select(.body | startswith("## PR Stack")) | .id'
219+
# Get current PR description into a temp file
220+
gh pr view <PR_NUMBER> --json body --jq '.body' > /tmp/pr-body.md
203221

204-
# Create new comment
205-
gh pr comment <PR_NUMBER> --body "<stack comment body>"
222+
# Edit /tmp/pr-body.md to prepend or replace the stack list section
223+
# (replace everything from "## PR Stack" up to and including the "---" separator,
224+
# or prepend before the existing description if no stack list exists yet)
206225

207-
# Or update existing comment
208-
gh api repos/getsentry/sentry-java/issues/comments/<COMMENT_ID> -X PATCH -f body="<stack comment body>"
226+
# Update the description
227+
gh pr edit <PR_NUMBER> --body-file /tmp/pr-body.md
209228
```
210229

211-
### Merging Stacked PRs
230+
### Merging Stacked PRs (done by the user, not the agent)
231+
232+
Individual stack PRs are merged in order from bottom to top (PR 1 first, then PR 2, etc.) using **merge commits** (not squash). After each merge, the next PR's base automatically becomes the merged branch's target. GitHub handles rebasing onto the new base.
233+
234+
Once all stack PRs are merged into the collection branch, the collection PR is **squash-merged** into `main`. This gives `main` a clean single commit for the entire feature.
212235

213-
Merge in order from bottom to top (PR 1 first, then PR 2, etc.). After each merge, the next PR's base automatically becomes the merged branch's target. GitHub handles rebasing onto the new base. Verify each PR's diff still looks correct after the previous one merges.
236+
**Do not merge PRs.** Only the user merges PRs.
214237

215238
### Syncing the Stack
216239

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @adinauer @romtsn @markushi @lcian
1+
* @adinauer @romtsn @markushi

‎.github/workflows/check-tombstone-proto-schema.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Check Tombstone Proto Schema
2+
3+
on:
4+
schedule:
5+
- cron: '0 9 * * *'
6+
workflow_dispatch:
7+
8+
jobs:
9+
check:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v6
14+
15+
- name: Check for newer Tombstone proto schema
16+
run: ./scripts/check-tombstone-proto-schema.sh

‎CHANGELOG.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222

2323
### Features
2424

25+
- Allow configuring shutdown and session flush timeouts externally ([#4641](https://github.com/getsentry/sentry-java/pull/4641))
26+
- `sentry.properties`: `shutdown-timeout-millis`, `session-flush-timeout-millis`
27+
- Environment variables: `SENTRY_SHUTDOWN_TIMEOUT_MILLIS`, `SENTRY_SESSION_FLUSH_TIMEOUT_MILLIS`
28+
- Spring Boot `application.properties`: `sentry.shutdownTimeoutMillis`, `sentry.sessionFlushTimeoutMillis`
2529
- Add scope-level attributes API ([#5118](https://github.com/getsentry/sentry-java/pull/5118)) via ([#5148](https://github.com/getsentry/sentry-java/pull/5148))
2630
- Automatically include scope attributes in logs and metrics ([#5120](https://github.com/getsentry/sentry-java/pull/5120))
2731
- New APIs are `Sentry.setAttribute`, `Sentry.setAttributes`, `Sentry.removeAttribute`
@@ -51,6 +55,14 @@
5155
<meta-data android:name="io.sentry.screenshot.mask-all-images" android:value="true" />
5256
```
5357
- The `ManifestMetaDataReader` now read the `DIST` ([#5107](https://github.com/getsentry/sentry-java/pull/5107))
58+
- Add new experimental option to capture profiles for ANRs ([#4899](https://github.com/getsentry/sentry-java/pull/4899))
59+
- This feature will capture a stack profile of the main thread when it gets unresponsive
60+
- 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
61+
- 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]" />`
62+
- The sample rate controls the probability of collecting a profile for each detected foreground ANR (0.0 to 1.0, null to disable)
63+
- Add `enableAnrFingerprinting` option to reduce ANR noise by assigning static fingerprints to ANR events with system-only stacktraces
64+
- 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
65+
- Enable via `options.setEnableAnrFingerprinting(true)` or AndroidManifest.xml: `<meta-data android:name="io.sentry.anr.enable-fingerprinting" android:value="true" />`
5466

5567
### Fixes
5668

@@ -186,7 +198,7 @@
186198
- Discard envelopes on `4xx` and `5xx` response ([#4950](https://github.com/getsentry/sentry-java/pull/4950))
187199
- This aims to not overwhelm Sentry after an outage or load shedding (including HTTP 429) where too many events are sent at once
188200

189-
### Feature
201+
### Features
190202

191203
- Add a Tombstone integration that detects native crashes without relying on the NDK integration, but instead using `ApplicationExitInfo.REASON_CRASH_NATIVE` on Android 12+. ([#4933](https://github.com/getsentry/sentry-java/pull/4933))
192204
- Currently exposed via options as an _internal_ API only.

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android.useAndroidX=true
1212
android.experimental.lint.version=8.9.0
1313

1414
# Release information
15-
versionName=8.34.0
15+
versionName=8.34.1
1616

1717
# Override the SDK name on native crashes on Android
1818
sentryAndroidSdkName=sentry.native.android

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ spotless = "7.0.4"
4141
gummyBears = "0.12.0"
4242
camerax = "1.3.0"
4343
openfeature = "1.18.2"
44-
protobuf = "3.25.8"
4544

4645
[plugins]
4746
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
@@ -61,7 +60,6 @@ spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
6160
detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" }
6261
jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
6362
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
64-
protobuf = { id = "com.google.protobuf", version = "0.9.5" }
6563
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
6664
springboot2 = { id = "org.springframework.boot", version.ref = "springboot2" }
6765
springboot3 = { id = "org.springframework.boot", version.ref = "springboot3" }
@@ -145,8 +143,7 @@ otel-javaagent-extension-api = { module = "io.opentelemetry.javaagent:openteleme
145143
otel-semconv = { module = "io.opentelemetry.semconv:opentelemetry-semconv", version.ref = "otelSemanticConventions" }
146144
otel-semconv-incubating = { module = "io.opentelemetry.semconv:opentelemetry-semconv-incubating", version.ref = "otelSemanticConventionsAlpha" }
147145
p6spy = { module = "p6spy:p6spy", version = "3.9.1" }
148-
protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobuf"}
149-
protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
146+
epitaph = { module = "com.abovevacant:epitaph", version = "0.1.0" }
150147
quartz = { module = "org.quartz-scheduler:quartz", version = "2.3.0" }
151148
reactor-core = { module = "io.projectreactor:reactor-core", version = "3.5.3" }
152149
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }

‎scripts/check-tombstone-proto-schema.sh‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
TRACKED_COMMIT="981d145117e8992842cdddee555c57e60c7a220a"
5+
6+
# tail -n +2 to remove the magic anti-XSSI prefix from the Gitiles JSON response
7+
LATEST_COMMIT=$(curl -sf \
8+
'https://android.googlesource.com/platform/system/core/+log/refs/heads/main/debuggerd/proto/tombstone.proto?format=JSON' \
9+
| tail -n +2 \
10+
| jq -r '.log[0].commit')
11+
12+
if [ -z "$LATEST_COMMIT" ] || [ "$LATEST_COMMIT" = "null" ]; then
13+
echo "ERROR: Failed to fetch latest commit from Gitiles" >&2
14+
exit 1
15+
fi
16+
17+
echo "Tracked commit: $TRACKED_COMMIT"
18+
echo "Latest commit: $LATEST_COMMIT"
19+
20+
if [ "$LATEST_COMMIT" != "$TRACKED_COMMIT" ]; then
21+
echo "Schema has been updated! Latest: https://android.googlesource.com/platform/system/core/+/${LATEST_COMMIT}/debuggerd/proto/tombstone.proto"
22+
exit 1
23+
fi
24+
25+
echo "Schema is up to date."

0 commit comments

Comments
 (0)