Skip to content

Commit 626db8b

Browse files
committed
Avoid running regex against null bot name when trying to find the region label
1 parent 9c6c1ff commit 626db8b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/clusterfuzz/_internal/metrics/monitor.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,8 @@ def monitoring_v3_metric(self, metric, labels=None):
313313
for key, value in labels.items():
314314
metric.labels[key] = str(value)
315315

316-
if not environment.is_running_on_k8s():
317-
bot_name = environment.get_value('BOT_NAME', None)
318-
metric.labels['region'] = _get_region(bot_name)
316+
bot_name = environment.get_value('BOT_NAME', None)
317+
metric.labels['region'] = _get_region(bot_name)
319318

320319
return metric
321320

@@ -625,6 +624,9 @@ def metrics_store():
625624

626625
def _get_region(bot_name):
627626
"""Get bot region."""
627+
if not bot_name:
628+
return 'unknown'
629+
628630
try:
629631
regions = local_config.MonitoringRegionsConfig()
630632
except errors.BadConfigError:

0 commit comments

Comments
 (0)