Skip to content

Commit

Permalink
Merge branch 'master' into jb/theme/space
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasBa authored Aug 24, 2024
2 parents 847e609 + 28ba9c3 commit 2befb58
Show file tree
Hide file tree
Showing 534 changed files with 11,046 additions and 7,589 deletions.
18 changes: 11 additions & 7 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ yarn.lock @getsentry/owners-js-de
/tests/sentry/utils/test_monitors.py @getsentry/crons
## End Crons

## Uptime
/src/sentry/uptime @getsentry/crons
/tests/sentry/uptime @getsentry/crons
## End Uptime


## Hybrid Cloud
/src/sentry/silo/ @getsentry/hybrid-cloud
Expand Down Expand Up @@ -340,8 +345,6 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge


## Integrations
/src/sentry/api/endpoints/integrations/ @getsentry/product-owners-settings-integrations
/src/sentry/api/endpoints/organization_integration_repos.py @getsentry/ecosystem
/src/sentry/api/endpoints/sentry_app/ @getsentry/product-owners-settings-integrations
/src/sentry/api/endpoints/project_rule*.py @getsentry/alerts-notifications
/src/sentry/api/serializers/models/rule.py @getsentry/alerts-notifications
Expand All @@ -350,21 +353,17 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge

/src/sentry/digests/ @getsentry/alerts-notifications
/src/sentry/identity/ @getsentry/enterprise
/src/sentry/integrations/ @getsentry/product-owners-settings-integrations
/src/sentry/integrations/ @getsentry/product-owners-settings-integrations @getsentry/ecosystem
/src/sentry/mail/ @getsentry/alerts-notifications
/src/sentry/notifications/ @getsentry/alerts-notifications
/src/sentry/pipeline/ @getsentry/ecosystem
/src/sentry/plugins/ @getsentry/ecosystem
/src/sentry/shared_integrations/ @getsentry/ecosystem

/src/sentry/models/externalactor.py @getsentry/ecosystem
/src/sentry/models/externalissue.py @getsentry/ecosystem
/src/sentry/models/identity.py @getsentry/enterprise
/src/sentry/models/integrations/ @getsentry/product-owners-settings-integrations

/src/sentry/tasks/digests.py @getsentry/alerts-notifications
/src/sentry/tasks/email.py @getsentry/alerts-notifications
/src/sentry/tasks/integrations/ @getsentry/ecosystem
/src/sentry/tasks/user_report.py @getsentry/alerts-notifications
/src/sentry/tasks/weekly_reports.py @getsentry/alerts-notifications

Expand Down Expand Up @@ -582,3 +581,8 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py @ge
/static/app/components/modals/inviteMissingMembersModal/ @getsentry/ecosystem
/src/sentry/tasks/integrations/github/pr_comment.py @getsentry/ecosystem
## End of Ecosystem

## Core Product Foundations
/src/sentry/data_secrecy/ @getsentry/core-product-foundations
/tests/sentry/data_secrecy/ @getsentry/core-product-foundations
## End of Core Product Foundations
21 changes: 14 additions & 7 deletions .github/actions/artifacts/do_upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ def run_command(command: list[str], log_file: str):
return Popen(command, stdout=f, stderr=f)


def get_files(input_files: list[str]) -> list[str]:
"""
this function expands the globs specified in the input file then
filters for paths that are actually files
"""
glob_expanded_files = [glob.glob(file, recursive=True) for file in input_files]
flattened_glob_matches = list(itertools.chain.from_iterable(glob_expanded_files))
filtered_glob_matches = [file for file in flattened_glob_matches if os.path.isfile(file)]
return filtered_glob_matches


