Log all HTTP errors

Author: okorach

cli/findings_export.py

@@ -295,7 +295,7 @@ def __get_component_findings(queue: Queue[tuple[object, ConfigSettings]], write_
                     component.endpoint, component.key, branch=params.get("branch", None), pull_request=params.get("pullRequest", None)
                 )
             except HTTPError as e:
-                log.critical("Error %s while exporting findings of %s, skipped", str(e), str(component))
+                log.critical("%s while exporting findings of %s, skipped", util.http_error(e), str(component))
                 findings_list = {}
             write_queue.put([findings_list, False])
         else:
@@ -324,7 +324,7 @@ def __get_component_findings(queue: Queue[tuple[object, ConfigSettings]], write_
                 try:
                     findings_list = component.get_issues(filters=new_params)
                 except HTTPError as e:
-                    log.critical("Error %s while exporting issues of %s, skipped", str(e), str(component))
+                    log.critical("%s while exporting issues of %s, skipped", util.http_error(e), str(component))
                     findings_list = {}
             else:
                 log.debug("Status = %s, Types = %s, Resol = %s, Sev = %s", str(i_statuses), str(i_types), str(i_resols), str(i_sevs))
@@ -334,7 +334,7 @@ def __get_component_findings(queue: Queue[tuple[object, ConfigSettings]], write_
                 try:
                     findings_list.update(component.get_hotspots(filters=new_params))
                 except HTTPError as e:
-                    log.critical("Error %s while exporting hotspots of object key %s, skipped", str(e), str(component))
+                    log.critical("%s while exporting hotspots of object key %s, skipped", util.http_error(e), str(component))
             else:
                 log.debug("Status = %s, Types = %s, Resol = %s, Sev = %s", str(h_statuses), str(h_types), str(h_resols), str(h_sevs))
                 log.info("Selected types, severities, resolutions or statuses disables issue search")
@@ -352,7 +352,7 @@ def store_findings(components_list: dict[str, object], params: ConfigSettings) -
             log.debug("Queue %s task %s put", str(my_queue), str(comp))
             my_queue.put((comp, params.copy()))
         except HTTPError as e:
-            log.critical("Error %s while exporting findings of %s, skipped", str(e), str(comp))
+            log.critical("%s while exporting findings of %s, skipped", util.http_error(e), str(comp))
 
     threads = params.get(options.NBR_THREADS, 4)
     for i in range(min(threads, len(components_list))):

cli/loc.py

@@ -52,7 +52,7 @@ def __get_csv_row(o: object, **kwargs) -> tuple[list[str], str]:
     try:
         loc = o.loc()
     except HTTPError as e:
-        log.warning("HTTP Error %s, LoC export of %s skipped", str(e), str(o))
+        log.warning("%s, LoC export of %s skipped", util.http_error(e), str(o))
         loc = ""
     arr = [o.key, loc]
     obj_type = type(o).__name__.lower()
@@ -114,7 +114,7 @@ def __get_object_json_data(o: object, **kwargs) -> dict[str, str]:
     try:
         d["ncloc"] = o.loc()
     except HTTPError as e:
-        log.warning("HTTP Error %s, LoC export of %s skipped", str(e), str(o))
+        log.warning("%s, LoC export of %s skipped", util.http_error(e), str(o))
     if kwargs[options.WITH_NAME]:
         d[f"{parent_type}Name"] = o.name
         if obj_type in ("branch", "applicationbranch"):

cli/measures_export.py

@@ -56,12 +56,7 @@ def __last_analysis(component: object) -> str:
 
 def __get_json_measures_history(obj: object, wanted_metrics: types.KeyList) -> dict[str, str]:
     """Returns the measure history of an object (project, branch, application, portfolio)"""
-    data = {}
-    try:
-        data["history"] = obj.get_measures_history(wanted_metrics)
-    except HTTPError as e:
-        log.error("HTTP Error %s, measures history export of %s skipped", str(e), str(obj))
-    return data
+    return {"history": obj.get_measures_history(wanted_metrics)}
 
 
 def __get_object_measures(obj: object, wanted_metrics: types.KeyList) -> dict[str, str]:
@@ -289,10 +284,7 @@ def __get_measures(obj: object, wanted_metrics: types.KeyList, hist: bool) -> Un
         else:
             data.update(__get_object_measures(obj, wanted_metrics))
     except HTTPError as e:
-        if e.response.status_code == HTTPStatus.FORBIDDEN:
-            log.error("Insufficient permission to retrieve measures of %s, export skipped for this object", str(obj))
-        else:
-            log.error("HTTP Error %s while retrieving measures of %s, export skipped for this object", str(e), str(obj))
+        log.error("%s, measures export skipped for %s", util.http_error(e), str(obj))
         return None
     return data
 

sonar/app_branches.py

@@ -34,7 +34,7 @@
 
 from sonar.applications import Application as App
 from sonar.branches import Branch
-from sonar import exceptions, projects
+from sonar import exceptions, projects, utilities
 import sonar.sqobject as sq
 
 _OBJECTS = {}
@@ -112,6 +112,8 @@ def create(cls, app: App, name: str, project_branches: list[Branch]) -> Applicat
         except HTTPError as e:
             if e.response.status_code == HTTPStatus.BAD_REQUEST:
                 raise exceptions.ObjectAlreadyExists(f"app.App {app.key} branch '{name}", e.response.text)
+            log.critical("%s while creating branch '%s' of '%s'", utilities.http_error(e), name, str(app))
+            raise
         return ApplicationBranch(app=app, name=name, project_branches=project_branches)
 
     @classmethod
@@ -185,6 +187,9 @@ def update(self, name: str, project_branches: list[Branch]) -> bool:
         except HTTPError as e:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(str(self), e.response.text)
+            log.critical("%s while updating '%s'", utilities.http_error(e), str(self))
+            raise
+
         self.name = name
         self._project_branches = project_branches
         return ok

sonar/applications.py

@@ -93,6 +93,8 @@ def get_object(cls, endpoint: pf.Platform, key: str) -> Application:
         except HTTPError as e:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(key, f"Application key '{key}' not found")
+            log.critical("%s while getting app key '%s'", util.http_error(e), key)
+            raise
         return cls.load(endpoint, data)
 
     @classmethod
@@ -134,6 +136,8 @@ def create(cls, endpoint: pf.Platform, key: str, name: str) -> Application:
         except HTTPError as e:
             if e.response.status_code == HTTPStatus.BAD_REQUEST:
                 raise exceptions.ObjectAlreadyExists(key, e.response.text)
+            log.critical("%s while creating app key '%s'", util.http_error(e), key)
+            raise
         return Application(endpoint, key, name)
 
     def refresh(self) -> None:
@@ -150,6 +154,7 @@ def refresh(self) -> None:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 _OBJECTS.pop(self.uuid(), None)
                 raise exceptions.ObjectNotFound(self.key, f"{str(self)} not found")
+            log.critical("%s while refreshing %s", util.http_error(e), str(self))
             raise
 
     def __str__(self) -> str:
@@ -388,6 +393,7 @@ def add_projects(self, project_list: list[str]) -> bool:
                     log.warning("Project '%s' not found, can't be added to %s", proj, self)
                     ok = False
                 else:
+                    log.critical("%s while adding projects to %s", util.http_error(e), str(self))
                     raise
         return ok
 

sonar/branches.py

@@ -92,6 +92,8 @@ def get_object(cls, concerned_object: projects.Project, branch_name: str) -> Bra
         except HTTPError as e:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(concerned_object.key, f"Project '{concerned_object.key}' not found")
+            log.critical("%s while getting branch '%s' of %s", util.http_error(e), branch_name, str(concerned_object))
+            raise
         for br in data.get("branches", []):
             if br["name"] == branch_name:
                 return cls.load(concerned_object, branch_name, br)
@@ -130,6 +132,8 @@ def refresh(self) -> Branch:
         except HTTPError as e:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(self.key, f"{str(self)} not found in SonarQube")
+            log.critical("%s while refreshing %s", util.http_error(e), str(self))
+            raise
         for br in data.get("branches", []):
             if br["name"] == self.name:
                 self._load(br)
@@ -173,7 +177,7 @@ def is_main(self):
             self.refresh()
         return self._is_main
 
-    def delete(self):
+    def delete(self) -> bool:
         """Deletes a branch
 
         :raises ObjectNotFound: Branch not found for deletion
@@ -185,6 +189,8 @@ def delete(self):
         except HTTPError as e:
             if e.response.status_code == HTTPStatus.BAD_REQUEST:
                 log.warning("Can't delete %s, it's the main branch", str(self))
+            else:
+                log.critical("%s while deleting %s", util.http_error(e), str(self))
             return False
 
     def new_code(self) -> str:
@@ -200,8 +206,7 @@ def new_code(self) -> str:
             except HTTPError as e:
                 if e.response.status_code == HTTPStatus.NOT_FOUND:
                     raise exceptions.ObjectNotFound(self.concerned_object.key, f"{str(self.concerned_object)} not found")
-                if e.response.status_code == HTTPStatus.FORBIDDEN:
-                    log.error("Error 403 when getting new code period of %s", {str(self)})
+                log.error("%s while getting new code period of %s", util.http_error(e), str(self))
                 raise e
             for b in data["newCodePeriods"]:
                 new_code = settings.new_code_to_string(b)
@@ -264,6 +269,8 @@ def rename(self, new_name):
         except HTTPError as e:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(self.concerned_object.key, f"str{self.concerned_object} not found")
+            log.error("%s while renaming %s", util.http_error(e), str(self))
+            raise
         _OBJECTS.pop(self.uuid(), None)
         self.name = new_name
         _OBJECTS[self.uuid()] = self
@@ -361,8 +368,7 @@ def audit(self, audit_settings: types.ConfigSettings) -> list[Problem]:
             except HTTPError as e:
                 if e.response.status_code == HTTPStatus.FORBIDDEN:
                     log.error("Not enough permission to fully audit %s", str(self))
-                else:
-                    log.error("HTTP error %s while auditing %s", str(e), str(self))
+                log.error("%s while auditing %s, audit skipped", util.http_error(e), str(self))
         else:
             log.debug("Branch audit disabled, skipping audit of %s", str(self))
         return []

sonar/devops.py

@@ -113,6 +113,7 @@ def create(cls, endpoint: platform.Platform, key: str, plt_type: str, url_or_wor
             if e.response.status_code == HTTPStatus.BAD_REQUEST and endpoint.edition() in ("community", "developer"):
                 log.warning("Can't set DevOps platform '%s', don't you have more that 1 of that type?", key)
                 raise exceptions.UnsupportedOperation(f"Can't set DevOps platform '{key}', don't you have more that 1 of that type?")
+            log.error("%s while creating devops platform %s/%s/%s", util.http_error(e), key, plt_type, url_or_workspace)
             raise
         o = DevopsPlatform(endpoint=endpoint, key=key, platform_type=plt_type)
         o.refresh()

sonar/hotspots.py

@@ -407,6 +407,7 @@ def search(endpoint: pf.Platform, filters: types.ApiParams = None) -> dict[str,
                     log.warning("No hotspots found with search params %s", str(inline_filters))
                     nbr_hotspots = 0
                     return {}
+                log.error("%s while searching hotspots", util.http_error(e))
                 raise e
             nbr_pages = util.nbr_pages(data)
             log.debug("Number of hotspots: %d - Page: %d/%d", nbr_hotspots, inline_filters["p"], nbr_pages)

sonar/issues.py

@@ -733,7 +733,7 @@ def __search_thread(queue: Queue) -> None:
                 issue_list[i["key"]] = get_object(endpoint=endpoint, key=i["key"], data=i)
             log.debug("Added %d issues in threaded search page %d", len(data["issues"]), page)
         except HTTPError as e:
-            log.critical("HTTP Error while searching issues, search may be incomplete: %s", str(e))
+            log.error("%s while searching issues, search may be incomplete", util.http_error(e))
         queue.task_done()
 
 
@@ -794,6 +794,7 @@ def search(endpoint: pf.Platform, params: ApiParams = None, raise_error: bool =
         worker.setDaemon(True)
         worker.start()
     q.join()
+    log.debug("Issue search for %s completed with %d issues", str(params), len(issue_list))
     return issue_list
 
 
@@ -849,13 +850,16 @@ def count_by_rule(endpoint: pf.Platform, **kwargs) -> dict[str, int]:
     rulecount = {}
     for i in range(nbr_slices):
         params["rules"] = ",".join(ruleset[i * SLICE_SIZE : min((i + 1) * SLICE_SIZE - 1, len(ruleset))])
-        data = json.loads(endpoint.get(Issue.SEARCH_API, params=params).text)["facets"][0]["values"]
-        for d in data:
-            if d["val"] not in ruleset:
-                continue
-            if d["val"] not in rulecount:
-                rulecount[d["val"]] = 0
-            rulecount[d["val"]] += d["count"]
+        try:
+            data = json.loads(endpoint.get(Issue.SEARCH_API, params=params).text)["facets"][0]["values"]
+            for d in data:
+                if d["val"] not in ruleset:
+                    continue
+                if d["val"] not in rulecount:
+                    rulecount[d["val"]] = 0
+                rulecount[d["val"]] += d["count"]
+        except HTTPError as e:
+            log.warning("%s while counting issues per rule, count may be incomplete", util.http_error(e))
     return rulecount
 
 

sonar/measures.py

@@ -127,6 +127,7 @@ def get(concerned_object: object, metrics_list: KeyList, **kwargs) -> dict[str,
     except HTTPError as e:
         if e.response.status_code == HTTPStatus.NOT_FOUND:
             raise exceptions.ObjectNotFound(concerned_object.key, f"{str(concerned_object)} not found")
+        log.error("%s while getting measures %s of %s", util.http_error(e), str(metrics_list), str(concerned_object))
         raise e
     m_dict = {m: None for m in metrics_list}
     for m in data["component"]["measures"]:
@@ -157,6 +158,7 @@ def get_history(concerned_object: object, metrics_list: KeyList, **kwargs) -> li
     except HTTPError as e:
         if e.response.status_code == HTTPStatus.NOT_FOUND:
             raise exceptions.ObjectNotFound(concerned_object.key, f"{str(concerned_object)} not found")
+        log.error("%s while getting measures %s history of %s", util.http_error(e), str(metrics_list), str(concerned_object))
         raise e
     res_list = []
     # last_metric, last_date = "", ""