Skip to content

Commit ef4f440

Browse files
committed
Merge branch 'master' into feat/crons-ingest-kafka
* master: (79 commits) feat(perf-issues): Add performance issue detection timing runner command (#44912) Revert "chore: Investigating org slug already set to a different value (#45134)" fix(hybrid-cloud): Redirect to org restoration page for customer domains (#45159) bug(replays): Fix 500 error when marshaling tags field (#45097) ref(sourcemaps): Redesign lookup of source and sourcemaps (#45032) chore: Investigating org slug already set to a different value (#45134) feat(dynamic-sampling): Implement prioritize by project bias [TET-574] (#42939) feat(dynamic-sampling): Add transaction name prioritize option - (#45034) feat(dyn-sampling): add new bias toggle to project details for prioritise by tx name [TET-717] (#44944) feat(admin) Add admin relay project config view [TET-509] (#45120) Revert "chore(assignment): Add analytics when autoassigning after a manual assignment (#45099)" feat(sourcemaps): Implement new tables supporting debug ids (#44572) ref(js): Remove usage of react-document-title (#45170) chore(py): Consistently name urls using `organization-` prefix (#45180) ref: rename acceptance required checks collector (#45156) chore(assignment): Add analytics when autoassigning after a manual assignment (#45099) feat(source-maps): Update copy for source map debug alerts (#45164) ref(js): Remove custom usage of DocumentTitle (#45165) chore(login): update the login banners (#45151) ref(py): Remove one more legacy project_id from Environment (#45160) ...
2 parents d1c6a5a + 7fe102e commit ef4f440

File tree

246 files changed

+6209
-1913
lines changed

Some content is hidden

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

246 files changed

+6209
-1913
lines changed

.github/workflows/acceptance.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,10 @@ jobs:
133133
uses: ./.github/actions/artifacts
134134
if: ${{ always() && needs.files-changed.outputs.backend_all == 'true' }}
135135

136-
visual-diff:
137-
# triggers visual snapshot is a required check so we need this job to
138-
# always run and report a status.
136+
acceptance-required-checks:
137+
# this is a required check so we need this job to always run and report a status.
139138
if: always()
140-
name: triggers visual snapshot
139+
name: Acceptance
141140
needs: [acceptance, files-changed]
142141
runs-on: ubuntu-20.04
143142
timeout-minutes: 20
@@ -160,19 +159,3 @@ jobs:
160159
api-token: ${{ secrets.VISUAL_SNAPSHOT_SECRET }}
161160
gcs-bucket: 'sentry-visual-snapshots'
162161
gcp-service-account-key: ${{ secrets.SNAPSHOT_GOOGLE_SERVICE_ACCOUNT_KEY }}
163-
164-
# "Visual Snapshot" is a required check, so we either skip the visual tests
165-
# and need to post a status passing OR we run the visual tests and let the
166-
# visual snapshot service post a status.
167-
#
168-
# This handles the skip case and creates a status we skip acceptance tests.
169-
fake-visual-snapshot:
170-
name: Visual Snapshot
171-
needs: [files-changed]
172-
# Opposite condition to "triggers visual snapshot" required check
173-
if: needs.files-changed.outputs.acceptance != 'true'
174-
runs-on: ubuntu-20.04
175-
steps:
176-
- name: Sentaur attack
177-
run: |
178-
echo "This check creates a Visual Snapshot to satisfy Github required checks when we skip acceptance tests."

.github/workflows/frontend.yml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -119,29 +119,6 @@ jobs:
119119
if: steps.dependencies.outcome == 'success'
120120
run: yarn tsc -p config/tsconfig.ci.json
121121

122-
webpack:
123-
if: github.ref == 'refs/heads/master' || needs.files-changed.outputs.frontend == 'true'
124-
needs: files-changed
125-
runs-on: ubuntu-20.04
126-
steps:
127-
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
128-
129-
- uses: getsentry/action-setup-volta@54775a59c41065f54ecc76d1dd5f2cdc7a1550cb # v1.1.0
130-
131-
- name: Install dependencies
132-
run: yarn install --frozen-lockfile
133-
134-
- uses: getsentry/size-limit-action@7be9865310d295ad211da9a8464332288d60d837 # v5
135-
env:
136-
SENTRY_INSTRUMENTATION: 1
137-
SENTRY_WEBPACK_WEBHOOK_SECRET: ${{ secrets.SENTRY_WEBPACK_WEBHOOK_SECRET }}
138-
with:
139-
main_branch: master
140-
skip_step: install
141-
build_script: build
142-
windows_verbatim_arguments: false
143-
github_token: ${{ secrets.GITHUB_TOKEN }}
144-
145122
frontend-browser-tests:
146123
if: needs.files-changed.outputs.frontend == 'true'
147124
needs: files-changed
@@ -249,7 +226,7 @@ jobs:
249226
# It symbolizes that all required Frontend checks have succesfully passed (Or skipped)
250227
# This check is the only required Github check
251228
frontend-required-check:
252-
needs: [typescript-and-lint, webpack, frontend-browser-tests]
229+
needs: [typescript-and-lint, frontend-browser-tests]
253230
name: Frontend
254231
# This is necessary since a failed/skipped dependent job would cause this job to be skipped
255232
if: always()

.github/workflows/issue-status-helper.yml

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

.github/workflows/visual-diff.yml

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

codecov.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
codecov:
2+
notify:
3+
# The minimum amount of codecov reporting checks that need to complete
4+
# For FE we have 5 checks and for BE we have 11
5+
# TODO: Remove this when we have support of after_n_builds per flag
6+
after_n_builds: 5
7+
18
# Setting coverage targets per flag
29
coverage:
310
status:

fixtures/js-stubs/codeOwner.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import {GitHubIntegration} from './githubIntegration';
2+
3+
export function CodeOwner(params = {}) {
4+
return {
5+
id: '1225',
6+
raw: '',
7+
dateCreated: '2022-11-18T15:05:47.450354Z',
8+
dateUpdated: '2023-02-24T18:43:08.729490Z',
9+
codeMappingId: '11',
10+
provider: 'github',
11+
codeMapping: GitHubIntegration(),
12+
ownershipSyntax: '',
13+
errors: {
14+
missing_user_emails: [],
15+
missing_external_users: [],
16+
missing_external_teams: [],
17+
teams_without_access: [],
18+
users_without_access: [],
19+
},
20+
...params,
21+
};
22+
}

fixtures/js-stubs/types.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ type TestStubFixtures = {
2424
Breadcrumb: OverridableStub;
2525
Broadcast: OverridableStub;
2626
BuiltInSymbolSources: OverridableStubList;
27+
CodeOwner: OverridableStub;
2728
Commit: OverridableStub;
2829
CommitAuthor: OverridableStub;
2930
Config: OverridableStub;

migrations_lockfile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ To resolve this, rebase against latest master and regenerate your migration. Thi
66
will then be regenerated, and you should be able to merge without conflicts.
77

88
nodestore: 0002_nodestore_no_dictfield
9-
sentry: 0360_authenticator_config_type_change
9+
sentry: 0363_debug_id_artifact_bundle
1010
social_auth: 0001_initial

package.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
"@react-types/radio": "^3.3.1",
4646
"@react-types/shared": "^3.8.0",
4747
"@sentry-internal/global-search": "^0.5.7",
48+
"@sentry-internal/rrweb": "^1.104.0",
49+
"@sentry-internal/rrweb-player": "^1.104.0",
4850
"@sentry/integrations": "7.38.0",
4951
"@sentry/node": "7.38.0",
5052
"@sentry/profiling-node": "^0.1.0",
@@ -68,7 +70,6 @@
6870
"@types/prismjs": "^1.26.0",
6971
"@types/react": "~17.0.14",
7072
"@types/react-date-range": "^1.4.4",
71-
"@types/react-document-title": "^2.0.5",
7273
"@types/react-dom": "~17.0.9",
7374
"@types/react-grid-layout": "^1.3.2",
7475
"@types/react-mentions": "4.1.6",
@@ -138,7 +139,6 @@
138139
"react": "17.0.2",
139140
"react-autosize-textarea": "7.1.0",
140141
"react-date-range": "^1.4.0",
141-
"react-document-title": "2.0.3",
142142
"react-dom": "17.0.2",
143143
"react-grid-layout": "^1.3.4",
144144
"react-lazyload": "^2.3.0",
@@ -150,8 +150,6 @@
150150
"react-sparklines": "1.7.0",
151151
"react-virtualized": "^9.22.3",
152152
"reflux": "0.4.1",
153-
"rrweb": "^1.1.3",
154-
"rrweb-player": "^0.7.13",
155153
"screenfull": "^6.0.2",
156154
"scroll-to-element": "^2.0.0",
157155
"sprintf-js": "1.0.3",
@@ -170,7 +168,6 @@
170168
"@babel/plugin-transform-react-jsx-source": "^7.19.6",
171169
"@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
172170
"@sentry/jest-environment": "^4.0.0-alpha.2",
173-
"@size-limit/preset-small-lib": "^5.0.5",
174171
"@testing-library/jest-dom": "^5.16.5",
175172
"@testing-library/react": "^12.1.2",
176173
"@testing-library/react-hooks": "^8.0.1",
@@ -189,13 +186,12 @@
189186
"jest-environment-jsdom": "^29.4.1",
190187
"jest-fail-on-console": "^3.0.2",
191188
"jest-fetch-mock": "^3.0.3",
192-
"jest-junit": "14.0.1",
189+
"jest-junit": "15.0.0",
193190
"jest-sentry-environment": "3.0.0",
194191
"postcss-jsx": "0.36.4",
195192
"postcss-syntax": "0.36.2",
196193
"react-refresh": "0.14.0",
197194
"react-test-renderer": "17.0.2",
198-
"size-limit": "^5.0.5",
199195
"stylelint": "14.8.2",
200196
"stylelint-config-prettier": "^9.0.3",
201197
"stylelint-config-recommended": "^8.0.0",
@@ -208,9 +204,7 @@
208204
"fsevents": "^2.3.2"
209205
},
210206
"resolutions": {
211-
"**/ua-parser-js": "<=0.7.28",
212-
"webpack": "5.75.0",
213-
"style-loader": "^3.3.1"
207+
"**/ua-parser-js": "<=0.7.28"
214208
},
215209
"APIMethod": "stub",
216210
"proxyURL": "http://localhost:8000",

requirements-dev-frozen.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ click==8.0.4
2727
confluent-kafka==1.9.2
2828
coverage==6.3.3
2929
croniter==0.3.37
30-
cryptography==38.0.3
30+
cryptography==39.0.1
3131
cssselect==1.0.3
3232
cssutils==2.4.0
3333
datadog==0.29.3
@@ -120,7 +120,7 @@ pycountry==17.5.14
120120
pycparser==2.21
121121
pyflakes==3.0.1
122122
pyjwt==2.4.0
123-
pyopenssl==22.0.0
123+
pyopenssl==23.0.0
124124
pyparsing==3.0.9
125125
pyrsistent==0.18.1
126126
pysocks==1.7.1

0 commit comments

Comments
 (0)