Handle null bot name correctly when trying to find region in monitoring #4592
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
| @@ -625,6 +624,9 @@ def metrics_store(): | |||
|
|
|||
| def _get_region(bot_name): | |||
There was a problem hiding this comment.
This is not going to work for batch jobs.
THere are two ways to resolve this:
- Include the region in the batch job names.
- use some kind of GCE metadata server or something similaar to determine the region.
There was a problem hiding this comment.
I think it's already broken for batch jobs btw, so LGTMing
jonathanmetzman
approved these changes
Jan 8, 2025
| @@ -625,6 +624,9 @@ def metrics_store(): | |||
|
|
|||
| def _get_region(bot_name): | |||
There was a problem hiding this comment.
I think it's already broken for batch jobs btw, so LGTMing
jonathanmetzman
pushed a commit
that referenced
this pull request
Jan 8, 2025
…ng (#4592) This fixes the following error in app engine crons: ``` Failed to flush metrics: expected string or bytes-like object, got 'NoneType' Traceback (most recent call last): File "/layers/google.python.runtime/python/lib/python3.11/threading.py", line 1002, in _bootstrap self._bootstrap_inner() File "/layers/google.python.runtime/python/lib/python3.11/threading.py", line 1045, in _bootstrap_inner self.run() File "/layers/google.python.runtime/python/lib/python3.11/threading.py", line 982, in run self._target(*self._args, **self._kwargs) File "/srv/clusterfuzz/_internal/metrics/monitor.py", line 171, in _flush_loop self._flush_function() File "/srv/clusterfuzz/_internal/metrics/monitor.py", line 134, in _flush_metrics logs.error(f'Failed to flush metrics: {e}') LogError: Failed to flush metrics: expected string or bytes-like object, got 'NoneType' Traceback (most recent call last): File "/srv/clusterfuzz/_internal/metrics/monitor.py", line 118, in _flush_metrics metric.monitoring_v3_time_series(series, labels, start_time, end_time, File "/srv/clusterfuzz/_internal/metrics/monitor.py", line 343, in monitoring_v3_time_series self.monitoring_v3_metric(time_series.metric, labels) File "/srv/clusterfuzz/_internal/metrics/monitor.py", line 321, in monitoring_v3_metric metric.labels['region'] = _get_region(bot_name) ^^^^^^^^^^^^^^^^^^^^^ File "/srv/clusterfuzz/_internal/metrics/monitor.py", line 637, in _get_region if re.match(pattern['pattern'], bot_name): ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/layers/google.python.runtime/python/lib/python3.11/re/__init__.py", line 166, in match return _compile(pattern, flags).match(string) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TypeError: expected string or bytes-like object, got 'NoneType' ```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fixes the following error in app engine crons: