[IMP] rest_log: improve profiling and add tests

Author: simahawk

rest_log/components/service.py

@@ -44,7 +44,10 @@ def dispatch(self, method_name, *args, params=None):
             return super().dispatch(method_name, *args, params=params)
         if self._start_profiling(method_name):
             call_name = f"{self._collection}.{self._usage}.{method_name}"
-            with Profiler(description=f"REST LOG {call_name}"):
+            with Profiler(
+                description=f"REST LOG {call_name} "
+                f"by {self.env.user.name} (uid={self.env.uid})"
+            ):
                 return self._dispatch_with_db_logging(method_name, *args, params=params)
         return self._dispatch_with_db_logging(method_name, *args, params=params)
 
@@ -233,30 +236,35 @@ def _get_matching_active_conf(self, method_name):
     def _start_profiling(self, method_name):
         if request.session.profile_session and request.db:
             return None
-        profiling_uids = 0
+        profiling_uids = self._profiling_get_uids()
+        profiling_conf_match = self._profiling_get_matching_conf(method_name)
+        res = profiling_conf_match and self.env.uid in profiling_uids
+        if res:
+            _logger.info(
+                "Profiling enabled for uids=%s %s",
+                str(profiling_uids),
+                f"{self._collection}.{self._usage}.{method_name}",
+            )
+        return res
+
+    def _profiling_get_uids(self):
         try:
-            profiling_uids = [
-                int(x)
-                for x in self.env["ir.config_parameter"]
+            param = (
+                self.env["ir.config_parameter"]
                 .sudo()
                 .get_param("rest.log.profiling.uid", "")
-                .split(",")
-            ]
+            )
+            if not param.strip():
+                return []
+            return [int(x.strip()) for x in param.strip().split(",") if x.strip()]
         except ValueError as err:
             _logger.warning(
                 "Cannot get uid from system parameter rest.log.profiling.uid: %s",
                 str(err),
             )
-        res = (
-            self.env["rest.log"]._get_matching_conf_from_param(
-                "rest.log.profiling.conf", self._collection, self._usage, method_name
-            )
-            and self.env.uid in profiling_uids
+            return []
+
+    def _profiling_get_matching_conf(self, method_name):
+        return self.env["rest.log"]._get_matching_conf_from_param(
+            "rest.log.profiling.conf", self._collection, self._usage, method_name
         )
-        if res:
-            _logger.info(
-                "Profiling enabled for uids=%s %s",
-                str(profiling_uids),
-                f"{self._collection}.{self._usage}.{method_name}",
-            )
-        return res

rest_log/tests/test_db_logging.py

@@ -274,3 +274,33 @@ def test_log_entry_values_failure_with_response(self):
                 "status": 418,
             },
         )
+
+    def test_start_profiling(self):
+        with self._get_mocked_request() as mocked_request:
+            config_param = self.env["ir.config_parameter"].sudo()
+            config_param.set_param(
+                "rest.log.profiling.conf",
+                f"{self.service._collection}.{self.service._usage}.avg_endpoint",
+            )
+            config_param.set_param("rest.log.profiling.uid", str(self.env.uid))
+            with self.assertLogs("odoo.addons.rest_log.components.service") as logs:
+                self.assertTrue(self.service._start_profiling("avg_endpoint"))
+                self.assertEqual(
+                    logs.output[0],
+                    f"INFO:odoo.addons.rest_log.components.service:"
+                    f"Profiling enabled for uids=[{self.env.uid}] "
+                    "base.rest.test.logmycalls.avg_endpoint",
+                )
+
+            config_param.set_param("rest.log.profiling.uid", "99999")
+            self.assertFalse(self.service._start_profiling("avg_endpoint"))
+
+            mocked_request.session.profile_session = "rest-log-test"
+            self.assertIsNone(self.service._start_profiling("avg_endpoint"))
+
+    def test_get_profiling_uids(self):
+        config_param = self.env["ir.config_parameter"].sudo()
+        with self._get_mocked_request():
+            self.assertEqual(self.service._profiling_get_uids(), [])
+            config_param.set_param("rest.log.profiling.uid", f"{self.env.uid}, 99999")
+            self.assertEqual(self.service._profiling_get_uids(), [self.env.uid, 99999])