rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-09 14:32:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename 'installed_extensions' metric to 'compute_installed_extensions' (#9759)

Browse Source 
to keep it consistent with existing compute metrics.

flux-fleet change is not needed, because it doesn't have any filter by
metric name for compute metrics.
This commit is contained in:
Anastasia Lubennikova
2024-11-22 19:27:04 +00:00
committed by GitHub
parent c1937d073f
commit 3245f7b88d
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compute_tools/src/installed_extensions.rs
View File

@@ -115,7 +115,7 @@ pub fn get_installed_extensions_sync(connstr: Url) -> Result<()> {
static INSTALLED_EXTENSIONS: Lazy<UIntGaugeVec> = Lazy::new(|| {
register_uint_gauge_vec!(
"installed_extensions",
"compute_installed_extensions",
"Number of databases where the version of extension is installed",
&["extension_name", "version"]
)

20
test_runner/regress/test_installed_extensions.py
View File

@@ -99,11 +99,15 @@ def test_installed_extensions(neon_simple_env: NeonEnv):
res = client.metrics()
info("Metrics: %s", res)
m = parse_metrics(res)
neon_m = m.query_all("installed_extensions", {"extension_name": "neon", "version": "1.2"})
neon_m = m.query_all(
"compute_installed_extensions", {"extension_name": "neon", "version": "1.2"}
)
assert len(neon_m) == 1
for sample in neon_m:
assert sample.value == 2
neon_m = m.query_all("installed_extensions", {"extension_name": "neon", "version": "1.3"})
neon_m = m.query_all(
"compute_installed_extensions", {"extension_name": "neon", "version": "1.3"}
)
assert len(neon_m) == 1
for sample in neon_m:
assert sample.value == 1
@@ -116,7 +120,7 @@ def test_installed_extensions(neon_simple_env: NeonEnv):
try:
res = client.metrics()
timeout = -1
if len(parse_metrics(res).query_all("installed_extensions")) < 4:
if len(parse_metrics(res).query_all("compute_installed_extensions")) < 4:
# Assume that not all metrics that are collected yet
time.sleep(1)
timeout -= 1
@@ -128,17 +132,21 @@ def test_installed_extensions(neon_simple_env: NeonEnv):
continue
assert (
len(parse_metrics(res).query_all("installed_extensions")) >= 4
len(parse_metrics(res).query_all("compute_installed_extensions")) >= 4
), "Not all metrics are collected"
info("After restart metrics: %s", res)
m = parse_metrics(res)
neon_m = m.query_all("installed_extensions", {"extension_name": "neon", "version": "1.2"})
neon_m = m.query_all(
"compute_installed_extensions", {"extension_name": "neon", "version": "1.2"}
)
assert len(neon_m) == 1
for sample in neon_m:
assert sample.value == 1
neon_m = m.query_all("installed_extensions", {"extension_name": "neon", "version": "1.3"})
neon_m = m.query_all(
"compute_installed_extensions", {"extension_name": "neon", "version": "1.3"}
)
assert len(neon_m) == 1
for sample in neon_m:
assert sample.value == 1