fix(minimetrics): Fix broken recursion detection #56466
Merged
Conversation
This file contains 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
github-actions
bot
added
the
Scope: Backend
mitsuhiko
commented
Sep 19, 2023
| if tags is not None: | ||
| casted_tags = { | ||
| tag_key: str(tag_value) for tag_key, tag_value in tags.items() if tag_value is not None | ||
| } | ||
|
|
||
| return cast(Optional[MetricTagsExternal], casted_tags) | ||
| return casted_tags |
There was a problem hiding this comment.
Apparently Optional[MetricsTagsExternal] causes something odd to happen in typing and this also raise a recursion error for me:
11:59:28 [ERROR] sentry.errors: Unable to record backend metric
Traceback (most recent call last):
File "/Users/mitsuhiko/Development/sentry/src/sentry/utils/metrics.py", line 133, in incr
backend.incr(key, instance, tags, amount, sample_rate)
File "/Users/mitsuhiko/Development/sentry/src/sentry/metrics/middleware.py", line 133, in incr
return self.inner.incr(key, instance, current_tags, amount, sample_rate)
File "/Users/mitsuhiko/Development/sentry/src/sentry/metrics/minimetrics.py", line 86, in incr
tags=_to_minimetrics_external_metric_tags(tags),
File "/Users/mitsuhiko/Development/sentry/src/sentry/metrics/minimetrics.py", line 18, in _to_minimetrics_external_metric_tags
return cast(Optional[MetricTagsExternal], casted_tags)
File "/Users/mitsuhiko/.pyenv/versions/3.8.12/lib/python3.8/typing.py", line 258, in inner
return cached(*args, **kwds)
File "/Users/mitsuhiko/.pyenv/versions/3.8.12/lib/python3.8/typing.py", line 330, in __hash__
return hash((self._name,))
RecursionError: maximum recursion depth exceeded while calling a Python object
There was a problem hiding this comment.
I think this is just that it finally failed recursion on that level, but given that cast() is just unnecessary runtime overhead, I removed it.
iambriccardo
approved these changes
Sep 19, 2023
Codecov Report
@@ Coverage Diff @@
## master #56466 +/- ##
=======================================
Coverage 78.65% 78.65%
=======================================
Files 5078 5078
Lines 218270 218270
Branches 36951 36951
=======================================
+ Hits 171676 171678 +2
+ Misses 41052 41051 -1
+ Partials 5542 5541 -1
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
addcan call intometrics.incrwhich can go back into minimetrics. This fixes this recursion.