mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-22 09:35:08 -07:00
202a5ac958
* [Server] Instrument command processing, game starts, and event loops
Add a lock-free MetricsRegistry that accumulates per-command processing
times in preallocated histogram slots (one per protobuf command type,
bucketed at 1/5/10/25/50/100/250/500/1000/2500/5000 ms +Inf). The
hot-path observeCommand() uses only relaxed atomic adds — no locks,
no allocations, no cache-line ping-pong beyond the unavoidable counter
updates.
Wire the registry into AbstractServerSocketInterface::processCommandContainer()
so every processed command is attributed with its container's wall-clock
time. When a container exceeds metrics/slow_command_ms (default 500),
a warning is logged including the connected username.
Add an EventLoopWatchdog heartbeat that runs on every socket pool thread.
If a heartbeat overshoots metrics/stall_warn_ms (default 2000 ms), the
overshoot is recorded in atomic counters and a warning is logged. Both
thresholds are configurable in servatrice.ini; setting stall_warn_ms to 0
disables the watchdogs entirely.
Track game-start durations via a separate histogram in MetricsRegistry.
Server_Game::startGameNow() measures the time from zone creation through
player materialization and reports it via Server::observeGameStartDurationMs().
Add a live card-count gauge: Server_Game exposes getCardsInGame() and
Servatrice::getCardsInGamesTotal() sums across all running games under
the appropriate read locks.
Include a standalone metrics_registry_test (Google Test) that validates
empty registries, single/multi-sample histograms, kind encoding,
overflow-slot collapse, negative-duration clamping, gauge rendering,
and the game-start histogram separation.
Took 10 minutes
* [Client/Server/Protocol] Surface live metrics in the Developer tab
Extend Response_GetServerStats with live counters from the in-process
MetricsRegistry: cards in games, event loop stall totals/worst,
total commands processed, average command time, active command types,
and game-start count/duration. Add a repeated CommandStats message
carrying per-command breakdowns (kind, extension number, resolved
protobuf name, count, total ms) for every type that has seen at
least one sample.
Server-side cmdGetServerStats() populates all new fields after the
existing DB uptime snapshot query, resolving protobuf extension names
via the descriptor pool for human-readable labels like
session/Command_Ping.
Expand TabDeveloper with two tables: an overview section (existing
DB stats plus the new live metrics) and a per-command breakdown table
(Command / Count / Total ms / Avg ms) sorted by total_ms descending
so the hottest commands surface first.
Took 55 minutes
Took 47 seconds
* [Server] Drop dead Prometheus histogram, add developer command metrics, fix watchdog init order
- metrics_registry: remove toPrometheusText/appendCumulativeBuckets and the time-bucket histogram that nothing in production ever emitted (the future /metrics exporter can bring it back); keep counts/totals read by the Developer tab
- Fix +Inf bucket routing that never incremented, and its test that locked the bug in
- Instrument developer_command container (kind 6) in processCommandContainer and stats label resolution
- Read metrics/{slow_command_ms,stall_warn_ms} at the top of initServer() so stall_warn_ms=0 disables the watchdogs before pool threads start
- Shrink KindStride to 1280 (largest extension in use is 1206) with a static_assert; document scrape cost of getCardsInGamesTotal; note slow_command logging has no rate limit in servatrice.ini.example
* [Tests] Give metrics_registry_test an explicit main
* [Server] Record only the dispatched command family; drop unused totals
processCommandContainer recorded every family in a container even though
the base if/else-if dispatch processes at most one. An unauthenticated
client could batch a session command (login) with fabricated developer,
moderator, and admin entries and forge genuine-looking samples that were
never executed or authorized. Mirror the base's selection, skip when the
handler was already deleted, and skip entries whose extension number is
-1 (which would otherwise wrap into the previous kind's id range).
[Server] Drop dead process-lifetime byte/uptime counters
txBytesTotal/rxBytesTotal added an atomic RMW to every socket write and
read for counters nothing consumes (cmdGetServerStats fills tx_bytes,
rx_bytes, and uptime_secs from the DB snapshot). Remove the two atomics
and the getTxBytesTotal/getRxBytesTotal/getUptimeSeconds getters; the
incTxBytes/incRxBytes slots and mutexes remain for the ISL legacy
counters.
[Protocol] Document kind 5 as developer in CommandStats
NumKinds is 6 and the server emits kind_index = 5 for developer
commands; the comment stopped at 4.
* [Client] Togglable auto-refresh for Developer stats tab
* [Oracle] Fix clang-format alignment of card type priority list
---------
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
|
||
|---|---|---|
| .. | ||
| admin_commands.proto | ||
| card_attributes.proto | ||
| CMakeLists.txt | ||
| color.proto | ||
| command_attach_card.proto | ||
| command_change_zone_properties.proto | ||
| command_concede.proto | ||
| command_create_arrow.proto | ||
| command_create_counter.proto | ||
| command_create_token.proto | ||
| command_deck_del.proto | ||
| command_deck_del_dir.proto | ||
| command_deck_download.proto | ||
| command_deck_list.proto | ||
| command_deck_new_dir.proto | ||
| command_deck_select.proto | ||
| command_deck_upload.proto | ||
| command_del_counter.proto | ||
| command_delete_arrow.proto | ||
| command_draw_cards.proto | ||
| command_dump_zone.proto | ||
| command_flip_card.proto | ||
| command_game_say.proto | ||
| command_get_server_stats.proto | ||
| command_inc_card_counter.proto | ||
| command_inc_counter.proto | ||
| command_kick_from_game.proto | ||
| command_leave_game.proto | ||
| command_move_card.proto | ||
| command_mulligan.proto | ||
| command_next_turn.proto | ||
| command_ready_start.proto | ||
| command_replay_delete_match.proto | ||
| command_replay_download.proto | ||
| command_replay_download_by_game_id.proto | ||
| command_replay_get_code.proto | ||
| command_replay_list.proto | ||
| command_replay_modify_match.proto | ||
| command_replay_submit_code.proto | ||
| command_report.proto | ||
| command_report_add_comment.proto | ||
| command_report_assign.proto | ||
| command_report_details.proto | ||
| command_report_list.proto | ||
| command_report_my_list.proto | ||
| command_report_resolve.proto | ||
| command_report_stats.proto | ||
| command_report_user_info.proto | ||
| command_reveal_cards.proto | ||
| command_reverse_turn.proto | ||
| command_roll_die.proto | ||
| command_set_active_phase.proto | ||
| command_set_card_attr.proto | ||
| command_set_card_counter.proto | ||
| command_set_counter.proto | ||
| command_set_playmat.proto | ||
| command_set_sideboard_lock.proto | ||
| command_set_sideboard_plan.proto | ||
| command_shuffle.proto | ||
| command_undo_draw.proto | ||
| commands.proto | ||
| context_concede.proto | ||
| context_connection_state_changed.proto | ||
| context_deck_select.proto | ||
| context_move_card.proto | ||
| context_mulligan.proto | ||
| context_ping_changed.proto | ||
| context_ready_start.proto | ||
| context_set_sideboard_lock.proto | ||
| context_undo_draw.proto | ||
| developer_commands.proto | ||
| event_add_to_list.proto | ||
| event_attach_card.proto | ||
| event_change_zone_properties.proto | ||
| event_connection_closed.proto | ||
| event_create_arrow.proto | ||
| event_create_counter.proto | ||
| event_create_token.proto | ||
| event_del_counter.proto | ||
| event_delete_arrow.proto | ||
| event_destroy_card.proto | ||
| event_draw_cards.proto | ||
| event_dump_zone.proto | ||
| event_flip_card.proto | ||
| event_game_closed.proto | ||
| event_game_host_changed.proto | ||
| event_game_joined.proto | ||
| event_game_log_notice.proto | ||
| event_game_say.proto | ||
| event_game_state_changed.proto | ||
| event_join.proto | ||
| event_join_room.proto | ||
| event_kicked.proto | ||
| event_leave.proto | ||
| event_leave_room.proto | ||
| event_list_games.proto | ||
| event_list_rooms.proto | ||
| event_move_card.proto | ||
| event_notify_user.proto | ||
| event_player_properties_changed.proto | ||
| event_remove_from_list.proto | ||
| event_remove_messages.proto | ||
| event_replay_added.proto | ||
| event_reveal_cards.proto | ||
| event_reverse_turn.proto | ||
| event_roll_die.proto | ||
| event_room_say.proto | ||
| event_server_complete_list.proto | ||
| event_server_identification.proto | ||
| event_server_message.proto | ||
| event_server_shutdown.proto | ||
| event_set_active_phase.proto | ||
| event_set_active_player.proto | ||
| event_set_card_attr.proto | ||
| event_set_card_counter.proto | ||
| event_set_counter.proto | ||
| event_shuffle.proto | ||
| event_user_joined.proto | ||
| event_user_left.proto | ||
| event_user_message.proto | ||
| game_commands.proto | ||
| game_event.proto | ||
| game_event_container.proto | ||
| game_event_context.proto | ||
| game_replay.proto | ||
| isl_message.proto | ||
| moderator_commands.proto | ||
| move_card_to_zone.proto | ||
| response.proto | ||
| response_activate.proto | ||
| response_adjust_mod.proto | ||
| response_ban_history.proto | ||
| response_card_art_rule_entry.proto | ||
| response_deck_download.proto | ||
| response_deck_list.proto | ||
| response_deck_upload.proto | ||
| response_dump_zone.proto | ||
| response_forgotpasswordrequest.proto | ||
| response_get_admin_notes.proto | ||
| response_get_games_of_user.proto | ||
| response_get_server_stats.proto | ||
| response_get_user_info.proto | ||
| response_join_room.proto | ||
| response_list_users.proto | ||
| response_login.proto | ||
| response_moderator_last_logins.proto | ||
| response_password_salt.proto | ||
| response_register.proto | ||
| response_remove_user_avatar.proto | ||
| response_replay_download.proto | ||
| response_replay_download_by_game_id.proto | ||
| response_replay_get_code.proto | ||
| response_replay_list.proto | ||
| response_report_details.proto | ||
| response_report_list.proto | ||
| response_report_my_list.proto | ||
| response_report_stats.proto | ||
| response_report_user_info.proto | ||
| response_reset_user_password.proto | ||
| response_user_alts.proto | ||
| response_user_sessions.proto | ||
| response_viewlog_history.proto | ||
| response_warn_history.proto | ||
| response_warn_list.proto | ||
| room_commands.proto | ||
| room_event.proto | ||
| server_message.proto | ||
| serverinfo_arrow.proto | ||
| serverinfo_ban.proto | ||
| serverinfo_card.proto | ||
| serverinfo_cardcounter.proto | ||
| serverinfo_chat_message.proto | ||
| serverinfo_counter.proto | ||
| serverinfo_deckstorage.proto | ||
| serverinfo_game.proto | ||
| serverinfo_gametype.proto | ||
| serverinfo_moderator_login.proto | ||
| serverinfo_player.proto | ||
| serverinfo_playerping.proto | ||
| serverinfo_playerproperties.proto | ||
| serverinfo_replay.proto | ||
| serverinfo_replay_match.proto | ||
| serverinfo_report.proto | ||
| serverinfo_room.proto | ||
| serverinfo_user.proto | ||
| serverinfo_user_alt.proto | ||
| serverinfo_user_session.proto | ||
| serverinfo_warning.proto | ||
| serverinfo_zone.proto | ||
| session_commands.proto | ||
| session_event.proto | ||