diff options
author | 2023-12-12 17:02:53 +0100 | |
---|---|---|
committer | 2023-12-12 17:02:53 +0100 | |
commit | efd58583d4337a70dbec8d326fd888a224dda67a (patch) | |
tree | 8dddf9e22fbc04b561242e76fb7416b70c5292f6 /pydis_site | |
parent | Enable Sentry profile sampling (diff) | |
parent | Simplify is_bot_pr_approval logic (diff) |
Merge pull request #1172 from python-discord/update-sentry-config
Enable tracing and include source for slow queries
Diffstat (limited to 'pydis_site')
-rw-r--r-- | pydis_site/apps/api/views.py | 19 | ||||
-rw-r--r-- | pydis_site/settings.py | 5 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pydis_site/apps/api/views.py b/pydis_site/apps/api/views.py index 9b0974f3..1fa3efc2 100644 --- a/pydis_site/apps/api/views.py +++ b/pydis_site/apps/api/views.py @@ -261,30 +261,27 @@ class GitHubWebhookFilterView(APIView): def post(self, request: Request, *, webhook_id: str, webhook_token: str) -> Response: """Filter a webhook POST from GitHub before sending it to Discord.""" sender = request.data.get('sender', {}) - sender_name = sender.get('login', '') - event = request.headers.get('X-GitHub-Event') + sender_name = sender.get('login', '').lower() + event = request.headers.get('X-GitHub-Event', '').lower() repository = request.data.get('repository', {}) is_coveralls = 'coveralls' in sender_name - is_github_bot = sender.get('type') == 'bot' + is_github_bot = sender.get('type', '').lower() == 'bot' is_sentry = 'sentry-io' in sender_name is_dependabot_branch_deletion = ( - 'dependabot' in request.data.get('ref', '') + 'dependabot' in request.data.get('ref', '').lower() and event == 'delete' ) - is_bot_pr_approval = ( - '[bot]' in request.data.get('pull_request', {}).get('user', {}).get('login', '') - and event == 'pull_request_review' - ) + is_bot_pr_approval = is_github_bot and event == 'pull_request_review' is_empty_review = ( - request.data.get('review', {}).get('state') == 'commented' + request.data.get('review', {}).get('state', '').lower() == 'commented' and event == 'pull_request_review' and request.data.get('review', {}).get('body') is None ) is_black_non_main_push = ( request.data.get('ref') != 'refs/heads/main' - and repository.get('name') == 'black' - and repository.get('owner', {}).get('login') == 'psf' + and repository.get('name', '').lower() == 'black' + and repository.get('owner', {}).get('login', '').lower() == 'psf' and event == 'push' ) diff --git a/pydis_site/settings.py b/pydis_site/settings.py index ec8efac3..5a6edfdf 100644 --- a/pydis_site/settings.py +++ b/pydis_site/settings.py @@ -55,7 +55,10 @@ if not STATIC_BUILD: integrations=[DjangoIntegration(), LoggingIntegration(level=logging.DEBUG, event_level=logging.ERROR)], send_default_pii=True, release=f"site@{GIT_SHA}", - profiles_sample_rate=0.5, + profiles_sample_rate=1.0, + enable_tracing=True, + enable_db_query_source=True, + db_query_source_threshold_ms=100, # Queries slower that 100ms will include the source in the event ) # Build paths inside the project like this: os.path.join(BASE_DIR, ...) |