diff options
| author | Will Chandler <wchandler@gitlab.com> | 2023-06-27 19:08:37 +0300 |
|---|---|---|
| committer | Will Chandler <wchandler@gitlab.com> | 2023-06-27 19:08:37 +0300 |
| commit | d212e45fda0b7688f8b2297b51453df3ad529c33 (patch) | |
| tree | a6d9aa8909edfc2eb1a3eb5d0f195f4c48c0ff0e | |
| parent | 102e79c5a0d30882cf5185b1b760edaed307afb9 (diff) | |
| parent | 8fc6b82a7b9f91d873d07ed48054de035821b1f5 (diff) | |
Merge branch '5319-confidential-issue' into 'master'
Fix Praefect crashing with SIGSEGV
Closes #5319
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5972
Merged-by: Will Chandler <wchandler@gitlab.com>
Approved-by: Will Chandler <wchandler@gitlab.com>
Reviewed-by: Will Chandler <wchandler@gitlab.com>
Co-authored-by: Gerardo <ggutierrez@gitlab.com>
| -rw-r--r-- | internal/praefect/datastore/collector.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/internal/praefect/datastore/collector.go b/internal/praefect/datastore/collector.go index 967700b70..5a33744b1 100644 --- a/internal/praefect/datastore/collector.go +++ b/internal/praefect/datastore/collector.go @@ -118,6 +118,7 @@ func (q *QueueDepthCollector) Describe(ch chan<- *prometheus.Desc) { // NewQueueDepthCollector returns a new QueueDepthCollector func NewQueueDepthCollector(log logrus.FieldLogger, db glsql.Querier, timeout time.Duration) *QueueDepthCollector { return &QueueDepthCollector{ + log: log.WithField("component", "queue_depth_collector"), timeout: timeout, db: db, } |