faas-rs/faasd
1
0
Fork 0
mirror of https://github.com/openfaas/faasd.git synced 2025-06-18 03:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with provider metrics

Browse Source 
https://github.com/openfaas/faas-provider/pull/66

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd)
2022-08-17 20:33:58 +01:00
parent 6dbc33d045
commit 9564e64980
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vendor/github.com/openfaas/faas-provider/httputil/write_interceptor.go generated vendored
View File

@ -12,14 +12,14 @@ func NewHttpWriteInterceptor(w http.ResponseWriter) *HttpWriteInterceptor {
type HttpWriteInterceptor struct {
http.ResponseWriter
StatusCode int
statusCode int
}
func (c *HttpWriteInterceptor) Status() int {
if c.StatusCode == 0 {
if c.statusCode == 0 {
return http.StatusOK
}
return c.StatusCode
return c.statusCode
}
func (c *HttpWriteInterceptor) Header() http.Header {
@ -27,11 +27,14 @@ func (c *HttpWriteInterceptor) Header() http.Header {
}
func (c *HttpWriteInterceptor) Write(data []byte) (int, error) {
if c.statusCode == 0 {
c.WriteHeader(http.StatusOK)
}
return c.ResponseWriter.Write(data)
}
func (c *HttpWriteInterceptor) WriteHeader(code int) {
c.StatusCode = code
c.statusCode = code
c.ResponseWriter.WriteHeader(code)
}

4
vendor/github.com/openfaas/faas-provider/metrics.go generated vendored
View File

@ -53,7 +53,7 @@ func (hm *httpMetrics) InstrumentHandler(next http.Handler, pathOverride string)
defer func() {
hm.RequestsTotal.With(
prometheus.Labels{"code": strconv.Itoa(ww.StatusCode),
prometheus.Labels{"code": strconv.Itoa(ww.Status()),
"method": r.Method,
"path": path,
}).
@ -62,7 +62,7 @@ func (hm *httpMetrics) InstrumentHandler(next http.Handler, pathOverride string)
defer func() {
hm.RequestDurationHistogram.With(
prometheus.Labels{"code": strconv.Itoa(ww.StatusCode),
prometheus.Labels{"code": strconv.Itoa(ww.Status()),
"method": r.Method,
"path": path,
}).