def main():
"""
First we get the arguments passed to the upload artifacts action via the env vars,
Expand All @@ -30,9 +41,6 @@ def main():
input_files = os.getenv("INPUT_FILES", "").split(",")
input_test_result_files = os.getenv("INPUT_TEST_RESULT_FILES", "").split(",")

glob_expanded_coverage_files = [glob.glob(file, recursive=True) for file in input_files]
coverage_files = list(itertools.chain.from_iterable(glob_expanded_coverage_files))

codecov_base_cmd = ["./codecov", "--verbose"]

upload_flags = [
Expand All @@ -48,15 +56,14 @@ def main():
upload_flags += ["--commit-sha", input_commit_sha]

upload_coverage_cmd = [*codecov_base_cmd, "upload-process", *upload_flags]

coverage_files = get_files(input_files)
for file in coverage_files:
upload_coverage_cmd += ["--file", file]

upload_coverage_log_file = "coverage-upload.log"

glob_expanded_test_result_files = [
glob.glob(file, recursive=True) for file in input_test_result_files
]
test_result_files = list(itertools.chain.from_iterable(glob_expanded_test_result_files))
test_result_files = get_files(input_test_result_files)

upload_test_results_cmd = [
*codecov_base_cmd,
Expand Down
5 changes: 1 addition & 4 deletions .github/file-filters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,7 @@ backend_any_type: &backend_any_type

migrations_added:
- added:
- 'src/sentry/migrations/*'
- 'src/sentry/feedback/migrations/*'
- 'src/sentry/hybridcloud/migrations/*'
- 'src/sentry/replays/migrations/*'
- 'src/sentry/**/migrations/*'

# These files will trigger our workflow to check if lockfile
# updates are needed
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/self-hosted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,6 @@ jobs:
--cache-to type=inline \
--tag ghcr.io/getsentry/sentry-self-hosted:${{ github.sha }} \
--file self-hosted/Dockerfile \
--build-arg SOURCE_COMMIt=${{ github.sha }} \
--build-arg SOURCE_COMMIT=${{ github.sha }} \
"${args[@]}" \
.
32 changes: 32 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
24.8.0
------

### Various fixes & improvements

- style(toolbar): adjust alert indicator css (#76189) by @michellewzhang
- fix(issue-summary): Word break on code (#76217) by @jennmueng
- fix(issue-details): Prevent event error section from showing up if no errors (#76235) by @roggenkemper
- nit(scm): group functions by class they come from in main integration class (#76240) by @cathteng
- chore(migrations): Generalize the migrations_added file filter (#76244) by @wedamija
- chore(explore): Add new referrer for explore in events (#76256) by @Zylphrex
- ref(explore): Use sort type from discover (#76220) by @Zylphrex
- misc(deps): Bump the versions of a few google packages (#76257) by @colin-sentry
- chore(slack): temporarily track snuba user count queries round 2 (#76216) by @cathteng
- feat(breadcrumbs): Fix breadcrumbs styles + navigation (#76207) by @leeandher
- feat(features) Use dataclasses for flagpole instead of pydantic (#75859) by @markstory
- ref(similarity): Manually filter times seen in backfill query (#76188) by @jangjodi
- feat(insights): implement geo region selector in web vitals and assets (#76185) by @DominikB2014
- chore(dashboards): Register feature for auto sized Big Number widgets (#76205) by @gggritso
- feat(profiling) add function metrics table (#76110) by @JonasBa
- fix(self-hosted): SOURCE_COMMIT (#76139) by @joshuarli
- Don't emit Sentry warnings for throttled queries to Snuba (#75879) by @xurui-c
- chore(uptime): Switch result consumer duration/delay stats to use distribition (#76237) by @wedamija
- chore: Bump React error codes cache TTL to 3 days (#76243) by @dashed
- chore(uptime): Bump ACTIVE_FAILURE_THRESHOLD to 3 (#76218) by @wedamija
- fix(alert): Correct url (#76236) by @schew2381
- fix(uptime): Always pass span_id from check result to occurrence (#76227) by @evanpurkhiser
- ref(replay): update missing replay alert to include ad blocker note (#76215) by @michellewzhang
- Revert "fix(breadcrumbs): Use subgrid to align log levels (#76148)" (d08c8050) by @getsentry-bot

_Plus 1113 more_

24.7.1
------

Expand Down
6 changes: 5 additions & 1 deletion config/tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
"moduleResolution": "node",

// We add esnext to lib to pull in types for all newer ECMAScript features
"lib": ["esnext", "dom"],
"lib": [
"esnext",
"dom",
"dom.iterable"
],

// Skip type checking of all declaration files
"skipLibCheck": true,
Expand Down
2 changes: 1 addition & 1 deletion fixtures/backup/model_dependencies/detailed.json
Original file line number Diff line number Diff line change
Expand Up @@ -2310,7 +2310,7 @@
"dangling": false,
"foreign_keys": {
"grouphash": {
"kind": "FlexibleForeignKey",
"kind": "DefaultOneToOneField",
"model": "sentry.grouphash",
"nullable": false
}
Expand Down
2 changes: 1 addition & 1 deletion fixtures/gitlab.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

from sentry.integrations.gitlab.integration import GitlabIntegration
from sentry.integrations.models.integration import Integration
from sentry.models.identity import Identity, IdentityProvider
from sentry.models.repository import Repository
from sentry.silo.base import SiloMode
from sentry.testutils.cases import APITestCase
from sentry.testutils.helpers.integrations import get_installation_of_type
from sentry.testutils.silo import assume_test_silo_mode
from sentry.users.models.identity import Identity, IdentityProvider

EXTERNAL_ID = "example.gitlab.com:group-x"
WEBHOOK_SECRET = "secret-token-value"
Expand Down
2 changes: 1 addition & 1 deletion migrations_lockfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ hybridcloud: 0016_add_control_cacheversion
nodestore: 0002_nodestore_no_dictfield
remote_subscriptions: 0003_drop_remote_subscription
replays: 0004_index_together
sentry: 0749_disable_member_invite
sentry: 0751_grouphashmetadata_use_one_to_one_field_for_grouphash
social_auth: 0002_default_auto_field
uptime: 0007_update_detected_subscription_interval
26 changes: 15 additions & 11 deletions requirements-base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,19 @@ Django>=5.0.6
djangorestframework>=3.15.1
drf-spectacular>=0.26.3
email-reply-parser>=0.5.12
google-api-core>=2.15.0
google-auth>=2.25.2
google-cloud-bigtable>=2.22.0
google-cloud-build>=3.22.0
google-api-core>=2.19.1
google-auth>=2.29.0
google-cloud-bigtable>=2.26.0
google-cloud-build>=3.24.2
google-cloud-core>=2.4.1
google-cloud-functions>=1.14.0
google-cloud-kms>=2.20.0
google-cloud-pubsub>=2.19.0
google-cloud-spanner>=3.46
google-cloud-storage>=2.14.0
googleapis-common-protos>=1.63.0
google-cloud-functions>=1.17.0
google-cloud-kms>=2.24.2
google-cloud-pubsub>=2.23.0
google-cloud-spanner>=3.48.0
google-cloud-storage>=2.18.0
googleapis-common-protos>=1.63.2
google-crc32c>=1.5.0
grpc-google-iam-v1>=0.13.1
isodate>=0.6.1
jsonschema>=3.2.0
lxml>=4.9.3
Expand All @@ -41,6 +42,8 @@ petname>=2.6
phonenumberslite>=8.12.32
Pillow>=10.2.0
progressbar2>=3.41.0
protobuf>=5.27.3
proto-plus>=1.24.0
python-rapidjson>=1.4
psutil>=5.9.2
psycopg2-binary>=2.9.9
Expand All @@ -64,11 +67,12 @@ rfc3986-validator>=0.1.1
sentry-arroyo>=2.16.5
sentry-kafka-schemas>=0.1.106
sentry-ophio==0.2.7
sentry-protos>=0.1.3
sentry-redis-tools>=0.1.7
sentry-relay>=0.9.1
sentry-sdk>=2.12.0
slack-sdk>=3.27.2
snuba-sdk>=2.0.33
snuba-sdk>=3.0.38
simplejson>=3.17.6
sqlparse>=0.4.4
statsd>=3.3
Expand Down
30 changes: 16 additions & 14 deletions requirements-dev-frozen.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,22 @@ filelock==3.13.1
flake8==7.0.0
flake8-bugbear==22.10.27
flake8-logging==1.5.0
google-api-core==2.15.0
google-auth==2.25.2
google-cloud-bigtable==2.22.0
google-cloud-build==3.22.0
google-api-core==2.19.1
google-auth==2.29.0
google-cloud-bigtable==2.26.0
google-cloud-build==3.24.2
google-cloud-core==2.4.1
google-cloud-functions==1.14.0
google-cloud-kms==2.20.0
google-cloud-pubsub==2.19.0
google-cloud-spanner==3.46.0
google-cloud-storage==2.14.0
google-cloud-functions==1.17.0
google-cloud-kms==2.24.2
google-cloud-pubsub==2.23.0
google-cloud-spanner==3.48.0
google-cloud-storage==2.18.0
google-crc32c==1.5.0
google-resumable-media==2.7.0
googleapis-common-protos==1.63.0
grpc-google-iam-v1==0.13.0
googleapis-common-protos==1.63.2
grpc-google-iam-v1==0.13.1
grpc-interceptor==0.15.4
grpc-stubs==1.53.0.5
grpcio==1.60.1
grpcio-status==1.60.1
h11==0.13.0
Expand Down Expand Up @@ -128,8 +129,8 @@ pluggy==1.4.0
pre-commit==3.3.2
progressbar2==3.41.0
prompt-toolkit==3.0.41
proto-plus==1.23.0
protobuf==4.25.2
proto-plus==1.24.0
protobuf==5.27.3
psutil==5.9.7
psycopg2-binary==2.9.9
pyasn1==0.4.5
Expand Down Expand Up @@ -184,6 +185,7 @@ sentry-forked-django-stubs==5.0.4.post1
sentry-forked-djangorestframework-stubs==3.15.0.post1
sentry-kafka-schemas==0.1.106
sentry-ophio==0.2.7
sentry-protos==0.1.3
sentry-redis-tools==0.1.7
sentry-relay==0.9.1
sentry-sdk==2.12.0
Expand All @@ -192,7 +194,7 @@ simplejson==3.17.6
six==1.16.0
slack-sdk==3.27.2
sniffio==1.2.0
snuba-sdk==2.0.34
snuba-sdk==3.0.38
sortedcontainers==2.4.0
soupsieve==2.3.2.post1
sqlparse==0.5.0
Expand Down
30 changes: 16 additions & 14 deletions requirements-frozen.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,22 @@ email-reply-parser==0.5.12
fastjsonschema==2.16.2
fido2==0.9.2
filelock==3.15.3
google-api-core==2.15.0
google-auth==2.25.2
google-cloud-bigtable==2.22.0
google-cloud-build==3.22.0
google-api-core==2.19.1
google-auth==2.29.0
google-cloud-bigtable==2.26.0
google-cloud-build==3.24.2
google-cloud-core==2.4.1
google-cloud-functions==1.14.0
google-cloud-kms==2.20.0
google-cloud-pubsub==2.19.0
google-cloud-spanner==3.46.0
google-cloud-storage==2.14.0
google-cloud-functions==1.17.0
google-cloud-kms==2.24.2
google-cloud-pubsub==2.23.0
google-cloud-spanner==3.48.0
google-cloud-storage==2.18.0
google-crc32c==1.5.0
google-resumable-media==2.7.0
googleapis-common-protos==1.63.0
grpc-google-iam-v1==0.13.0
googleapis-common-protos==1.63.2
grpc-google-iam-v1==0.13.1
grpc-interceptor==0.15.4
grpc-stubs==1.53.0.5
grpcio==1.60.1
grpcio-status==1.60.1
h11==0.14.0
Expand Down Expand Up @@ -88,8 +89,8 @@ phonenumberslite==8.12.55
pillow==10.2.0
progressbar2==3.41.0
prompt-toolkit==3.0.41
proto-plus==1.23.0
protobuf==4.25.2
proto-plus==1.24.0
protobuf==5.27.3
psutil==5.9.7
psycopg2-binary==2.9.9
pyasn1==0.4.5
Expand Down Expand Up @@ -125,6 +126,7 @@ s3transfer==0.10.0
sentry-arroyo==2.16.5
sentry-kafka-schemas==0.1.106
sentry-ophio==0.2.7
sentry-protos==0.1.3
sentry-redis-tools==0.1.7
sentry-relay==0.9.1
sentry-sdk==2.12.0
Expand All @@ -133,7 +135,7 @@ simplejson==3.17.6
six==1.16.0
slack-sdk==3.27.2
sniffio==1.3.0
snuba-sdk==2.0.34
snuba-sdk==3.0.38
soupsieve==2.3.2.post1
sqlparse==0.5.0
statsd==3.3.0
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = sentry
version = 24.8.0.dev0
version = 24.9.0.dev0
description = A realtime logging and aggregation server.
long_description = file: README.md
long_description_content_type = text/markdown
Expand Down
Loading

0 comments on commit 2befb58

Please sign in to comment.