Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scripts/perf/collect_metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,16 @@ def collect_prometheus_metrics(
metric_base = normalized_metric.split("{", 1)[0]
if previous_value is None:
results[normalized_metric] = numeric_value
elif metric_base.endswith(_TIMESTAMP_SUFFIXES):
continue

if "_quantile_" in metric_base:
results[normalized_metric] = max(previous_value, numeric_value)
elif "_quantile_" in metric_base:
elif metric_base.endswith(_TIMESTAMP_SUFFIXES):
results[normalized_metric] = max(previous_value, numeric_value)
elif metric_base.endswith(_ADDITIVE_SUFFIXES) or metric_base.endswith(
_BUCKET_SUFFIXES
):
results[normalized_metric] = previous_value + numeric_value
elif "_quantile_" in metric_base:
results[normalized_metric] = max(previous_value, numeric_value)
else:
results[normalized_metric] = numeric_value
return results
Expand Down
24 changes: 24 additions & 0 deletions tests/scripts/perf/test_collect_metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,30 @@ def test_collect_prometheus_metrics_keeps_highest_quantile_value(
assert result == {"day8_latency_seconds_quantile_0.5": 0.6}


def test_collect_prometheus_metrics_keeps_highest_quantile_value_with_additional_labels(
monkeypatch: pytest.MonkeyPatch,
collect_metrics_module,
) -> None:
payload = "\n".join(
[
'day8_latency_seconds{quantile="0.5",status="ok",instance="a"} 0.9',
'day8_latency_seconds{quantile="0.5",status="ok",instance="b"} 0.3',
]
).encode("utf-8")

monkeypatch.setattr(
collect_metrics_module.urllib.request,
"urlopen",
lambda url, timeout=5.0: _DummyResponse(payload),
)

result = collect_metrics_module.collect_prometheus_metrics(
"http://example.test/metrics"
)

assert result == {'day8_latency_seconds_quantile_0.5{status="ok"}': 0.9}


def test_main_succeeds_with_required_metrics(
monkeypatch: pytest.MonkeyPatch,
tmp_path: Path,
Expand Down