kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_prometheus: Do not generate broken metrics

Browse Source 
In 8d6fdf9c3a invisible bridges were
skipped but that lead to producing metrics with no name and no help.

Keep track of the number of metrics configured and then only emit these.
Add a basic testcase that verifies that there is no '(NULL)' in the
output.

ASTERISK-30474

(cherry picked from commit 9b93fb9f67)
This commit is contained in:
Holger Hans Peter Freyther
2023-04-07 17:44:44 +08:00
committed by Asterisk Development Team
parent 4db0a4520e
commit 0aa95751db
2 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/prometheus/bridges.c
View File

@@ -83,7 +83,7 @@ static void bridges_scrape_cb(struct ast_str **response)
struct ast_bridge *bridge;
struct prometheus_metric *bridge_metrics;
char eid_str[32];
int i, j, num_bridges;
int i, j, num_bridges, num_outputs = 0;
struct prometheus_metric bridge_count = PROMETHEUS_METRIC_STATIC_INITIALIZATION(
PROMETHEUS_METRIC_GAUGE,
"asterisk_bridges_count",
@@ -138,7 +138,7 @@ static void bridges_scrape_cb(struct ast_str **response)
}
for (j = 0; j < ARRAY_LEN(bridge_metric_defs); j++) {
int index = i * ARRAY_LEN(bridge_metric_defs) + j;
int index = num_outputs++;
bridge_metrics[index].type = PROMETHEUS_METRIC_GAUGE;
ast_copy_string(bridge_metrics[index].name, bridge_metric_defs[j].name, sizeof(bridge_metrics[index].name));
@@ -159,7 +159,7 @@ static void bridges_scrape_cb(struct ast_str **response)
}
ao2_iterator_destroy(&it_bridges);
for (j = 0; j < ARRAY_LEN(bridge_metric_defs); j++) {
for (j = 0; j < num_outputs; j++) {
prometheus_metric_to_string(&bridge_metrics[j], response);
}