github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-03 00:38:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

update:Use the Milliseconds method of duration to get the number of milliseconds (#3285)

Browse Source 
Co-authored-by: Kevin Wan <wanjunfeng@gmail.com>
This commit is contained in:
me-cs 2023-05-26 22:32:46 +08:00 committed by GitHub
parent 8b4382dcec
commit 0217044900
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/stores/redis/hook.go
View File

@ -56,7 +56,7 @@ func (h hook) AfterProcess(ctx context.Context, cmd red.Cmder) error {
logDuration(ctx, []red.Cmder{cmd}, duration) logDuration(ctx, []red.Cmder{cmd}, duration)
} }
metricReqDur.Observe(int64(duration/time.Millisecond), cmd.Name()) metricReqDur.Observe(duration.Milliseconds(), cmd.Name())
if msg := formatError(err); len(msg) > 0 { if msg := formatError(err); len(msg) > 0 {
metricReqErr.Inc(cmd.Name(), msg) metricReqErr.Inc(cmd.Name(), msg)
} }
@ -103,7 +103,7 @@ func (h hook) AfterProcessPipeline(ctx context.Context, cmds []red.Cmder) error
logDuration(ctx, cmds, duration) logDuration(ctx, cmds, duration)
} }
metricReqDur.Observe(int64(duration/time.Millisecond), "Pipeline") metricReqDur.Observe(duration.Milliseconds(), "Pipeline")
if msg := formatError(batchError.Err()); len(msg) > 0 { if msg := formatError(batchError.Err()); len(msg) > 0 {
metricReqErr.Inc("Pipeline", msg) metricReqErr.Inc("Pipeline", msg)
} }

2
core/stores/sqlx/stmt.go
View File

@ -136,7 +136,7 @@ func (e *realSqlGuard) finish(ctx context.Context, err error) {
logSqlError(ctx, e.stmt, err) logSqlError(ctx, e.stmt, err)
} }
metricReqDur.Observe(int64(duration/time.Millisecond), e.command) metricReqDur.Observe(duration.Milliseconds(), e.command)
} }
func (e *realSqlGuard) start(q string, args ...any) error { func (e *realSqlGuard) start(q string, args ...any) error {

3
rest/handler/prometheushandler.go
View File

@ -3,7 +3,6 @@ package handler
import ( import (
"net/http" "net/http"
"strconv" "strconv"
"time"
"github.com/zeromicro/go-zero/core/metric" "github.com/zeromicro/go-zero/core/metric"
"github.com/zeromicro/go-zero/core/timex" "github.com/zeromicro/go-zero/core/timex"
@ -38,7 +37,7 @@ func PrometheusHandler(path, method string) func(http.Handler) http.Handler {
startTime := timex.Now() startTime := timex.Now()
cw := &response.WithCodeResponseWriter{Writer: w} cw := &response.WithCodeResponseWriter{Writer: w}
defer func() { defer func() {
metricServerReqDur.Observe(int64(timex.Since(startTime)/time.Millisecond), path, method) metricServerReqDur.Observe(timex.Since(startTime).Milliseconds(), path, method)
metricServerReqCodeTotal.Inc(path, strconv.Itoa(cw.Code), method) metricServerReqCodeTotal.Inc(path, strconv.Itoa(cw.Code), method)
}() }()

2
tools/goctl/api/gogen/genroutes.go
View File

@ -129,7 +129,7 @@ rest.WithPrefix("%s"),`, g.prefix)
return fmt.Errorf("timeout should not less than 1ms, now %v", duration) return fmt.Errorf("timeout should not less than 1ms, now %v", duration)
} }
timeout = fmt.Sprintf("\n rest.WithTimeout(%d * time.Millisecond),", duration/time.Millisecond) timeout = fmt.Sprintf("\n rest.WithTimeout(%d * time.Millisecond),", duration.Milliseconds())
hasTimeout = true hasTimeout = true
} }

3
zrpc/internal/clientinterceptors/prometheusinterceptor.go
View File

@ -3,7 +3,6 @@ package clientinterceptors
import ( import (
"context" "context"
"strconv" "strconv"
"time"
"github.com/zeromicro/go-zero/core/metric" "github.com/zeromicro/go-zero/core/metric"
"github.com/zeromicro/go-zero/core/timex" "github.com/zeromicro/go-zero/core/timex"
@ -37,7 +36,7 @@ func PrometheusInterceptor(ctx context.Context, method string, req, reply any,
cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error { cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
startTime := timex.Now() startTime := timex.Now()
err := invoker(ctx, method, req, reply, cc, opts...) err := invoker(ctx, method, req, reply, cc, opts...)
metricClientReqDur.Observe(int64(timex.Since(startTime)/time.Millisecond), method) metricClientReqDur.Observe(timex.Since(startTime).Milliseconds(), method)
metricClientReqCodeTotal.Inc(method, strconv.Itoa(int(status.Code(err)))) metricClientReqCodeTotal.Inc(method, strconv.Itoa(int(status.Code(err))))
return err return err
} }

3
zrpc/internal/serverinterceptors/prometheusinterceptor.go
View File

@ -3,7 +3,6 @@ package serverinterceptors
import ( import (
"context" "context"
"strconv" "strconv"
"time"
"github.com/zeromicro/go-zero/core/metric" "github.com/zeromicro/go-zero/core/metric"
"github.com/zeromicro/go-zero/core/timex" "github.com/zeromicro/go-zero/core/timex"
@ -37,7 +36,7 @@ func UnaryPrometheusInterceptor(ctx context.Context, req any,
info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) { info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
startTime := timex.Now() startTime := timex.Now()
resp, err := handler(ctx, req) resp, err := handler(ctx, req)
metricServerReqDur.Observe(int64(timex.Since(startTime)/time.Millisecond), info.FullMethod) metricServerReqDur.Observe(timex.Since(startTime).Milliseconds(), info.FullMethod)
metricServerReqCodeTotal.Inc(info.FullMethod, strconv.Itoa(int(status.Code(err)))) metricServerReqCodeTotal.Inc(info.FullMethod, strconv.Itoa(int(status.Code(err))))
return resp, err return resp, err
} }