Browse Source

Merge pull request #1502 from kmlebedev/s3_stat_statuscode

add status code in S3RequestCounter
pull/1508/head
Chris Lu 4 years ago
committed by GitHub
parent
commit
ed170d8fe6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 27
      weed/s3api/stats.go
  2. 4
      weed/stats/metrics.go

27
weed/s3api/stats.go

@ -4,18 +4,35 @@ import (
stats_collect "github.com/chrislusf/seaweedfs/weed/stats" stats_collect "github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"net/http" "net/http"
"strconv"
"time" "time"
) )
func track(f http.HandlerFunc, action string) http.HandlerFunc {
type StatusRecorder struct {
http.ResponseWriter
Status int
}
return func(w http.ResponseWriter, r *http.Request) {
func NewStatusResponseWriter(w http.ResponseWriter) *StatusRecorder {
return &StatusRecorder{w, http.StatusOK}
}
w.Header().Set("Server", "SeaweedFS S3 "+util.VERSION)
func (r *StatusRecorder) WriteHeader(status int) {
r.Status = status
r.ResponseWriter.WriteHeader(status)
}
func (r *StatusRecorder) Flush() {
r.ResponseWriter.(http.Flusher).Flush()
}
func track(f http.HandlerFunc, action string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Server", "SeaweedFS S3 "+util.VERSION)
recorder := NewStatusResponseWriter(w)
start := time.Now() start := time.Now()
stats_collect.S3RequestCounter.WithLabelValues(action).Inc()
f(w, r)
f(recorder, r)
stats_collect.S3RequestHistogram.WithLabelValues(action).Observe(time.Since(start).Seconds()) stats_collect.S3RequestHistogram.WithLabelValues(action).Observe(time.Since(start).Seconds())
stats_collect.S3RequestCounter.WithLabelValues(action, strconv.Itoa(recorder.Status)).Inc()
} }
} }

4
weed/stats/metrics.go

@ -16,7 +16,7 @@ import (
) )
var ( var (
Gather = prometheus.NewRegistry()
Gather = prometheus.NewRegistry()
FilerRequestCounter = prometheus.NewCounterVec( FilerRequestCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{ prometheus.CounterOpts{
@ -99,7 +99,7 @@ var (
Subsystem: "s3", Subsystem: "s3",
Name: "request_total", Name: "request_total",
Help: "Counter of s3 requests.", Help: "Counter of s3 requests.",
}, []string{"type"})
}, []string{"type", "statusCode"})
S3RequestHistogram = prometheus.NewHistogramVec( S3RequestHistogram = prometheus.NewHistogramVec(
prometheus.HistogramOpts{ prometheus.HistogramOpts{
Namespace: "SeaweedFS", Namespace: "SeaweedFS",

Loading…
Cancel
Save