begins moving out subquery logging out from Subquery and into searchQ…

…uery class (to reduce number of log posts)
asfadmin · Oct 21, 2023 · 373eff5 · 373eff5
1 parent e7f4293
commit 373eff5
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 27 deletions.
diff --git a/SearchAPI/CMR/Query.py b/SearchAPI/CMR/Query.py
@@ -8,6 +8,8 @@
 from SearchAPI.CMR.SubQuery import CMRSubQuery
 from flask import request
 
+import boto3
+
 
 class CMRQuery:
     def __init__(self, req_fields, params=None, max_results=None):
@@ -17,6 +19,7 @@ def __init__(self, req_fields, params=None, max_results=None):
         self.req_fields = req_fields
         self.page_size = cfg['cmr_page_size']
         self.params = params
+        self.subquery_times = []
 
         provider = request.args.get("cmr_provider")
         if provider == None:
@@ -45,6 +48,7 @@ def __init__(self, req_fields, params=None, max_results=None):
             )
             for query in subquery_list_from(self.params)
         ]
+
 
         logging.debug('New CMRQuery object ready to go')
 
@@ -94,6 +98,33 @@ def max_results_reached(self):
             self.max_results is not None and
             self.result_counter >= self.max_results
         )
+
+
+
+    def log_subquery_time(self, subqueries):
+        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': 'Seconds',
+                            'Values': self.queryTimes
+                        }
+                    ],
+                    Namespace = 'SearchAPI'
+                )
+        except Exception as e:
+            logging.exception(f'Failure during subquery run time logging: {e}')
+
 
 
 def subquery_list_from(params):

diff --git a/SearchAPI/CMR/SubQuery.py b/SearchAPI/CMR/SubQuery.py
@@ -9,7 +9,6 @@
 from SearchAPI.asf_env import get_config
 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):
@@ -18,6 +17,7 @@ def __init__(self, req_fields, 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)
 
@@ -168,9 +168,9 @@ def get_page(self, session):
 
             if query_duration > 10:
                 self.log_slow_cmr_response(session, response, query_duration)
-
-            self.log_subquery_time(query_duration)
 
+            self.query_times.append(query_duration)
+
             if response.status_code != 200:
                 self.log_bad_cmr_response(
                     attempt, max_retry, response, session
@@ -224,27 +224,3 @@ 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, elapsed_time):
-        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': 'Seconds',
-                            'Value': elapsed_time
-                        }
-                    ],
-                    Namespace = 'SearchAPI'
-                )
-        except Exception as e:
-            logging.exception(f'Failure during subquery run time logging: {e}')