LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s3store: Do not register metrics to default registry

This commit is contained in:
Marius 2021-05-24 23:45:54 +02:00
parent 0f24a80ea5
commit f4314dd360
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/tusd/cli/composer.go
View File

@ -5,6 +5,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/prometheus/client_golang/prometheus"
"github.com/tus/tusd/pkg/filelocker" "github.com/tus/tusd/pkg/filelocker"
"github.com/tus/tusd/pkg/filestore" "github.com/tus/tusd/pkg/filestore"
"github.com/tus/tusd/pkg/gcsstore" "github.com/tus/tusd/pkg/gcsstore"
@ -64,6 +65,10 @@ func CreateComposer() {
locker := memorylocker.New() locker := memorylocker.New()
locker.UseIn(Composer) locker.UseIn(Composer)
// Attach the metrics from S3 store to the global Prometheus registry
// TODO: Do not use the global registry here.
store.RegisterMetrics(prometheus.DefaultRegisterer)
} else if Flags.GCSBucket != "" { } else if Flags.GCSBucket != "" {
if Flags.GCSObjectPrefix != "" && strings.Contains(Flags.GCSObjectPrefix, "_") { if Flags.GCSObjectPrefix != "" && strings.Contains(Flags.GCSObjectPrefix, "_") {
stderr.Fatalf("gcs-object-prefix value (%s) can't contain underscore. "+ stderr.Fatalf("gcs-object-prefix value (%s) can't contain underscore. "+

6
pkg/s3store/s3store.go
View File

@ -207,8 +207,6 @@ func New(bucket string, service S3API) S3Store {
Help: "Duration of requests sent to S3 in milliseconds per operation", Help: "Duration of requests sent to S3 in milliseconds per operation",
Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001}, Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
}, []string{"operation"}) }, []string{"operation"})
// TODO: Do not register them globally but to a specific prometheus handler
prometheus.MustRegister(requestDurationMetric)
return S3Store{ return S3Store{
Bucket: bucket, Bucket: bucket,
@ -239,6 +237,10 @@ func (store S3Store) UseIn(composer *handler.StoreComposer) {
composer.UseLengthDeferrer(store) composer.UseLengthDeferrer(store)
} }
func (store S3Store) RegisterMetrics(registry prometheus.Registerer) {
registry.MustRegister(store.requestDurationMetric)
}
func (store S3Store) observeRequestDuration(start time.Time, label string) { func (store S3Store) observeRequestDuration(start time.Time, label string) {
elapsed := time.Now().Sub(start) elapsed := time.Now().Sub(start)
ms := float64(elapsed.Nanoseconds() / int64(time.Millisecond)) ms := float64(elapsed.Nanoseconds() / int64(time.Millisecond))