-
Notifications
You must be signed in to change notification settings - Fork 510
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Consolidate backend metrics and add hedged request metric (#790)
* Consolidate backend metrics, add heged metric * Update changelog * Add deprecated message to older metrics
- Loading branch information
1 parent
3efc8ca
commit f542976
Showing
13 changed files
with
273 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package instrumentation | ||
|
|
||
| import ( | ||
| "net/http" | ||
| "strconv" | ||
| "time" | ||
|
|
||
| "github.com/prometheus/client_golang/prometheus" | ||
| "github.com/prometheus/client_golang/prometheus/promauto" | ||
| ) | ||
|
|
||
| var ( | ||
| gcsRequestDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ | ||
| Namespace: "tempodb", | ||
| Name: "gcs_request_duration_seconds", | ||
| Help: "Time spent doing GCS requests. (DEPRECATED: See tempodb_backend_request_duration_seconds)", | ||
| Buckets: prometheus.ExponentialBuckets(0.005, 4, 6), | ||
| }, []string{"operation", "status_code"}) | ||
|
|
||
| s3RequestDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ | ||
| Namespace: "tempodb", | ||
| Name: "s3_request_duration_seconds", | ||
| Help: "Time spent doing AWS S3 requests. (DEPRECATED: See tempodb_backend_request_duration_seconds)", | ||
| Buckets: prometheus.ExponentialBuckets(0.005, 4, 6), | ||
| }, []string{"operation", "status_code"}) | ||
|
|
||
| azureRequestDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ | ||
| Namespace: "tempodb", | ||
| Name: "azure_request_duration_seconds", | ||
| Help: "Time spent doing Azure requests. (DEPRECATED: See tempodb_backend_request_duration_seconds)", | ||
| Buckets: prometheus.ExponentialBuckets(0.005, 4, 6), | ||
| }, []string{"operation", "status_code"}) | ||
|
|
||
| requestDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ | ||
| Namespace: "tempodb", | ||
| Name: "backend_request_duration_seconds", | ||
| Help: "Time spent doing backend storage requests.", | ||
| Buckets: prometheus.ExponentialBuckets(0.005, 4, 6), | ||
| }, []string{"operation", "status_code"}) | ||
| ) | ||
|
|
||
| type instrumentedTransport struct { | ||
| legacyObserver prometheus.ObserverVec | ||
| observer prometheus.ObserverVec | ||
| next http.RoundTripper | ||
| } | ||
|
|
||
| func NewGCSTransport(next http.RoundTripper) http.RoundTripper { | ||
| return instrumentedTransport{ | ||
| next: next, | ||
| observer: requestDuration, | ||
| legacyObserver: gcsRequestDuration, | ||
| } | ||
| } | ||
|
|
||
| func NewS3Transport(next http.RoundTripper) http.RoundTripper { | ||
| return instrumentedTransport{ | ||
| next: next, | ||
| observer: requestDuration, | ||
| legacyObserver: s3RequestDuration, | ||
| } | ||
| } | ||
|
|
||
| func NewAzureTransport(next http.RoundTripper) http.RoundTripper { | ||
| return instrumentedTransport{ | ||
| next: next, | ||
| observer: requestDuration, | ||
| legacyObserver: azureRequestDuration, | ||
| } | ||
| } | ||
|
|
||
| func (i instrumentedTransport) RoundTrip(req *http.Request) (*http.Response, error) { | ||
| start := time.Now() | ||
| resp, err := i.next.RoundTrip(req) | ||
| if err == nil { | ||
| i.legacyObserver.WithLabelValues(req.Method, strconv.Itoa(resp.StatusCode)).Observe(time.Since(start).Seconds()) | ||
| i.observer.WithLabelValues(req.Method, strconv.Itoa(resp.StatusCode)).Observe(time.Since(start).Seconds()) | ||
| } | ||
| return resp, err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package instrumentation | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/cristalhq/hedgedhttp" | ||
| "github.com/prometheus/client_golang/prometheus" | ||
| "github.com/prometheus/client_golang/prometheus/promauto" | ||
| ) | ||
|
|
||
| const ( | ||
| hedgedMetricsPublishDuration = 10 * time.Second | ||
| ) | ||
|
|
||
| var ( | ||
| hedgedRequestsMetrics = promauto.NewCounter( | ||
| prometheus.CounterOpts{ | ||
| Namespace: "tempodb", | ||
| Name: "backend_hedged_roundtrips_total", | ||
| Help: "Total number of hedged backend requests", | ||
| }, | ||
| ) | ||
| ) | ||
|
|
||
| // PublishHedgedMetrics flushes metrics from hedged requests every 10 seconds | ||
| func PublishHedgedMetrics(s *hedgedhttp.Stats) { | ||
| ticker := time.NewTicker(hedgedMetricsPublishDuration) | ||
| go func() { | ||
| for range ticker.C { | ||
| hedgedRequestsMetrics.Add(float64(s.Snapshot().RequestedRoundTrips)) | ||
| } | ||
| }() | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.