moves aws subquery metric logging to subquery level, adds status code as dimension

Author: kim

SearchAPI/CMR/Query.py

@@ -8,8 +8,6 @@
 from SearchAPI.CMR.SubQuery import CMRSubQuery
 from flask import request
 
-import boto3
-
 
 class CMRQuery:
     def __init__(self, req_fields, params=None, max_results=None):
@@ -70,12 +68,10 @@ def get_results(self):
                 if self.is_out_of_time():
                     logging.warning('Query ran too long, terminating')
                     logging.warning(self.params)
-                    self.log_subquery_time()
                     return
 
                 if self.max_results_reached():
                     logging.debug('Max results reached, terminating')
-                    self.log_subquery_time()
                     return
 
                 if result is None:
@@ -87,11 +83,9 @@ def get_results(self):
                 # it's a little silly but run this check again here so we don't accidentally fetch an extra page
                 if self.max_results_reached():
                     logging.debug('Max results reached, terminating')
-                    self.log_subquery_time()
                     return
 
             logging.debug('End of available results reached')
-            self.log_subquery_time()
 
     def is_out_of_time(self):
         return time.time() > self.cutoff_time
@@ -101,37 +95,6 @@ def max_results_reached(self):
             self.max_results is not None and
             self.result_counter >= self.max_results
         )
-    
-
-
-    def log_subquery_time(self):
-        subquery_times = []
-        for subquery in self.sub_queries:
-            subquery_times.extend(subquery.query_times)
-        try:
-            if request.asf_config['cloudwatch_metrics']:
-                logging.debug('Logging subquery run time to cloudwatch metrics')
-                cloudwatch = boto3.client('cloudwatch')
-                cloudwatch.put_metric_data(
-                    MetricData = [
-                        {
-                            'MetricName': 'SubqueryRuntime',
-                            'Dimensions': [
-                                {
-                                    'Name': 'maturity',
-                                    'Value': request.asf_base_maturity
-                                }
-                            ],
-                            'Unit': 'None',
-                            'Values': subquery_times
-                        }
-                    ],
-                    Namespace = 'SearchAPI'
-                )
-        except Exception as e:
-            logging.exception(f'Failure during subquery run time logging: {e}')
-
-
 
 def subquery_list_from(params):
     """

SearchAPI/CMR/SubQuery.py

@@ -10,14 +10,15 @@
 from SearchAPI.CMR.Translate import parse_cmr_response
 from SearchAPI.CMR.Exceptions import CMRError
 
+import boto3
+
 class CMRSubQuery:
     def __init__(self, req_fields, params, extra_params):
         self.params = params
         self.extra_params = extra_params
         self.req_fields = req_fields
         self.hits = 0
         self.results = []
-        self.query_times = []
 
         self.params = self.combine_params(self.params, self.extra_params)
 
@@ -166,11 +167,10 @@ def get_page(self, session):
             query_duration = perf_counter() - q_start
             logging.debug(f'CMR query time: {query_duration}')
 
+            self.log_subquery_time({'time': query_duration, 'status': response.status_code})
+            
             if query_duration > 10:
                 self.log_slow_cmr_response(session, response, query_duration)
-            
-            self.query_times.append(query_duration)
-
             if response.status_code != 200:
                 self.log_bad_cmr_response(
                     attempt, max_retry, response, session
@@ -224,3 +224,31 @@ def log_bad_cmr_response(self, attempt, max_retry, response, session):
         logging.error('Headers sent to CMR:')
         logging.error(session.headers)
         logging.error(f'Error body: {response.text}')
+
+
+    def log_subquery_time(self, query_metric):
+        try:
+            if request.asf_config['cloudwatch_metrics']:
+                logging.debug('Logging subquery run time to cloudwatch metrics')
+                cloudwatch = boto3.client('cloudwatch')
+                cloudwatch.put_metric_data(
+                    MetricData = [
+                        {
+                            'MetricName': 'SubqueryRuntime',
+                            'Dimensions': [
+                                {
+                                    'Name': 'maturity',
+                                    'Value': request.asf_base_maturity
+                                }, {
+                                    'Name': 'status',
+                                    'Value': query_metric['status']
+                                }
+                            ],
+                            'Unit': 'None',
+                            'Value': query_metric['time']
+                        }
+                    ],
+                    Namespace = 'SearchAPI'
+                )
+        except Exception as e:
+            logging.exception(f'Failure during subquery run time logging: {e}')