Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update weaveworks/common for histogram buckets and logging changes #1669

Closed
wants to merge 2 commits into from
Closed

Update weaveworks/common for histogram buckets and logging changes #1669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a07ff8e
Extend default histogram buckets up to 100 seconds
bboreham Jan 5, 2018
608b348
Update weaveworks/common for buckets and error-logging changes
bboreham Jan 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions common/monitoring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package common

import (
"github.com/prometheus/client_golang/prometheus"
"github.com/weaveworks/common/instrument"
)

const (
Expand All @@ -15,14 +16,14 @@ var (
Namespace: PrometheusNamespace,
Name: "request_duration_seconds",
Help: "Time (in seconds) spent serving HTTP requests.",
Buckets: prometheus.DefBuckets,
Buckets: instrument.DefBuckets,
}, []string{"method", "route", "status_code", "ws"})

// DatabaseRequestDuration is our standard database histogram vector.
DatabaseRequestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{
Namespace: PrometheusNamespace,
Name: "database_request_duration_seconds",
Help: "Time spent (in seconds) doing database requests.",
Buckets: prometheus.DefBuckets,
Buckets: instrument.DefBuckets,
}, []string{"method", "status_code"})
)
2 changes: 1 addition & 1 deletion users/api/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ var ServiceStatusRequestDuration = prometheus.NewHistogramVec(prometheus.Histogr
Namespace: "users",
Name: "get_service_status_request_duration_seconds",
Help: "Time spent (in seconds) doing service status requests.",
Buckets: prometheus.DefBuckets,
Buckets: instrument.DefBuckets,
}, []string{"service_name", "status_code"})

func errorCode(err error) string {
Expand Down
4 changes: 4 additions & 0 deletions vendor/github.com/weaveworks/common/instrument/instrument.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion vendor/github.com/weaveworks/common/server/server.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.