Skip to content

Commit b293f6d

Browse files
committed
Merge branch 'master' into nikki/discover-split-self-hosted
2 parents dfd9dd9 + ac0ceb4 commit b293f6d

File tree

1,203 files changed

+19283
-52361
lines changed

Some content is hidden

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

1,203 files changed

+19283
-52361
lines changed

.github/CODEOWNERS

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,12 @@ yarn.lock @getsentry/owners-js-de
145145
# Sentry product. These rules generally map to a signle team, but that may not
146146
# always be the case.
147147

148+
# Demo Mode - moved upwards because it wraps other parts of the codebase
149+
# and was assigned many issues to telemetry-experience that should not have been
150+
/src/sentry/demo_mode/ @getsentry/telemetry-experience
151+
/tests/sentry/demo_mode/ @getsentry/telemetry-experience
152+
/static/app/utils/demoMode/ @getsentry/telemetry-experience
153+
148154
## Crons
149155
/static/app/views/monitors @getsentry/crons
150156
/src/sentry/monitors @getsentry/crons
@@ -506,7 +512,6 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
506512
/tests/sentry/sentry_metrics/querying/ @getsentry/telemetry-experience
507513
/src/sentry/snuba/metrics/ @getsentry/telemetry-experience
508514
/tests/sentry/snuba/metrics/ @getsentry/telemetry-experience
509-
/src/sentry/demo_mode/
510515

511516
/static/app/actionCreators/metrics.tsx @getsentry/telemetry-experience
512517
/static/app/data/platformCategories.tsx @getsentry/telemetry-experience
@@ -518,7 +523,8 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
518523
/static/app/views/settings/dynamicSampling/ @getsentry/telemetry-experience
519524
/static/app/views/onboarding* @getsentry/telemetry-experience
520525
/static/app/views/projectInstall/ @getsentry/telemetry-experience
521-
/static/app/utils/demoMode/ @getsentry/telemetry-experience
526+
/static/app/views/insights/agentMonitoring/ @getsentry/telemetry-experience
527+
/static/app/views/insights/pages/platform/ @getsentry/telemetry-experience
522528
## End of Telemetry Experience
523529

524530

@@ -680,6 +686,9 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
680686
/src/sentry/migrations/ @getsentry/owners-migrations
681687
/src/sentry/*/migrations/ @getsentry/owners-migrations
682688

689+
# Preprod build artifact analysis
690+
/src/sentry/preprod @getsentry/emerge-tool
691+
# End of preprod
683692

684693
## Frontend Platform (keep last as we want highest specificity)
685694
/static/app/utils/theme/ @getsentry/design-engineering

.github/workflows/acceptance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
8585
with:
8686
path: ${{ steps.config.outputs.webpack-path }}
87-
key: ${{ runner.os }}-v2-webpack-cache-${{ hashFiles('webpack.config.ts') }}
87+
key: ${{ runner.os }}-v2-webpack-cache-${{ hashFiles('rspack.config.ts', 'yarn.lock', 'package.json') }}
8888

8989
- name: node_modules cache
9090
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0

.pre-commit-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,14 @@ repos:
143143
|static/app/utils/profiling/profile/formats/typescript/trace\.json
144144
)$
145145
146+
- id: knip
147+
name: knip
148+
language: system
149+
files: \.(ts|js|tsx|jsx|mjs)$
150+
pass_filenames: false
151+
stages: [pre-push]
152+
entry: bash -c 'if [ -n "${SENTRY_KNIP_PRE_PUSH:-}" ]; then exec ./node_modules/.bin/knip; fi' --
153+
146154
- repo: https://github.com/pre-commit/pygrep-hooks
147155
rev: v1.10.0
148156
hooks:

CHANGES

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
25.5.1
2+
------
3+
4+
### Various fixes & improvements
5+
6+
- :wrench: chore(integrations): use `IntegrationProviderSlug` for Integration `key` (#91465) by @iamrajjoshi
7+
- ref: fix types for group_integration_details (#92026) by @asottile-sentry
8+
- Bump `devenv`/`devservices` to make Python SDK 3 compatible (#92028) by @antonpirker
9+
- build(ui): Remove react prod sourcemaps (#92006) by @scttcper
10+
- feat(spans): Produce items from process-segments (#91714) by @untitaker
11+
- feat(explore): Add attribute description throughout explore (#91829) by @Zylphrex
12+
- fix(symbolicator): check source credentials and not the credential token (#92024) by @Litarnus
13+
- feat(replay): Start bringing in new replay context wrappers to test (#91982) by @ryan953
14+
- feat(agents-insights): dashboard placeholder (#92021) by @obostjancic
15+
- ref: remove remote_subscriptions migrations (#92004) by @asottile-sentry
16+
- fix(apps): disallow Manager to rotate an app secret with org:admin scope (#92019) by @oioki
17+
- issues: remove custom save button styling (#91974) by @JonasBa
18+
- replay: replace colors for tokens on timeline (#91933) by @JonasBa
19+
- trace: fix buttons in chonk (#91878) by @JonasBa
20+
- tag: fix bad tag change and flickering text (#91927) by @JonasBa
21+
- chore(sdk): Use add_full_stack by default (#91939) by @armenzg
22+
- fix(codeowners): move demomode upwards in codewards to stop matching everything (#92020) by @shellmayr
23+
- fix(nextjs-insight): Filter spans without component type from tree view (#92017) by @ArthurKnaus
24+
- Add directory for preprod (#91961) by @chromy
25+
- fix(span-buffer): Fix crashing behavior in flusher (#91949) by @untitaker
26+
- feat(agents-insights): feature flag registration (#92014) by @obostjancic
27+
- fix(codeowners): add owner to demomode line (#92012) by @shellmayr
28+
- ref: add flags to migrations lockfile (#91991) by @asottile-sentry
29+
- feat(source-maps): Do not render source maps wizard if platform is react native (#91860) by @priscilawebdev
30+
31+
_Plus 231 more_
32+
133
25.5.0
234
------
335

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ test-cli: create-db
100100
cd test_cli && sentry init test_conf
101101
cd test_cli && sentry --config=test_conf help
102102
cd test_cli && sentry --config=test_conf upgrade --traceback --noinput
103-
cd test_cli && sentry --config=test_conf export
103+
cd test_cli && sentry --config=test_conf export --help
104104
rm -r test_cli
105105
@echo ""
106106

0 commit comments

Comments
 (0)