Rename metrics for stable and heap memory bytes (#2679)

* Rename metrics for stable and heap memory bytes

* Revert changes in register

* Revert changes showcase

Author: lmuntaner

src/archive/src/main.rs

@@ -634,8 +634,9 @@ fn encode_metrics(w: &mut MetricsEncoder<Vec<u8>>) -> std::io::Result<()> {
         stable_size() as f64,
         "Number of stable memory pages used by this canister.",
     )?;
+    // Don't use the prefix ii_archive so that it gets picked up by a default alarm.
     w.encode_gauge(
-        "ii_archive_stable_memory_bytes",
+        "stable_memory_bytes",
         (stable_size() * WASM_PAGE_SIZE_IN_BYTES) as f64,
         "Size of the stable memory allocated by this canister.",
     )?;
@@ -645,9 +646,10 @@ fn encode_metrics(w: &mut MetricsEncoder<Vec<u8>>) -> std::io::Result<()> {
         core::arch::wasm32::memory_size::<0>() as f64,
         "Number of heap memory pages used by this canister.",
     )?;
+    // Don't use the prefix ii_archive so that it gets picked up by a default alarm.
     #[cfg(target_arch = "wasm32")]
     w.encode_gauge(
-        "ii_archive_heap_memory_bytes",
+        "heap_memory_bytes",
         (core::arch::wasm32::memory_size::<0>() as u64 * WASM_PAGE_SIZE_IN_BYTES) as f64,
         "Size of the heap memory allocated by this canister.",
     )?;

src/archive/tests/tests.rs

@@ -521,9 +521,9 @@ mod metrics_tests {
             "ii_archive_virtual_memory_pages{kind=\"log_data\"}",
             "ii_archive_virtual_memory_pages{kind=\"anchor_index\"}",
             "ii_archive_stable_memory_pages",
-            "ii_archive_stable_memory_bytes",
+            "stable_memory_bytes",
             "ii_archive_heap_pages",
-            "ii_archive_heap_memory_bytes",
+            "heap_memory_bytes",
             // The metrics
             //   * ii_archive_last_successful_fetch_timestamp_seconds
             //   * ii_archive_last_successful_fetch_entries_count
@@ -674,7 +674,7 @@ mod metrics_tests {
         );
         assert_metric(
             &get_metrics(&env, canister_id),
-            "ii_archive_stable_memory_bytes",
+            "stable_memory_bytes",
             3074f64 * WASM_PAGE_SIZE as f64, // the memory_manager pre-allocates a lot of memory (1024 page buckets per virtual memory and some overhead)
         );
         assert_metric(
@@ -684,7 +684,7 @@ mod metrics_tests {
         );
         assert_metric(
             &get_metrics(&env, canister_id),
-            "ii_archive_heap_memory_bytes",
+            "heap_memory_bytes",
             49f64 * WASM_PAGE_SIZE as f64,
         );
 
@@ -719,7 +719,7 @@ mod metrics_tests {
         );
         assert_metric(
             &get_metrics(&env, canister_id),
-            "ii_archive_stable_memory_bytes",
+            "stable_memory_bytes",
             3074f64 * WASM_PAGE_SIZE as f64, // does not change due to pre-allocation
         );
         assert_metric(
@@ -729,7 +729,7 @@ mod metrics_tests {
         );
         assert_metric(
             &get_metrics(&env, canister_id),
-            "ii_archive_heap_memory_bytes", // does not change due to pre-allocation
+            "heap_memory_bytes", // does not change due to pre-allocation
             51f64 * WASM_PAGE_SIZE as f64,
         );
 

src/internet_identity/src/http/metrics.rs

@@ -89,8 +89,9 @@ fn encode_metrics(w: &mut MetricsEncoder<Vec<u8>>) -> std::io::Result<()> {
         stable_size() as f64,
         "Number of stable memory pages used by this canister.",
     )?;
+    // Don't use the prefix internet_identity so that it gets picked up by a default alarm.
     w.encode_gauge(
-        "internet_identity_stable_memory_bytes",
+        "stable_memory_bytes",
         (stable_size() * WASM_PAGE_SIZE_IN_BYTES) as f64,
         "Size of the stable memory allocated by this canister.",
     )?;
@@ -100,9 +101,10 @@ fn encode_metrics(w: &mut MetricsEncoder<Vec<u8>>) -> std::io::Result<()> {
         core::arch::wasm32::memory_size::<0>() as f64,
         "Number of heap memory pages used by this canister.",
     )?;
+    // Don't use the prefix internet_identity so that it gets picked up by a default alarm.
     #[cfg(target_arch = "wasm32")]
     w.encode_gauge(
-        "internet_identity_heap_memory_bytes",
+        "heap_memory_bytes",
         (core::arch::wasm32::memory_size::<0>() as u64 * WASM_PAGE_SIZE_IN_BYTES) as f64,
         "Size of the heap memory allocated by this canister.",
     )?;

src/internet_identity/tests/integration/http.rs

@@ -147,9 +147,9 @@ fn ii_canister_serves_http_metrics() -> Result<(), CallError> {
         "internet_identity_max_user_number",
         "internet_identity_signature_count",
         "internet_identity_stable_memory_pages",
-        "internet_identity_stable_memory_bytes",
+        "stable_memory_bytes",
         "internet_identity_heap_pages",
-        "internet_identity_heap_memory_bytes",
+        "heap_memory_bytes",
         "internet_identity_last_upgrade_timestamp",
         "internet_identity_inflight_challenges",
         "internet_identity_users_in_registration_mode",