Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into mz/spam-ff-be
Browse files Browse the repository at this point in the history
  • Loading branch information
@michellewzhang
michellewzhang committed May 13, 2024
2 parents dbb0929 + 48d9c5c commit 557b19b
Show file tree
Hide file tree
Showing 1,353 changed files with 23,832 additions and 15,138 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,9 @@ static/app/components/events/eventStatisticalDetector/ @getse
/src/sentry/tasks/post_process.py @getsentry/issues
/src/sentry/tasks/unmerge.py @getsentry/issues
/src/sentry/search/snuba/ @getsentry/issues
/static/app/components/events/contexts/ @getsentry/issues
/static/app/components/events/eventTags/ @getsentry/issues
/static/app/components/events/highlights/ @getsentry/issues
/static/app/views/issueList @getsentry/issues
/static/app/views/issueDetails/ @getsentry/issues
/static/app/views/organizationStats/teamInsights/ @getsentry/issues
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/codecov_ats.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ jobs:
"--ignore=tests/sentry/post_process_forwarder",
"--ignore=tests/sentry/snuba",
"--ignore=tests/sentry/search/events",
"--ignore=tests/sentry/ingest/ingest_consumer/test_ingest_consumer_kafka.py",
"--ignore=tests/sentry/region_to_control/test_region_to_control_kafka.py"
"--ignore=tests/sentry/ingest/ingest_consumer/test_ingest_consumer_kafka.py"
]' > .artifacts/codecov_ats/tests_to_skip.json
echo '[]' > .artifacts/codecov_ats/tests_to_run.json
# If we reached this point it means that ATS failed with some error
Expand Down
18 changes: 9 additions & 9 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ fetch-release-registry:

run-acceptance:
@echo "--> Running acceptance tests"
pytest tests/acceptance --cov . --cov-report="xml:.artifacts/acceptance.coverage.xml" --json-report --json-report-file=".artifacts/pytest.acceptance.json" --json-report-omit=log
python3 -b -m pytest tests/acceptance --cov . --cov-report="xml:.artifacts/acceptance.coverage.xml" --json-report --json-report-file=".artifacts/pytest.acceptance.json" --json-report-omit=log
@echo ""

test-cli: create-db
Expand Down Expand Up @@ -130,7 +130,7 @@ COV_ARGS = --cov-report="xml:.artifacts/python.coverage.xml"

test-python-ci:
@echo "--> Running CI Python tests"
pytest \
python3 -b -m pytest \
tests \
--ignore tests/acceptance \
--ignore tests/apidocs \
Expand All @@ -151,7 +151,7 @@ test-monolith-dbs:
@echo "--> Running CI Python tests (SENTRY_USE_MONOLITH_DBS=1)"
SENTRY_LEGACY_TEST_SUITE=1 \
SENTRY_USE_MONOLITH_DBS=1 \
pytest \
python3 -b -m pytest \
tests/sentry/backup/test_exhaustive.py \
tests/sentry/backup/test_exports.py \
tests/sentry/backup/test_imports.py \
Expand All @@ -168,16 +168,16 @@ test-monolith-dbs:
test-tools:
@echo "--> Running tools tests"
@# bogus configuration to force vanilla pytest
python3 -m pytest -c setup.cfg --confcutdir tests/tools tests/tools -vv --cov=tools --cov=tests/tools --cov-report="xml:.artifacts/tools.coverage.xml"
python3 -b -m pytest -c setup.cfg --confcutdir tests/tools tests/tools -vv --cov=tools --cov=tests/tools --cov-report="xml:.artifacts/tools.coverage.xml"
@echo ""

# JavaScript relay tests are meant to be run within Symbolicator test suite, as they are parametrized to verify both processing pipelines during migration process.
# Running Locally: Run `sentry devservices up kafka` before starting these tests
test-symbolicator:
@echo "--> Running symbolicator tests"
pytest tests/symbolicator -vv --cov . --cov-report="xml:.artifacts/symbolicator.coverage.xml"
pytest tests/relay_integration/lang/javascript/ -vv -m symbolicator
pytest tests/relay_integration/lang/java/ -vv -m symbolicator
python3 -b -m pytest tests/symbolicator -vv --cov . --cov-report="xml:.artifacts/symbolicator.coverage.xml"
python3 -b -m pytest tests/relay_integration/lang/javascript/ -vv -m symbolicator
python3 -b -m pytest tests/relay_integration/lang/java/ -vv -m symbolicator
@echo ""

