Merged
Conversation
sl0thentr0py
approved these changes
Feb 9, 2024
Contributor
Author
|
@sl0thentr0py Added an extra override if you wanna recheck |
Comment on lines
+255
to
+273
| try: | ||
| import uwsgi # type: ignore | ||
| except ImportError: | ||
| uwsgi = None | ||
|
|
||
| if uwsgi is not None and not experiments.get( | ||
| "force_enable_metrics", False | ||
| ): | ||
| logger.warning("Metrics currently not supported with uWSGI.") | ||
|
|
||
| else: | ||
| from sentry_sdk.metrics import MetricsAggregator | ||
|
|
||
| self.metrics_aggregator = MetricsAggregator( | ||
| capture_func=_capture_envelope, | ||
| enable_code_locations=bool( | ||
| experiments.get("metric_code_locations", True) | ||
| ), | ||
| ) |
Member
There was a problem hiding this comment.
Kinda a nitpick, but couldn't we get rid of this additional if/else branching simply by moving the if part to an else block associated with the try statement, and by moving the else portion under except ImportError? Something like this:
Suggested change
| try: | |
| import uwsgi # type: ignore | |
| except ImportError: | |
| uwsgi = None | |
| if uwsgi is not None and not experiments.get( | |
| "force_enable_metrics", False | |
| ): | |
| logger.warning("Metrics currently not supported with uWSGI.") | |
| else: | |
| from sentry_sdk.metrics import MetricsAggregator | |
| self.metrics_aggregator = MetricsAggregator( | |
| capture_func=_capture_envelope, | |
| enable_code_locations=bool( | |
| experiments.get("metric_code_locations", True) | |
| ), | |
| ) | |
| try: | |
| import uwsgi as _ # type: ignore | |
| except ImportError: | |
| from sentry_sdk.metrics import MetricsAggregator | |
| self.metrics_aggregator = MetricsAggregator( | |
| capture_func=_capture_envelope, | |
| enable_code_locations=bool( | |
| experiments.get("metric_code_locations", True) | |
| ), | |
| ) | |
| else: | |
| if not experiments.get( | |
| "force_enable_metrics", False | |
| ): | |
| logger.warning("Metrics currently not supported with uWSGI.") |
Contributor
Author
There was a problem hiding this comment.
I'm pretty sure this would work but I'd have to recheck this locally first and I'm kinda eager to get this hotfix out :) This code will go back to how it was anyway as soon as we figure out an actual fix.
Member
There was a problem hiding this comment.
Gotcha, fair enough. Does not matter if this change is only going to be temporary
sl0thentr0py
approved these changes
Feb 9, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Metrics are broken under uWSGI. Take the feature down for uWSGI until we figure out a fix.
General Notes
Thank you for contributing to
sentry-python!Please add tests to validate your changes, and lint your code using
tox -e linters.Running the test suite on your PR might require maintainer approval. Some tests (AWS Lambda) additionally require a maintainer to add a special label to run and will fail if the label is not present.
For maintainers
Sensitive test suites require maintainer review to ensure that tests do not compromise our secrets. This review must be repeated after any code revisions.
Before running sensitive test suites, please carefully check the PR. Then, apply the
Trigger: tests using secretslabel. The label will be removed after any code changes to enforce our policy requiring maintainers to review all code revisions before running sensitive tests.