From 624980ff54839792933c057a6f3f18f3d4553e54 Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Thu, 14 May 2020 10:53:55 +0530 Subject: [PATCH] MM-25005: Remove HttpRequestsDuration bucket (#14520) * MM-25005: Remove HttpRequestsDuration bucket The ApiTimesHistograms already captures what HttpRequestsDuration does. And it's more granular than that. So there's no need to duplicate stuff. Let's remove this one. * Updating resource class to xlarge Co-authored-by: mattermod Co-authored-by: Jason Deland --- .circleci/config.yml | 2 +- einterfaces/metrics.go | 1 - einterfaces/mocks/MetricsInterface.go | 5 ----- web/handlers.go | 1 - 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4a193d135b..5cde05cd45 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,11 +7,11 @@ orbs: executors: ubuntu: working_directory: ~/mattermost/ + resource_class: xlarge machine: image: "ubuntu-1604:201903-01" environment: COMPOSE_PROJECT_NAME: "circleci" - resource_class: "xlarge" jobs: setup: diff --git a/einterfaces/metrics.go b/einterfaces/metrics.go index a68cec3dc9..04ad95c153 100644 --- a/einterfaces/metrics.go +++ b/einterfaces/metrics.go @@ -16,7 +16,6 @@ type MetricsInterface interface { IncrementHttpRequest() IncrementHttpError() - ObserveHttpRequestDuration(elapsed float64) IncrementClusterRequest() ObserveClusterRequestDuration(elapsed float64) diff --git a/einterfaces/mocks/MetricsInterface.go b/einterfaces/mocks/MetricsInterface.go index f6682bae73..746be9e242 100644 --- a/einterfaces/mocks/MetricsInterface.go +++ b/einterfaces/mocks/MetricsInterface.go @@ -181,11 +181,6 @@ func (_m *MetricsInterface) ObserveClusterRequestDuration(elapsed float64) { _m.Called(elapsed) } -// ObserveHttpRequestDuration provides a mock function with given fields: elapsed -func (_m *MetricsInterface) ObserveHttpRequestDuration(elapsed float64) { - _m.Called(elapsed) -} - // ObservePluginApiDuration provides a mock function with given fields: pluginID, apiName, success, elapsed func (_m *MetricsInterface) ObservePluginApiDuration(pluginID string, apiName string, success bool, elapsed float64) { _m.Called(pluginID, apiName, success, elapsed) diff --git a/web/handlers.go b/web/handlers.go index 9a14ebd0c8..702120756f 100644 --- a/web/handlers.go +++ b/web/handlers.go @@ -260,7 +260,6 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if r.URL.Path != model.API_URL_SUFFIX+"/websocket" { elapsed := float64(time.Since(now)) / float64(time.Second) statusCode := strconv.Itoa(w.(*responseWriterWrapper).StatusCode()) - c.App.Metrics().ObserveHttpRequestDuration(elapsed) c.App.Metrics().ObserveApiEndpointDuration(h.HandlerName, r.Method, statusCode, elapsed) } }