Merge pull request #3386 from GSA-TTS/main

backend/dissemination/search_alns.py

@@ -34,15 +34,17 @@ def search_alns(general_results, params):
             f"search_alns general rows[{r_general_rids_matching_FA_rids.count()}]"
         )
 
-        annotated = _annotate_findings(
-            r_general_rids_matching_FA_rids, params, r_FAs_matching_alns
-        )
-
-        sorted = _findings_sort(annotated, params)
+        # After migrating in historical data, this feature uses too much RAM/CPU.
+        # Disabled until we rework the expensive queries.
+        # annotated = _annotate_findings(
+        #     r_general_rids_matching_FA_rids, params, r_FAs_matching_alns
+        # )
+        # sorted = _findings_sort(annotated, params)
+        # return sorted
 
         t1 = time.time()
         report_timing("search_alns", params, t0, t1)
-        return sorted
+        return r_general_rids_matching_FA_rids
 
 
 def _findings_sort(results, params):

backend/dissemination/test_search.py

@@ -7,6 +7,7 @@
 
 import datetime
 import random
+import unittest
 
 
 def assert_all_results_public(cls, results):
@@ -326,6 +327,7 @@ def test_aln_search(self):
         results_alns_both = search_alns(results_general_both, params_both)
         self.assertEqual(len(results_alns_both), 2)
 
+    @unittest.skip("Skipping while ALN columns are disabled.")
     def test_finding_my_aln(self):
         """
         When making an ALN search, search_general should return records under that ALN.
@@ -352,6 +354,7 @@ def test_finding_my_aln(self):
             and results_alns[0].finding_all_aln is False
         )
 
+    @unittest.skip("Skipping while ALN columns are disabled.")
     def test_finding_all_aln(self):
         """
         When making an ALN search, search_general should return records under that ALN.
@@ -385,6 +388,7 @@ def test_finding_all_aln(self):
             and results_alns[0].finding_all_aln is True
         )
 
+    @unittest.skip("Skipping while ALN columns are disabled.")
     def test_finding_my_aln_and_finding_all_aln(self):
         """
         When making an ALN search, search_general should return records under that ALN.
@@ -419,6 +423,7 @@ def test_finding_my_aln_and_finding_all_aln(self):
             and results_alns[0].finding_all_aln is True
         )
 
+    @unittest.skip("Skipping while ALN columns are disabled.")
     def test_alns_no_findings(self):
         # General record with one award and no findings.
         baker.make(General, is_public=True, report_id="2022-04-TSTDAT-0000000004")

backend/dissemination/views.py

@@ -34,9 +34,40 @@
 
 from users.permissions import can_read_tribal
 
+import newrelic.agent
+
 logger = logging.getLogger(__name__)
 
 
+def _add_search_params_to_newrelic(search_parameters):
+    singles = [
+        "start_date",
+        "end_date",
+        "cog_or_oversight",
+        "agency_name",
+        "auditee_state",
+    ]
+
+    newrelic.agent.add_custom_attributes(
+        [(f"request.search.{k}", str(search_parameters[k])) for k in singles]
+    )
+
+    multis = [
+        "uei_or_eins",
+        "alns",
+        "names",
+    ]
+
+    newrelic.agent.add_custom_attributes(
+        [(f"request.search.{k}", ",".join(search_parameters[k])) for k in multis]
+    )
+
+    newrelic.agent.add_custom_attribute(
+        "request.search.audit_years",
+        ",".join([str(ay) for ay in search_parameters["audit_years"]]),
+    )
+
+
 def include_private_results(request):
     """
     Determine if the user is authenicated to see private data.
@@ -122,6 +153,9 @@ def run_search(form_data, include_private):
         "order_by": form_data.order_by,
         "order_direction": form_data.order_direction,
     }
+
+    _add_search_params_to_newrelic(search_parameters)
+
     return search(search_parameters)