Skip to content

Fix Sidekiq JSON logging

Sean McGivern requested to merge fix-sidekiq-json-logging into master

What does this MR do and why?

The 'Listening on queues' message was logged before we set the log format (if enabled) to JSON, so it would never be in JSON. We can just move it to later to ensure that it uses the correct format.

For #355568 (closed).

How to set up and validate locally

Before this change:

$ bin/sidekiq-cluster --queue-selector 'feature_category=source_code_management' | head -n 2
{"severity":"INFO","time":"2022-03-14T14:11:09.136Z","message":"Starting cluster with 1 processes"}
2022-03-14T14:11:17.197Z pid=297563 tid=6p7b INFO: Listening on queues ["approval_rules_external_approval_rule_payload", "authorized_keys", "create_commit_signature", "cronjob:admin_email", "cronjob:authorized_project_update_periodic_recalculate", "cronjob:namespaces_prune_aggregation_schedules", "cronjob:repository_archive_cache", "cronjob:repository_check_dispatch", "cronjob:requests_profiles", "cronjob:trending_projects", "cronjob:update_all_mirrors", "cronjob:x509_issuer_crl_check", "delete_merged_branches", "detect_repository_languages", "emails_on_push", "gitlab_shell", "groups_update_statistics", "hashed_storage:hashed_storage_migrator", "hashed_storage:hashed_storage_project_migrate", "hashed_storage:hashed_storage_project_rollback", "hashed_storage:hashed_storage_rollbacker", "invalid_gpg_signature_update", "merge", "merge_request_reset_approvals", "merge_requests_delete_source_branch", "merge_requests_sync_code_owner_approval_rules", "namespaces_update_root_statistics", "post_receive", "process_commit", "project_cache", "project_daily_statistics", "project_destroy", "project_import_schedule", "projects_post_creation", "rebase", "remote_mirror_notification", "repository_check:repository_check_batch", "repository_check:repository_check_clear", "repository_check:repository_check_single_repository", "repository_cleanup", "repository_fork", "repository_remove_remote", "repository_update_mirror", "repository_update_remote_mirror", "system_hook_push", "update_namespace_statistics:namespaces_root_statistics", "update_namespace_statistics:namespaces_schedule_aggregation", "update_project_statistics", "x509_certificate_revoke"]

After this change:

$ bin/sidekiq-cluster --queue-selector 'feature_category=source_code_management' | head -n 2
{"severity":"INFO","time":"2022-03-14T14:15:21.077Z","message":"Starting cluster with 1 processes"}
{"severity":"INFO","time":"2022-03-14T14:15:31.573Z","message":"Listening on queues [\"approval_rules_external_approval_rule_payload\", \"authorized_keys\", \"create_commit_signature\", \"cronjob:admin_email\", \"cronjob:authorized_project_update_periodic_recalculate\", \"cronjob:namespaces_prune_aggregation_schedules\", \"cronjob:repository_archive_cache\", \"cronjob:repository_check_dispatch\", \"cronjob:requests_profiles\", \"cronjob:trending_projects\", \"cronjob:update_all_mirrors\", \"cronjob:x509_issuer_crl_check\", \"delete_merged_branches\", \"detect_repository_languages\", \"emails_on_push\", \"gitlab_shell\", \"groups_update_statistics\", \"hashed_storage:hashed_storage_migrator\", \"hashed_storage:hashed_storage_project_migrate\", \"hashed_storage:hashed_storage_project_rollback\", \"hashed_storage:hashed_storage_rollbacker\", \"invalid_gpg_signature_update\", \"merge\", \"merge_request_reset_approvals\", \"merge_requests_delete_source_branch\", \"merge_requests_sync_code_owner_approval_rules\", \"namespaces_update_root_statistics\", \"post_receive\", \"process_commit\", \"project_cache\", \"project_daily_statistics\", \"project_destroy\", \"project_import_schedule\", \"projects_post_creation\", \"rebase\", \"remote_mirror_notification\", \"repository_check:repository_check_batch\", \"repository_check:repository_check_clear\", \"repository_check:repository_check_single_repository\", \"repository_cleanup\", \"repository_fork\", \"repository_remove_remote\", \"repository_update_mirror\", \"repository_update_remote_mirror\", \"system_hook_push\", \"update_namespace_statistics:namespaces_root_statistics\", \"update_namespace_statistics:namespaces_schedule_aggregation\", \"update_project_statistics\", \"x509_certificate_revoke\"]"}

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Sean McGivern

Merge request reports

Loading