test-acceptance: node-version-check
Expand All @@ -188,15 +188,15 @@ test-acceptance: node-version-check
# XXX: this is called by `getsentry/relay`
test-relay-integration:
@echo "--> Running Relay integration tests"
pytest \
python3 -b -m pytest \
tests/relay_integration \
tests/sentry/ingest/ingest_consumer/test_ingest_consumer_kafka.py \
-vv --cov . --cov-report="xml:.artifacts/relay.coverage.xml"
@echo ""

test-api-docs: build-api-docs
yarn run validate-api-examples
pytest tests/apidocs
python3 -b -m pytest tests/apidocs
@echo ""

review-python-snapshots:
Expand Down
72 changes: 36 additions & 36 deletions api-docs/openapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,115 +87,115 @@
}
],
"paths": {
"/api/0/teams/{organization_slug}/{team_id_or_slug}/": {
"/api/0/teams/{organization_id_or_slug}/{team_id_or_slug}/": {
"$ref": "paths/teams/by-slug.json"
},
"/api/0/teams/{organization_slug}/{team_id_or_slug}/stats/": {
"/api/0/teams/{organization_id_or_slug}/{team_id_or_slug}/stats/": {
"$ref": "paths/teams/stats.json"
},
"/api/0/organizations/": {
"$ref": "paths/organizations/index.json"
},
"/api/0/organizations/{organization_slug}/eventids/{event_id}/": {
"/api/0/organizations/{organization_id_or_slug}/eventids/{event_id}/": {
"$ref": "paths/organizations/event-id-lookup.json"
},
"/api/0/organizations/{organization_slug}/": {
"/api/0/organizations/{organization_id_or_slug}/": {
"$ref": "paths/organizations/details.json"
},
"/api/0/organizations/{organization_slug}/repos/": {
"/api/0/organizations/{organization_id_or_slug}/repos/": {
"$ref": "paths/organizations/repos.json"
},
"/api/0/organizations/{organization_slug}/repos/{repo_id}/commits/": {
"/api/0/organizations/{organization_id_or_slug}/repos/{repo_id}/commits/": {
"$ref": "paths/organizations/repo-commits.json"
},
"/api/0/organizations/{organization_slug}/shortids/{short_id}/": {
"/api/0/organizations/{organization_id_or_slug}/shortids/{short_id}/": {
"$ref": "paths/organizations/shortid.json"
},
"/api/0/projects/": {
"$ref": "paths/projects/index.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/files/dsyms/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/files/dsyms/": {
"$ref": "paths/projects/dsyms.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/users/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/users/": {
"$ref": "paths/projects/users.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/tags/{key}/values/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/tags/{key}/values/": {
"$ref": "paths/projects/tag-values.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/stats/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/stats/": {
"$ref": "paths/projects/stats.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/user-feedback/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/user-feedback/": {
"$ref": "paths/projects/user-feedback.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/hooks/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/hooks/": {
"$ref": "paths/projects/service-hooks.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/hooks/{hook_id}/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/hooks/{hook_id}/": {
"$ref": "paths/projects/service-hook-details.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/events/{event_id}/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/events/{event_id}/": {
"$ref": "paths/events/project-event-details.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/events/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/events/": {
"$ref": "paths/events/project-events.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/issues/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/issues/": {
"$ref": "paths/events/project-issues.json"
},
"/api/0/organizations/{organization_slug}/issues/{issue_id}/tags/{key}/values/": {
"/api/0/organizations/{organization_id_or_slug}/issues/{issue_id}/tags/{key}/values/": {
"$ref": "paths/events/tag-values.json"
},
"/api/0/organizations/{organization_slug}/issues/{issue_id}/tags/{key}/": {
"/api/0/organizations/{organization_id_or_slug}/issues/{issue_id}/tags/{key}/": {
"$ref": "paths/events/tag-details.json"
},
"/api/0/organizations/{organization_slug}/issues/{issue_id}/hashes/": {
"/api/0/organizations/{organization_id_or_slug}/issues/{issue_id}/hashes/": {
"$ref": "paths/events/issue-hashes.json"
},
"/api/0/organizations/{organization_slug}/issues/{issue_id}/events/oldest/": {
"/api/0/organizations/{organization_id_or_slug}/issues/{issue_id}/events/oldest/": {
"$ref": "paths/events/oldest-event.json"
},
"/api/0/organizations/{organization_slug}/issues/{issue_id}/events/latest/": {
"/api/0/organizations/{organization_id_or_slug}/issues/{issue_id}/events/latest/": {
"$ref": "paths/events/latest-event.json"
},
"/api/0/organizations/{organization_slug}/issues/{issue_id}/events/": {
"/api/0/organizations/{organization_id_or_slug}/issues/{issue_id}/events/": {
"$ref": "paths/events/issue-events.json"
},
"/api/0/organizations/{organization_slug}/issues/{issue_id}/": {
"/api/0/organizations/{organization_id_or_slug}/issues/{issue_id}/": {
"$ref": "paths/events/issue-details.json"
},
"/api/0/organizations/{organization_slug}/releases/": {
"/api/0/organizations/{organization_id_or_slug}/releases/": {
"$ref": "paths/releases/organization-releases.json"
},
"/api/0/organizations/{organization_slug}/releases/{version}/": {
"/api/0/organizations/{organization_id_or_slug}/releases/{version}/": {
"$ref": "paths/releases/organization-release.json"
},
"/api/0/organizations/{organization_slug}/releases/{version}/files/": {
"/api/0/organizations/{organization_id_or_slug}/releases/{version}/files/": {
"$ref": "paths/releases/release-files.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/releases/{version}/files/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/releases/{version}/files/": {
"$ref": "paths/releases/project-release-files.json"
},
"/api/0/organizations/{organization_slug}/releases/{version}/files/{file_id}/": {
"/api/0/organizations/{organization_id_or_slug}/releases/{version}/files/{file_id}/": {
"$ref": "paths/releases/release-file.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/releases/{version}/files/{file_id}/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/releases/{version}/files/{file_id}/": {
"$ref": "paths/releases/project-release-file.json"
},
"/api/0/organizations/{organization_slug}/releases/{version}/commits/": {
"/api/0/organizations/{organization_id_or_slug}/releases/{version}/commits/": {
"$ref": "paths/releases/organization-release-commits.json"
},
"/api/0/projects/{organization_slug}/{project_id_or_slug}/releases/{version}/commits/": {
"/api/0/projects/{organization_id_or_slug}/{project_id_or_slug}/releases/{version}/commits/": {
"$ref": "paths/releases/project-release-commits.json"
},
"/api/0/organizations/{organization_slug}/releases/{version}/commitfiles/": {
"/api/0/organizations/{organization_id_or_slug}/releases/{version}/commitfiles/": {
"$ref": "paths/releases/organization-release-commit-files.json"
},
"/api/0/organizations/{organization_slug}/releases/{version}/deploys/": {
"/api/0/organizations/{organization_id_or_slug}/releases/{version}/deploys/": {
"$ref": "paths/releases/deploys.json"
},
"/api/0/organizations/{organization_slug}/sentry-app-installations/": {
"/api/0/organizations/{organization_id_or_slug}/sentry-app-installations/": {
"$ref": "paths/integration-platform/sentry-app-installations.json"
},
"/api/0/sentry-app-installations/{uuid}/external-issues/": {
Expand All @@ -204,7 +204,7 @@
"/api/0/sentry-app-installations/{uuid}/external-issues/{external_issue_id}/": {
"$ref": "paths/integration-platform/sentry-app-external-issue-details.json"
},
"/api/0/organizations/{organization_slug}/spike-protections/": {
"/api/0/organizations/{organization_id_or_slug}/spike-protections/": {
"$ref": "paths/projects/spike-protection.json"
}
},
Expand Down
12 changes: 6 additions & 6 deletions api-docs/paths/events/issue-details.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"operationId": "Retrieve an Issue",
"parameters": [
{
"name": "organization_slug",
"name": "organization_id_or_slug",
"in": "path",
"description": "The slug of the organization the issue belongs to.",
"description": "The id or slug of the organization the issue belongs to.",
"required": true,
"schema": {
"type": "string"
Expand Down Expand Up @@ -186,9 +186,9 @@
"operationId": "Update an Issue",
"parameters": [
{
"name": "organization_slug",
"name": "organization_id_or_slug",
"in": "path",
"description": "The slug of the organization the issue belongs to.",
"description": "The id or slug of the organization the issue belongs to.",
"required": true,
"schema": {
"type": "string"
Expand Down Expand Up @@ -306,9 +306,9 @@
"operationId": "Remove an Issue",
"parameters": [
{
"name": "organization_slug",
"name": "organization_id_or_slug",
"in": "path",
"description": "The slug of the organization the issue belongs to.",
"description": "The id or slug of the organization the issue belongs to.",
"required": true,
"schema": {
"type": "string"
Expand Down
4 changes: 2 additions & 2 deletions api-docs/paths/events/issue-events.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"operationId": "List an Issue's Events",
"parameters": [
{
"name": "organization_slug",
"name": "organization_id_or_slug",
"in": "path",
"description": "The slug of the organization the issues belongs to.",
"description": "The id or slug of the organization the issues belongs to.",
"required": true,
"schema": {
"type": "string"
Expand Down
39 changes: 9 additions & 30 deletions api-docs/paths/events/issue-hashes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"operationId": "List an Issue's Hashes",
"parameters": [
{
"name": "organization_slug",
"name": "organization_id_or_slug",
"in": "path",
"description": "The slug of the organization the issue belong to.",
"description": "The id or slug of the organization the issue belong to.",
"required": true,
"schema": {
"type": "string"
Expand Down Expand Up @@ -159,17 +159,11 @@
71,
" return fn.apply(this, wrappedArguments);"
],
[
72,
" // tslint:enable:no-unsafe-any"
],
[72, " // tslint:enable:no-unsafe-any"],
[73, " }"],
[74, " catch (ex) {"],
[75, " ignoreNextOnError();"],
[
76,
" withScope(function (scope) {"
]
[76, " withScope(function (scope) {"]
],
"symbolAddr": null,
"trust": null,
Expand All @@ -190,17 +184,11 @@
"instructionAddr": null,
"context": [
[69, " */"],
[
70,
" triggerAsync: function triggerAsync() {"
],
[70, " triggerAsync: function triggerAsync() {"],
[71, " var args = arguments,"],
[72, " me = this;"],
[73, " _.nextTick(function () {"],
[
74,
" me.trigger.apply(me, args);"
],
[74, " me.trigger.apply(me, args);"],
[75, " });"],
[76, " },"],
[77, ""],
Expand Down Expand Up @@ -238,25 +226,16 @@
"context": [
[76, "/*!"],
[77, " Copyright (c) 2018 Jed Watson."],
[
78,
" Licensed under the MIT License (MIT), see"
],
[
79,
" http://jedwatson.github.io/react-select"
],
[78, " Licensed under the MIT License (MIT), see"],
[79, " http://jedwatson.github.io/react-select"],
[80, "*/"],
[
81,
"{snip} e,t)}));return e.handleEvent?e.handleEvent.apply(this,s):e.apply(this,s)}catch(e){throw c(),Object(o.m)((function(n){n.addEventProcessor((fu {snip}"
],
[82, "/*!"],
[83, " * JavaScript Cookie v2.2.1"],
[
84,
" * https://github.com/js-cookie/js-cookie"
],
[84, " * https://github.com/js-cookie/js-cookie"],
[85, " *"],
[
86,
Expand Down
Loading

0 comments on commit 557b19b

Please sign in to comment.