gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-13 15:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #861 from openziti/add.metrics.for.all.endpoints

Browse Source 
adds metrics for endpoints with keys of path[method]
This commit is contained in:
Andrew
2022-01-06 14:46:29 -05:00
committed by GitHub
parent 29513cc3fa 8b20f0278a
commit c8facce38f
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/server/client-api.go
+3
View File
@@ -143,6 +143,7 @@ func (clientApi ClientApiHandler) newHandler(ae *env.AppEnv) http.Handler {
innerClientHandler := ae.ClientApi.Serve(nil)
handler := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
start := time.Now()
rw.Header().Set(ZitiInstanceId, ae.InstanceId)
//if not /edge prefix and not /fabric, translate to "/edge/client/v<latest>", this is a hack
@@ -175,6 +176,8 @@ func (clientApi ClientApiHandler) newHandler(ae *env.AppEnv) http.Handler {
response.AddHeaders(rc)
innerClientHandler.ServeHTTP(rw, r)
timer := ae.GetHostController().GetNetwork().GetMetricsRegistry().Timer(getMetricTimerName(r))
timer.UpdateSince(start)
})
return api.TimeoutHandler(api.WrapCorsHandler(handler), 10*time.Second, apierror.NewTimeoutError(), response.EdgeResponseMapper{})
controller/server/management-api.go
+24
View File
@@ -108,6 +108,7 @@ func (managementApi ManagementApiHandler) newHandler(ae *env.AppEnv) http.Handle
innerManagementHandler := ae.ManagementApi.Serve(nil)
handler := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
start := time.Now()
rw.Header().Set(ZitiInstanceId, ae.InstanceId)
if r.URL.Path == controller.ManagementRestApiSpecUrl {
@@ -131,7 +132,30 @@ func (managementApi ManagementApiHandler) newHandler(ae *env.AppEnv) http.Handle
response.AddHeaders(rc)
innerManagementHandler.ServeHTTP(rw, r)
timer := ae.GetHostController().GetNetwork().GetMetricsRegistry().Timer(getMetricTimerName(r))
timer.UpdateSince(start)
})
return api.TimeoutHandler(api.WrapCorsHandler(handler), 10*time.Second, apierror.NewTimeoutError(), response.EdgeResponseMapper{})
}
// getMetricTimerName returns a metric timer name based on the incoming HTTP request's URL and method.
// Unique ids are removed from the URL and replaced with :id and :subid to group metrics from the same
// endpoint that happen to be working on different ids.
func getMetricTimerName(r *http.Request) string {
cleanUrl := r.URL.Path
rc, _ := api.GetRequestContextFromHttpContext(r)
if rc != nil {
if id, err := rc.GetEntityId(); err == nil && id != "" {
cleanUrl = strings.Replace(cleanUrl, id, ":id", -1)
}
if subid, err := rc.GetEntitySubId(); err == nil && subid != "" {
cleanUrl = strings.Replace(cleanUrl, subid, ":subid", -1)
}
}
return fmt.Sprintf("%s.%s", cleanUrl, r.Method)
}