Skip to content

Commit 8dd02f8

Browse files
authored
Merge branch 'master' into snigdha/fix-ios-notif
2 parents eb03210 + e4a87d6 commit 8dd02f8

File tree

207 files changed

+4542
-3050
lines changed

Some content is hidden

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

207 files changed

+4542
-3050
lines changed

.github/CODEOWNERS

Lines changed: 9 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,6 @@ 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
522526
## End of Telemetry Experience
523527

524528

@@ -680,6 +684,9 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
680684
/src/sentry/migrations/ @getsentry/owners-migrations
681685
/src/sentry/*/migrations/ @getsentry/owners-migrations
682686

687+
# Preprod build artifact analysis
688+
/src/sentry/preprod @getsentry/emerge-tool
689+
# End of preprod
683690

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

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

fixtures/stubs-for-mypy/progressbar/__init__.pyi

Lines changed: 0 additions & 2 deletions
This file was deleted.

fixtures/stubs-for-mypy/progressbar/bar.pyi

Lines changed: 0 additions & 14 deletions
This file was deleted.

fixtures/stubs-for-mypy/progressbar/widgets.pyi

Lines changed: 0 additions & 4 deletions
This file was deleted.

migrations_lockfile.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ explore: 0004_add_explore_last_visited_table
99

1010
feedback: 0004_index_together
1111

12+
flags: 0004_add_flag_audit_log_provider_column
13+
1214
hybridcloud: 0021_django_arrayfield_scope_list
1315

1416
insights: 0001_add_starred_transactions_model
@@ -17,8 +19,6 @@ monitors: 0005_record_date_in_progress_state
1719

1820
nodestore: 0002_nodestore_no_dictfield
1921

20-
remote_subscriptions: 0003_drop_remote_subscription
21-
2222
replays: 0005_drop_replay_index
2323

2424
sentry: 0904_onboarding_task_project_id_idx
@@ -29,4 +29,4 @@ tempest: 0002_make_message_type_nullable
2929

3030
uptime: 0042_extra_uptime_indexes
3131

32-
workflow_engine: 0063_drop_rollout_workflowfirehistory_columns
32+
workflow_engine: 0065_add_status_to_detector_and_workflow

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"url": "git://github.com/getsentry/sentry.git"
99
},
1010
"dependencies": {
11-
"@acemarke/react-prod-sourcemaps": "^0.2.1",
1211
"@amplitude/analytics-browser": "^1.5.3",
1312
"@babel/core": "~7.26.10",
1413
"@babel/plugin-transform-runtime": "~7.26.10",

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ ignore_missing_imports = true
112112
# - python3 -m tools.mypy_helpers.find_easiest_modules
113113
[[tool.mypy.overrides]]
114114
module = [
115-
"sentry.api.endpoints.group_integration_details",
116115
"sentry.api.endpoints.organization_events_meta",
117116
"sentry.api.endpoints.organization_events_spans_performance",
118117
"sentry.api.endpoints.organization_releases",
@@ -350,7 +349,6 @@ module = [
350349
"sentry.release_health.release_monitor.*",
351350
"sentry.relocation.api.endpoints.artifacts.*",
352351
"sentry.relocation.services.relocation_export.*",
353-
"sentry.remote_subscriptions.migrations.*",
354352
"sentry.replays.consumers.*",
355353
"sentry.replays.lib.new_query.*",
356354
"sentry.replays.migrations.*",

requirements-base.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ parsimonious>=0.10.0
4242
petname>=2.6
4343
phonenumberslite>=8.12.32
4444
Pillow>=11.0.0
45-
progressbar2>=3.41.0
4645
protobuf>=5.27.3
4746
proto-plus>=1.25.0
4847
python-rapidjson>=1.4

requirements-dev-frozen.txt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ cryptography==44.0.1
3737
cssselect==1.0.3
3838
cssutils==2.9.0
3939
datadog==0.49.1
40-
devservices==1.1.5
40+
devservices==1.1.6
4141
distlib==0.3.8
4242
distro==1.8.0
4343
django==5.2.1
4444
django-crispy-forms==1.14.0
4545
django-csp==3.8
4646
django-pg-zero-downtime-migrations==0.18
47-
django-stubs-ext==5.1.3
47+
django-stubs-ext==5.2.0
4848
djangorestframework==3.16.0
4949
docker==7.1.0
5050
drf-spectacular==0.27.2
@@ -129,7 +129,6 @@ pip-tools==7.1.0
129129
platformdirs==4.2.0
130130
pluggy==1.5.0
131131
pre-commit==4.2.0
132-
progressbar2==3.41.0
133132
prompt-toolkit==3.0.51
134133
proto-plus==1.25.0
135134
protobuf==5.27.3
@@ -158,7 +157,6 @@ pytest-xdist==3.0.2
158157
python-dateutil==2.9.0.post0
159158
python-rapidjson==1.8
160159
python-u2flib-server==5.0.0
161-
python-utils==3.3.3
162160
python3-saml==1.15.0
163161
pyupgrade==3.19.1
164162
pyuwsgi==2.0.28.post1
@@ -183,9 +181,9 @@ selenium==4.16.0
183181
sentry-arroyo==2.21.0
184182
sentry-cli==2.16.0
185183
sentry-covdefaults-disable-branch-coverage==1.0.2
186-
sentry-devenv==1.20.0
187-
sentry-forked-django-stubs==5.1.3.post2
188-
sentry-forked-djangorestframework-stubs==3.15.3.post1
184+
sentry-devenv==1.21.0
185+
sentry-forked-django-stubs==5.2.0.post3
186+
sentry-forked-djangorestframework-stubs==3.16.0.post1
189187
sentry-forked-email-reply-parser==0.5.12.post1
190188
sentry-kafka-schemas==1.3.2
191189
sentry-ophio==1.1.3

requirements-dev.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--index-url https://pypi.devinfra.sentry.io/simple
22

3-
sentry-devenv>=1.20
4-
devservices>=1.1.5
3+
sentry-devenv>=1.21
4+
devservices>=1.1.6
55

66
covdefaults>=2.3.0
77
sentry-covdefaults-disable-branch-coverage>=1.0.2
@@ -38,8 +38,8 @@ pip-tools>=7.1.0
3838
packaging>=21.3
3939

4040
# for type checking
41-
sentry-forked-django-stubs>=5.1.3.post2
42-
sentry-forked-djangorestframework-stubs>=3.15.3.post1
41+
sentry-forked-django-stubs>=5.2.0.post3
42+
sentry-forked-djangorestframework-stubs>=3.16.0.post1
4343
lxml-stubs
4444
msgpack-types>=0.2.0
4545
mypy>=1.15

requirements-frozen.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ parsimonious==0.10.0
8888
petname==2.6
8989
phonenumberslite==8.12.55
9090
pillow==11.0.0
91-
progressbar2==3.41.0
9291
prompt-toolkit==3.0.51
9392
proto-plus==1.25.0
9493
protobuf==5.27.3
@@ -104,7 +103,6 @@ pymemcache==4.0.0
104103
python-dateutil==2.9.0.post0
105104
python-rapidjson==1.8
106105
python-u2flib-server==5.0.0
107-
python-utils==3.3.3
108106
python3-saml==1.15.0
109107
pyuwsgi==2.0.28.post1
110108
pyvat==1.3.15

src/sentry/api/endpoints/accept_organization_invite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929

3030
def handle_empty_organization_id_or_slug(
31-
member_id: int, user_id: int, request: HttpRequest
31+
member_id: int, user_id: int | None, request: HttpRequest
3232
) -> RpcUserInviteContext | None:
3333
member_mapping: OrganizationMemberMapping | None = None
3434
member_mappings: Mapping[int, OrganizationMemberMapping] = {
@@ -70,7 +70,7 @@ def handle_empty_organization_id_or_slug(
7070
def get_invite_state(
7171
member_id: int,
7272
organization_id_or_slug: int | str | None,
73-
user_id: int,
73+
user_id: int | None,
7474
request: HttpRequest,
7575
) -> RpcUserInviteContext | None:
7676

0 commit comments

Comments
 (0)