[fix] openmetrics: value is None if there's no data

Browse Source
This commit is contained in:
Bnyro 2024-11-25 16:46:18 +01:00
parent bad070b4bc
commit ae4a506ea5
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
searx/metrics/__init__.py
View File

@ -258,35 +258,38 @@ def openmetrics(engine_stats, engine_reliabilities):
type_hint="gauge",
help_hint="The average total response time of the engine",
data_info=[{'engine_name': engine['name']} for engine in engine_stats['time']],
data=[engine['total'] for engine in engine_stats['time']],
data=[engine['total'] or 0 for engine in engine_stats['time']],
),
OpenMetricsFamily(
key="searxng_engines_response_time_processing_seconds",
type_hint="gauge",
help_hint="The average processing response time of the engine",
data_info=[{'engine_name': engine['name']} for engine in engine_stats['time']],
data=[engine['processing'] for engine in engine_stats['time']],
data=[engine['processing'] or 0 for engine in engine_stats['time']],
),
OpenMetricsFamily(
key="searxng_engines_response_time_http_seconds",
type_hint="gauge",
help_hint="The average HTTP response time of the engine",
data_info=[{'engine_name': engine['name']} for engine in engine_stats['time']],
data=[engine['http'] for engine in engine_stats['time']],
data=[engine['http'] or 0 for engine in engine_stats['time']],
),
OpenMetricsFamily(
key="searxng_engines_result_count_total",
type_hint="counter",
help_hint="The total amount of results returned by the engine",
data_info=[{'engine_name': engine['name']} for engine in engine_stats['time']],
data=[engine['result_count'] for engine in engine_stats['time']],
data=[engine['result_count'] or 0 for engine in engine_stats['time']],
),
OpenMetricsFamily(
key="searxng_engines_request_count_total",
type_hint="counter",
help_hint="The total amount of user requests made to this engine",
data_info=[{'engine_name': engine['name']} for engine in engine_stats['time']],
data=[engine_reliabilities.get(engine['name'], {}).get('sent_count', 0) for engine in engine_stats['time']],
data=[
engine_reliabilities.get(engine['name'], {}).get('sent_count', 0) or 0
for engine in engine_stats['time']
],
),
OpenMetricsFamily(
key="searxng_engines_reliability_total",
@ -294,7 +297,8 @@ def openmetrics(engine_stats, engine_reliabilities):
help_hint="The overall reliability of the engine",
data_info=[{'engine_name': engine['name']} for engine in engine_stats['time']],
data=[
engine_reliabilities.get(engine['name'], {}).get('reliability', 0) for engine in engine_stats['time']
engine_reliabilities.get(engine['name'], {}).get('reliability', 0) or 0
for engine in engine_stats['time']
],
),
]

2
searx/openmetrics.py
View File

@ -26,7 +26,7 @@ class OpenMetricsFamily: # pylint: disable=too-few-public-methods
"""
for i, data_info_dict in enumerate(self.data_info):
if not data_info_dict and data_info_dict != 0:
if not data_info_dict or not self.data[i]:
continue
info_representation = ','.join([f"{key}=\"{value}\"" for (key, value) in data_info_dict.items()])