Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Turn off metrics for uWSGI #2720

Merged
merged 4 commits into from Feb 9, 2024
Merged

Turn off metrics for uWSGI #2720

merged 4 commits into from Feb 9, 2024

Conversation

sentrivana
Copy link
Contributor

@sentrivana sentrivana commented Feb 9, 2024

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 secrets label. The label will be removed after any code changes to enforce our policy requiring maintainers to review all code revisions before running sensitive tests.

@sentrivana sentrivana marked this pull request as ready for review February 9, 2024 08:48
@sentrivana sentrivana enabled auto-merge (squash) February 9, 2024 08:53
@sentrivana
Copy link
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)
),
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, fair enough. Does not matter if this change is only going to be temporary

@sl0thentr0py sl0thentr0py enabled auto-merge (squash) February 9, 2024 09:30
@sentrivana sentrivana enabled auto-merge (squash) February 9, 2024 09:40
@sentrivana sentrivana merged commit f23bdd3 into master Feb 9, 2024
121 checks passed
@sentrivana sentrivana deleted the ivana/no-metrics-for-uwsgi branch February 9, 2024 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants