Merge pull request #4135 from wireapp/release_2024-07-09_15_11

Release 2024-07-09 - (expected chart version 5.5.0)
wireapp · Jul 9, 2024 · 63d78de · 63d78de
2 parents 7bd6faf + 5cecea3
commit 63d78de
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# [2024-07-09] (Chart Release 5.5.0)
+
+## Bug fixes and other updates
+
+
+* Fix names of metrics so they do not contain any dots (#4134)
+
+
 # [2024-07-08] (Chart Release 5.4.0)
 
 ## Release notes

diff --git a/libs/metrics-core/src/Data/Metrics/AWS.hs b/libs/metrics-core/src/Data/Metrics/AWS.hs
@@ -34,6 +34,6 @@ awsAuthTokenSecsRemaining =
   Prom.unsafeRegister $
     Prom.gauge
       Prom.Info
-        { Prom.metricName = "aws_auth.token_secs_remaining",
+        { Prom.metricName = "aws_auth_token_secs_remaining",
           Prom.metricHelp = "Number of seconds left before AWS Auth expires"
         }
diff --git a/libs/wai-utilities/src/Network/Wai/Utilities/Server.hs b/libs/wai-utilities/src/Network/Wai/Utilities/Server.hs
@@ -126,7 +126,7 @@ netConnections =
   Prom.unsafeRegister $
     Prom.gauge
       Prom.Info
-        { Prom.metricName = "net.connections",
+        { Prom.metricName = "net_connections",
           Prom.metricHelp = "Number of active connections"
         }
 
@@ -412,7 +412,7 @@ netErrors =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "net.errors",
+        { Prom.metricName = "net_errors",
           Prom.metricHelp = "Number of exceptions caught by catchErrors middleware"
         }
 

diff --git a/services/brig/src/Brig/API/User.hs b/services/brig/src/Brig/API/User.hs
@@ -1141,7 +1141,7 @@ enqueueMultiDeleteCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "user.enqueue_multi_delete_total",
+        { Prom.metricName = "user_enqueue_multi_delete_total",
           Prom.metricHelp = "Number of users enqueued to be deleted"
         }
 
@@ -1151,7 +1151,7 @@ enqueueMultiDeleteCallsCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "user.enqueue_multi_delete_calls_total",
+        { Prom.metricName = "user_enqueue_multi_delete_calls_total",
           Prom.metricHelp = "Number of users enqueued to be deleted"
         }
 

diff --git a/services/brig/src/Brig/Data/Client.hs b/services/brig/src/Brig/Data/Client.hs
@@ -592,7 +592,7 @@ optimisticLockGrabAttemptFailedCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "client.opt_lock.optimistic_lock_grab_attempt_failed",
+        { Prom.metricName = "client_opt_lock_optimistic_lock_grab_attempt_failed",
           Prom.metricHelp = "Number of times grab attempts for optimisitic lock on prekeys failed"
         }
 
@@ -602,7 +602,7 @@ optimisticLockFailedCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "client.opt_lock.optimistic_lock_failed",
+        { Prom.metricName = "client_opt_lock_optimistic_lock_failed",
           Prom.metricHelp = "Number of time optimisitic lock on prekeys failed"
         }
 
@@ -612,6 +612,6 @@ dynProvisionedThroughputExceededCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "client.opt_lock.provisioned_throughput_exceeded",
+        { Prom.metricName = "client_opt_lock_provisioned_throughput_exceeded",
           Prom.metricHelp = "Number of times provisioned throughput on DynamoDB was exceeded"
         }
diff --git a/services/brig/src/Brig/User/Auth/Cookie.hs b/services/brig/src/Brig/User/Auth/Cookie.hs
@@ -306,6 +306,6 @@ cookieSupersededCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "user.auth.cookie.superseded",
+        { Prom.metricName = "user_auth_cookie_superseded",
           Prom.metricHelp = "Number of times user's cookie got superseded"
         }
diff --git a/services/brig/src/Brig/User/Search/Index.hs b/services/brig/src/Brig/User/Search/Index.hs
@@ -976,7 +976,7 @@ indexUpdateCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "user.index.update.count",
+        { Prom.metricName = "user_index_update_count",
           Prom.metricHelp = "Number of updates on user index"
         }
 
@@ -986,7 +986,7 @@ indexUpdateErrorCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "user.index.update.err",
+        { Prom.metricName = "user_index_update_err",
           Prom.metricHelp = "Number of errors during user index update"
         }
 
@@ -996,7 +996,7 @@ indexUpdateSuccessCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "user.index.update.ok",
+        { Prom.metricName = "user_index_update_ok",
           Prom.metricHelp = "Number of successful user index updates"
         }
 
@@ -1006,7 +1006,7 @@ indexBulkUpdateCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "user.index.update.bulk.count",
+        { Prom.metricName = "user_index_update_bulk_count",
           Prom.metricHelp = "Number of bulk updates on user index"
         }
 
@@ -1016,7 +1016,7 @@ indexBulkUpdateErrorCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "user.index.update.bulk.err",
+        { Prom.metricName = "user_index_update_bulk_err",
           Prom.metricHelp = "Number of errors during bulk updates on user index"
         }
 
@@ -1026,7 +1026,7 @@ indexBulkUpdateSuccessCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "user.index.update.bulk.ok",
+        { Prom.metricName = "user_index_update_bulk_ok",
           Prom.metricHelp = "Number of successful bulk updates on user index"
         }
 
@@ -1037,7 +1037,7 @@ indexBulkUpdateResponseCounter =
     Prom.vector ("status") $
       Prom.counter
         Prom.Info
-          { Prom.metricName = "user.index.update.bulk.response",
+          { Prom.metricName = "user_index_update_bulk_response",
             Prom.metricHelp = "Number of successful bulk updates on user index"
           }
 
@@ -1047,6 +1047,6 @@ indexDeleteCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "user.index.delete.count",
+        { Prom.metricName = "user_index_delete_count",
           Prom.metricHelp = "Number of deletes on user index"
         }
diff --git a/services/cannon/src/Cannon/Run.hs b/services/cannon/src/Cannon/Run.hs
@@ -151,6 +151,6 @@ websocketClientsGauge =
   Prom.unsafeRegister $
     Prom.gauge
       Prom.Info
-        { Prom.metricName = "net.websocket.clients",
+        { Prom.metricName = "net_websocket_clients",
           Prom.metricHelp = "Number of connected websocket clients"
         }
diff --git a/services/cargohold/src/CargoHold/Metrics.hs b/services/cargohold/src/CargoHold/Metrics.hs
@@ -29,7 +29,7 @@ netS3UploadOk =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "net.s3.upload_ok",
+        { Prom.metricName = "net_s3_upload_ok",
           Prom.metricHelp = "Number of successful S3 Uploads"
         }
 
@@ -43,6 +43,6 @@ netS3UploadSize =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "net.s3.upload_size",
+        { Prom.metricName = "net_s3_upload_size",
           Prom.metricHelp = "Number of bytes uploaded successfully uploaded to S3"
         }
diff --git a/services/galley/src/Galley/Run.hs b/services/galley/src/Galley/Run.hs
@@ -188,7 +188,7 @@ deleteQueueLengthGauge =
   Prom.unsafeRegister $
     Prom.gauge
       Prom.Info
-        { Prom.metricName = "galley.deletequeue.len",
+        { Prom.metricName = "galley_deletequeue_len",
           Prom.metricHelp = "Length of the galley delete queue"
         }
 

diff --git a/services/gundeck/src/Gundeck/Push/Native.hs b/services/gundeck/src/Gundeck/Push/Native.hs
@@ -66,7 +66,7 @@ nativePushSuccessCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "push.native.success",
+        { Prom.metricName = "push_native_success",
           Prom.metricHelp = "Number of times native pushes were successfully pushed"
         }
 
@@ -76,7 +76,7 @@ nativePushDisabledCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "push.native.disabled",
+        { Prom.metricName = "push_native_disabled",
           Prom.metricHelp = "Number of times native pushes were not pushed due to a disabled endpoint"
         }
 
@@ -86,7 +86,7 @@ nativePushInvalidCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "push.native.invalid",
+        { Prom.metricName = "push_native_invalid",
           Prom.metricHelp = "Number of times native pushes were not pushed due to an invalid endpoint"
         }
 
@@ -96,7 +96,7 @@ nativePushTooLargeCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "push.native.too_large",
+        { Prom.metricName = "push_native_too_large",
           Prom.metricHelp = "Number of times native pushes were not pushed due to payload being too large"
         }
 
@@ -106,7 +106,7 @@ nativePushUnauthorizedCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "push.native.unauthorized",
+        { Prom.metricName = "push_native_unauthorized",
           Prom.metricHelp = "Number of times native pushes were not pushed due to an unauthorized endpoint"
         }
 
@@ -116,7 +116,7 @@ nativePushErrorCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "push.native.errors",
+        { Prom.metricName = "push_native_errors",
           Prom.metricHelp = "Number of times native pushes were not pushed due to an unexpected error"
         }
 

diff --git a/services/gundeck/src/Gundeck/Push/Websocket.hs b/services/gundeck/src/Gundeck/Push/Websocket.hs
@@ -113,7 +113,7 @@ pushWsUnreachableCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "push.ws.unreachable",
+        { Prom.metricName = "push_ws_unreachable",
           Prom.metricHelp = "Number of times websocket pushes were not pushed due cannon being unreachable"
         }
 

diff --git a/services/gundeck/src/Gundeck/ThreadBudget/Internal.hs b/services/gundeck/src/Gundeck/ThreadBudget/Internal.hs
@@ -209,7 +209,7 @@ threadBudgetAllocatedGauge =
   Prom.unsafeRegister $
     Prom.gauge
       Prom.Info
-        { Prom.metricName = "net.nativepush.thread_budget_allocated",
+        { Prom.metricName = "net_nativepush_thread_budget_allocated",
           Prom.metricHelp = "Number of allocated threads for native pushes"
         }
 
@@ -219,7 +219,7 @@ threadBudgetHardLimitGauge =
   Prom.unsafeRegister $
     Prom.gauge
       Prom.Info
-        { Prom.metricName = "net.nativepush.thread_budget_hard_limit",
+        { Prom.metricName = "net_nativepush_thread_budget_hard_limit",
           Prom.metricHelp = "Hard limit for threads for native pushes"
         }
 
@@ -229,7 +229,7 @@ threadBudgetSoftLimitGauge =
   Prom.unsafeRegister $
     Prom.gauge
       Prom.Info
-        { Prom.metricName = "net.nativepush.thread_budget_soft_limit",
+        { Prom.metricName = "net_nativepush_thread_budget_soft_limit",
           Prom.metricHelp = "Soft limit for threads for native pushes"
         }
 
@@ -239,7 +239,7 @@ threadBudgetHardLimitBreachedCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "net.nativepush.thread_budget_hard_limit_breached",
+        { Prom.metricName = "net_nativepush_thread_budget_hard_limit_breached",
           Prom.metricHelp = "Number of times hard limit for threads for native pushes was breached"
         }
 
@@ -249,7 +249,7 @@ threadBudgetSoftLimitBreachedCounter =
   Prom.unsafeRegister $
     Prom.counter
       Prom.Info
-        { Prom.metricName = "net.nativepush.thread_budget_soft_limit_breached",
+        { Prom.metricName = "net_nativepush_thread_budget_soft_limit_breached",
           Prom.metricHelp = "Number of times soft limit for threads for native pushes was breached"
         }