diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-30 18:12:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-30 18:12:04 +0300 |
| commit | 93501e7509fb61b25f091d81381d3e86842a9cdd (patch) | |
| tree | e11e5528450c3e3815f59c13d8799722d8d754c1 /workhorse | |
| parent | bfa1adf9773ba7ea7cde546ea545b72721d36faa (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse')
| -rw-r--r-- | workhorse/.tool-versions | 2 | ||||
| -rw-r--r-- | workhorse/internal/httprs/httprs.go | 1 | ||||
| -rw-r--r-- | workhorse/internal/queueing/queue.go | 5 | ||||
| -rw-r--r-- | workhorse/internal/queueing/requests.go | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/workhorse/.tool-versions b/workhorse/.tool-versions index 18a7cdea814..0c4422a9db4 100644 --- a/workhorse/.tool-versions +++ b/workhorse/.tool-versions @@ -1 +1 @@ -golang 1.18.9 +golang 1.19.7 diff --git a/workhorse/internal/httprs/httprs.go b/workhorse/internal/httprs/httprs.go index f7767d2ee28..811a50035f3 100644 --- a/workhorse/internal/httprs/httprs.go +++ b/workhorse/internal/httprs/httprs.go @@ -11,6 +11,7 @@ Usage : io.ReadFull(rs, buf) // does a range request and reads from the response body If you want use a specific http.Client for additional range requests : + rs := httprs.NewHttpReadSeeker(resp, client) */ package httprs diff --git a/workhorse/internal/queueing/queue.go b/workhorse/internal/queueing/queue.go index c8d32280355..266f8897450 100644 --- a/workhorse/internal/queueing/queue.go +++ b/workhorse/internal/queueing/queue.go @@ -27,8 +27,9 @@ type queueMetrics struct { // newQueueMetrics prepares Prometheus metrics for queueing mechanism // name specifies name of the queue, used to label metrics with ConstLabel `queue_name` // timeout specifies the timeout of storing a request in queue - queueMetrics -// uses it to calculate histogram buckets for gitlab_workhorse_queueing_waiting_time -// metric +// +// uses it to calculate histogram buckets for gitlab_workhorse_queueing_waiting_time +// metric func newQueueMetrics(name string, timeout time.Duration, reg prometheus.Registerer) *queueMetrics { waitingTimeBuckets := []float64{ timeout.Seconds() * 0.01, diff --git a/workhorse/internal/queueing/requests.go b/workhorse/internal/queueing/requests.go index c3df614de41..a6ca98a674a 100644 --- a/workhorse/internal/queueing/requests.go +++ b/workhorse/internal/queueing/requests.go @@ -16,7 +16,9 @@ const ( // QueueRequests creates a new request queue // name specifies the name of queue, used to label Prometheus metrics -// Don't call QueueRequests twice with the same name argument! +// +// Don't call QueueRequests twice with the same name argument! +// // h specifies a http.Handler which will handle the queue requests // limit specifies number of requests run concurrently // queueLimit specifies maximum number of requests that can be queued |