From: Florian Forster <octo@collectd.org>
Date: Sun, 17 Dec 2023 14:04:59 +0000 (+0100)
Subject: memory plugin: Align metrics with OpenTelemetry recommendations.
X-Git-Tag: 6.0.0-rc0~19^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4616f83489c138857a1844bbffe7626d01dcb5fa;p=thirdparty%2Fcollectd.git

memory plugin: Align metrics with OpenTelemetry recommendations.

* The "state" label has been renamed to "system.memory.state".
* Metric descriptions and units have been added.
---

diff --git a/src/memory.c b/src/memory.c
index 77e85a0fe..7ecea0142 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -168,6 +168,8 @@ static int memory_config(oconfig_item_t *ci) /* {{{ */
 static int memory_dispatch(gauge_t values[COLLECTD_MEMORY_TYPE_MAX]) {
   metric_family_t fam_absolute = {
       .name = "system.memory.usage",
+      .help = "Reports memory in use by state",
+      .unit = "By",
       .type = METRIC_TYPE_GAUGE,
   };
   gauge_t total = 0;
@@ -180,8 +182,9 @@ static int memory_dispatch(gauge_t values[COLLECTD_MEMORY_TYPE_MAX]) {
     total += values[i];
 
     if (values_absolute) {
-      metric_family_append(&fam_absolute, "state", memory_type_names[i],
-                           (value_t){.gauge = values[i]}, NULL);
+      metric_family_append(&fam_absolute, "system.memory.state",
+                           memory_type_names[i], (value_t){.gauge = values[i]},
+                           NULL);
     }
   }
 
@@ -206,6 +209,8 @@ static int memory_dispatch(gauge_t values[COLLECTD_MEMORY_TYPE_MAX]) {
 
   metric_family_t fam_percent = {
       .name = "system.memory.utilization",
+      .help = "Reports memory in use by state",
+      .unit = "1",
       .type = METRIC_TYPE_GAUGE,
   };
   for (size_t i = 0; i < COLLECTD_MEMORY_TYPE_MAX; i++) {
@@ -213,7 +218,8 @@ static int memory_dispatch(gauge_t values[COLLECTD_MEMORY_TYPE_MAX]) {
       continue;
     }
 
-    metric_family_append(&fam_percent, "state", memory_type_names[i],
+    metric_family_append(&fam_percent, "system.memory.state",
+                         memory_type_names[i],
                          (value_t){.gauge = 100.0 * values[i] / total}, NULL);
   }