gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: record and delete bucket metrics after inactive (#6349)

Browse Source
This commit is contained in:
zouyixiong
2024-12-13 12:34:02 +08:00
committed by GitHub
parent b0210df081
commit 9987a65e8a
2 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
weed/s3api/stats.go
View File

@@ -1,12 +1,13 @@
package s3api
import (
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
stats_collect "github.com/seaweedfs/seaweedfs/weed/stats"
"github.com/seaweedfs/seaweedfs/weed/util"
"net/http"
"strconv"
"time"
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
stats_collect "github.com/seaweedfs/seaweedfs/weed/stats"
"github.com/seaweedfs/seaweedfs/weed/util"
)
func track(f http.HandlerFunc, action string) http.HandlerFunc {
@@ -25,10 +26,12 @@ func track(f http.HandlerFunc, action string) http.HandlerFunc {
}
stats_collect.S3RequestHistogram.WithLabelValues(action, bucket).Observe(time.Since(start).Seconds())
stats_collect.S3RequestCounter.WithLabelValues(action, strconv.Itoa(recorder.Status), bucket).Inc()
stats_collect.RecordBucketActiveTime(bucket)
}
}
func TimeToFirstByte(action string, start time.Time, r *http.Request) {
bucket, _ := s3_constants.GetBucketAndObject(r)
stats_collect.S3TimeToFirstByteHistogram.WithLabelValues(action, bucket).Observe(float64(time.Since(start).Milliseconds()))
stats_collect.RecordBucketActiveTime(bucket)
}