Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion libs/metrics-core/src/Data/Metrics/AWS.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions libs/wai-utilities/src/Network/Wai/Utilities/Server.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -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"
}

Expand Down
4 changes: 2 additions & 2 deletions services/brig/src/Brig/API/User.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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"
}

Expand Down
6 changes: 3 additions & 3 deletions services/brig/src/Brig/Data/Client.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}
2 changes: 1 addition & 1 deletion services/brig/src/Brig/User/Auth/Cookie.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
16 changes: 8 additions & 8 deletions services/brig/src/Brig/User/Search/Index.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}
2 changes: 1 addition & 1 deletion services/cannon/src/Cannon/Run.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions services/cargohold/src/CargoHold/Metrics.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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"
}
2 changes: 1 addition & 1 deletion services/galley/src/Galley/Run.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
12 changes: 6 additions & 6 deletions services/gundeck/src/Gundeck/Push/Native.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand Down
2 changes: 1 addition & 1 deletion services/gundeck/src/Gundeck/Push/Websocket.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
10 changes: 5 additions & 5 deletions services/gundeck/src/Gundeck/ThreadBudget/Internal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand All @@ -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"
}

Expand Down