From 672f28008a77c99a5dc98ea616d69365d77d91e1 Mon Sep 17 00:00:00 2001 From: Filip Valder Date: Jan 28 2019 10:19:51 +0000 Subject: Distinguish between generic and service-specific metrrics --- diff --git a/freshmaker/monitor.py b/freshmaker/monitor.py index d6f248e..c60938a 100644 --- a/freshmaker/monitor.py +++ b/freshmaker/monitor.py @@ -37,6 +37,7 @@ registry = CollectorRegistry() ProcessCollector(registry=registry) multiprocess.MultiProcessCollector(registry) +# Generic metrics messaging_received_counter = Counter( 'messaging_received', 'Total number of messages received', @@ -79,6 +80,7 @@ db_transaction_rollback_counter = Counter( 'Number of transactions, which were rolled back', registry=registry) +# Freshmaker-specific metrics freshmaker_artifact_build_done_counter = Counter( 'freshmaker_artifact_build_done', 'Number of successful artifact builds', @@ -92,7 +94,6 @@ freshmaker_artifact_build_canceled_counter = Counter( 'Number of artifact builds, which were canceled', registry=registry) - freshmaker_event_complete_counter = Counter( 'freshmaker_event_complete', 'Number of successfully handled events', @@ -106,11 +107,10 @@ freshmaker_event_skipped_counter = Counter( 'Number of events, for which no action was taken', registry=registry) - -build_api_latency = Histogram( +freshmaker_build_api_latency = Histogram( 'build_api_latency', 'BuildAPI latency', registry=registry) -event_api_latency = Histogram( +freshmaker_event_api_latency = Histogram( 'event_api_latency', 'EventAPI latency', registry=registry) diff --git a/freshmaker/views.py b/freshmaker/views.py index 976a6aa..d3b21ea 100644 --- a/freshmaker/views.py +++ b/freshmaker/views.py @@ -39,7 +39,8 @@ from freshmaker.api_utils import json_error from freshmaker.api_utils import pagination_metadata from freshmaker.auth import login_required, requires_role, require_scopes from freshmaker.parsers.internal.manual_rebuild import FreshmakerManualRebuildParser -from freshmaker.monitor import MonitorAPI, build_api_latency, event_api_latency +from freshmaker.monitor import ( + MonitorAPI, freshmaker_build_api_latency, freshmaker_event_api_latency) api_v1 = { 'event_types': { @@ -199,7 +200,7 @@ class BuildStateAPI(MethodView): class EventAPI(MethodView): - @event_api_latency.time() + @freshmaker_event_api_latency.time() def get(self, id): if id is None: p_query = filter_events(request) @@ -220,7 +221,7 @@ class EventAPI(MethodView): class BuildAPI(MethodView): - @build_api_latency.time() + @freshmaker_build_api_latency.time() def get(self, id): if id is None: p_query = filter_artifact_builds(request)