MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-04 11:50:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

trace: enhance trace experience further

Browse Source
This commit is contained in:
Harshavardhana 2021-03-27 13:19:14 -07:00
parent 07ab4d1250
commit 7c5b35d20f
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/http-tracer.go
View File

@ -130,10 +130,15 @@ func WebTrace(ri *jsonrpc.RequestInfo) trace.Info {
if globalIsDistErasure { if globalIsDistErasure {
t.NodeName = globalLocalNodeName t.NodeName = globalLocalNodeName
} }
if t.NodeName == "" {
t.NodeName = globalLocalNodeName
}
// strip port from the host address // strip only standard port from the host address
if host, _, err := net.SplitHostPort(t.NodeName); err == nil { if host, port, err := net.SplitHostPort(t.NodeName); err == nil {
t.NodeName = host if port == "443" || port == "80" {
t.NodeName = host
}
} }
vars := mux.Vars(r) vars := mux.Vars(r)
@ -196,9 +201,16 @@ func Trace(f http.HandlerFunc, logBody bool, w http.ResponseWriter, r *http.Requ
if globalIsDistErasure { if globalIsDistErasure {
t.NodeName = globalLocalNodeName t.NodeName = globalLocalNodeName
} }
// strip port from the host address
if host, _, err := net.SplitHostPort(t.NodeName); err == nil { if t.NodeName == "" {
t.NodeName = host t.NodeName = globalLocalNodeName
}
// strip only standard port from the host address
if host, port, err := net.SplitHostPort(t.NodeName); err == nil {
if port == "443" || port == "80" {
t.NodeName = host
}
} }
rq := trace.RequestInfo{ rq := trace.RequestInfo{

2
cmd/os-instrumented.go
View File

@ -66,7 +66,7 @@ func updateOSMetrics(s osMetric, paths ...string) func() {
return func() { return func() {
duration := time.Since(startTime) duration := time.Since(startTime)
globalTrace.Publish(osTrace(s, startTime, duration, strings.Join(paths, " "))) globalTrace.Publish(osTrace(s, startTime, duration, strings.Join(paths, " -> ")))
} }
} }