Skip to content

Commit

Permalink
ISSUE-1182: remove unused feature metrics, update alloc metrics names (…
Browse files Browse the repository at this point in the history 
…skupperproject#1228)
  • Loading branch information
@kgiusti
kgiusti authored Sep 26, 2023
1 parent ac18bdc commit 04d8712
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 20 deletions.
4 changes: 2 additions & 2 deletions docs/notes/prometheus.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,12 @@ Each data type will have a set of 4 metrics associated with it:
* allocated: total number of objects that are currently allocated from the heap
* in_use: total objects currently being used by the router
* cached: total objects in the cache
* memory_use_bytes: the sum of all memory allocated from the heap for the given data type
* bytes: the sum of all memory allocated from the heap for the given data type
These metrics adhere to the following relationships:
* allocated = in_use + cached
* memory_use_bytes = (sizeof(<type>) * allocated)
* bytes = (sizeof(<type>) * allocated)
Expand Down
18 changes: 5 additions & 13 deletions src/http-libwebsockets.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,6 @@ static uint64_t stats_get_connections(const qdr_global_stats_t *stats) { return
static uint64_t stats_get_links(const qdr_global_stats_t *stats) { return stats->links; }
static uint64_t stats_get_addrs(const qdr_global_stats_t *stats) { return stats->addrs; }
static uint64_t stats_get_routers(const qdr_global_stats_t *stats) { return stats->routers; }
static uint64_t stats_get_auto_links(const qdr_global_stats_t *stats) { return stats->auto_links; }
static uint64_t stats_get_presettled_deliveries(const qdr_global_stats_t *stats) { return stats->presettled_deliveries; }
static uint64_t stats_get_dropped_presettled_deliveries(const qdr_global_stats_t *stats) { return stats->dropped_presettled_deliveries; }
static uint64_t stats_get_accepted_deliveries(const qdr_global_stats_t *stats) { return stats->accepted_deliveries; }
Expand All @@ -547,20 +546,16 @@ static uint64_t stats_get_modified_deliveries(const qdr_global_stats_t *stats) {
static uint64_t stats_get_deliveries_ingress(const qdr_global_stats_t *stats) { return stats->deliveries_ingress; }
static uint64_t stats_get_deliveries_egress(const qdr_global_stats_t *stats) { return stats->deliveries_egress; }
static uint64_t stats_get_deliveries_transit(const qdr_global_stats_t *stats) { return stats->deliveries_transit; }
static uint64_t stats_get_deliveries_ingress_route_container(const qdr_global_stats_t *stats) { return stats->deliveries_ingress_route_container; }
static uint64_t stats_get_deliveries_egress_route_container(const qdr_global_stats_t *stats) { return stats->deliveries_egress_route_container; }
static uint64_t stats_get_deliveries_delayed_1sec(const qdr_global_stats_t *stats) { return stats->deliveries_delayed_1sec; }
static uint64_t stats_get_deliveries_delayed_10sec(const qdr_global_stats_t *stats) { return stats->deliveries_delayed_10sec; }
static uint64_t stats_get_deliveries_stuck(const qdr_global_stats_t *stats) { return stats->deliveries_stuck; }
static uint64_t stats_get_links_blocked(const qdr_global_stats_t *stats) { return stats->links_blocked; }
static uint64_t stats_get_deliveries_redirected_to_fallback(const qdr_global_stats_t *stats) { return stats->deliveries_redirected_to_fallback; }

static const struct metric_definition metrics[] = {
{"qdr_connections_total", "gauge", stats_get_connections},
{"qdr_links_total", "gauge", stats_get_links},
{"qdr_addresses_total", "gauge", stats_get_addrs},
{"qdr_routers_total", "gauge", stats_get_routers},
{"qdr_auto_links_total", "gauge", stats_get_auto_links},
{"qdr_presettled_deliveries_total", "counter", stats_get_presettled_deliveries},
{"qdr_dropped_presettled_deliveries_total", "counter", stats_get_dropped_presettled_deliveries},
{"qdr_accepted_deliveries_total", "counter", stats_get_accepted_deliveries},
Expand All @@ -570,13 +565,10 @@ static const struct metric_definition metrics[] = {
{"qdr_deliveries_ingress_total", "counter", stats_get_deliveries_ingress},
{"qdr_deliveries_egress_total", "counter", stats_get_deliveries_egress},
{"qdr_deliveries_transit_total", "counter", stats_get_deliveries_transit},
{"qdr_deliveries_ingress_route_container_total", "counter", stats_get_deliveries_ingress_route_container},
{"qdr_deliveries_egress_route_container_total", "counter", stats_get_deliveries_egress_route_container},
{"qdr_deliveries_delayed_1sec_total", "counter", stats_get_deliveries_delayed_1sec},
{"qdr_deliveries_delayed_10sec_total", "counter", stats_get_deliveries_delayed_10sec},
{"qdr_deliveries_stuck_total", "gauge", stats_get_deliveries_stuck},
{"qdr_links_blocked_total", "gauge", stats_get_links_blocked},
{"qdr_deliveries_redirected_to_fallback_total", "counter", stats_get_deliveries_redirected_to_fallback}
};
static const size_t metrics_length = sizeof(metrics)/sizeof(metrics[0]);

Expand Down Expand Up @@ -684,26 +676,26 @@ static size_t _write_allocator_metrics(uint8_t **start, size_t available)

pool_total_bytes += total_bytes;

size_t rc = _write_allocator_metric(start, available, metric->name, "total_allocated", total_allocated);
size_t rc = _write_allocator_metric(start, available, metric->name, "allocated", total_allocated);
if (rc == 0) return 0;
available -= rc;

rc = _write_allocator_metric(start, available, metric->name, "total_in_use", total_in_use);
rc = _write_allocator_metric(start, available, metric->name, "in_use", total_in_use);
if (rc == 0) return 0;
available -= rc;

rc = _write_allocator_metric(start, available, metric->name, "total_in_cache", total_in_cache);
rc = _write_allocator_metric(start, available, metric->name, "cached", total_in_cache);
if (rc == 0) return 0;
available -= rc;

rc = _write_allocator_metric(start, available, metric->name, "total_bytes", total_bytes);
rc = _write_allocator_metric(start, available, metric->name, "bytes", total_bytes);
if (rc == 0) return 0;
available -= rc;

metric = DEQ_NEXT(metric);
}

size_t rc = _write_metric(start, available, "alloc_pool_total_bytes", "gauge", pool_total_bytes);
size_t rc = _write_metric(start, available, "qdr_alloc_pool_bytes", "gauge", pool_total_bytes);
if (rc == 0) return 0;
available -= rc;

Expand Down
6 changes: 1 addition & 5 deletions tests/system_tests_http.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ def test_http_metrics(self):

stat_names = ["qdr_connections_total", "qdr_links_total",
"qdr_addresses_total", "qdr_routers_total",
"qdr_auto_links_total",
"qdr_presettled_deliveries_total",
"qdr_dropped_presettled_deliveries_total",
"qdr_accepted_deliveries_total",
Expand All @@ -218,13 +217,10 @@ def test_http_metrics(self):
"qdr_deliveries_ingress_total",
"qdr_deliveries_egress_total",
"qdr_deliveries_transit_total",
"qdr_deliveries_ingress_route_container_total",
"qdr_deliveries_egress_route_container_total",
"qdr_deliveries_delayed_1sec_total",
"qdr_deliveries_delayed_10sec_total",
"qdr_deliveries_stuck_total",
"qdr_links_blocked_total",
"qdr_deliveries_redirected_to_fallback_total"]
"qdr_links_blocked_total"]
for stat in r.management.query(type="io.skupper.router.allocator").get_dicts():
stat_names.append(stat['typeName'])

Expand Down

0 comments on commit 04d8712

Please sign in to comment.