Confluence: add retry and error handling locig for get java version

Author: ometelytsia

app/util/analytics/application_info.py

@@ -153,10 +153,13 @@ def dataset_information(self):
 
     @property
     def java_version(self):
-        full_system_info = self.client.get_system_info_page()
-        java_versions_parsed = html.fromstring(full_system_info).xpath('//*[contains(@id, "java.version")]')
-        if java_versions_parsed:
-            return java_versions_parsed[0].text
+        try:
+            full_system_info = self.client.get_system_info_page()
+            java_versions_parsed = html.fromstring(full_system_info).xpath('//*[contains(@id, "java.version")]')
+            if java_versions_parsed:
+                return java_versions_parsed[0].text
+        except Exception as e:
+            print(f'ERROR: Could not get the Java version. Error: {e}')
         return None
 
     @property

app/util/api/confluence_clients.py

@@ -190,6 +190,7 @@ def get_groups_membership(self, username):
         groups = [group['name'] for group in response.json()['results']]
         return groups
 
+    @retry()
     def get_system_info_page(self):
         login_url = f'{self.host}/dologin.action'
         auth_url = f'{self.host}/doauthenticate.action'
@@ -220,7 +221,11 @@ def get_system_info_page(self):
             self.session.post(url=tsv_auth_url, json=tsv_login_body)
 
         system_info_html = self.session.post(url=auth_url, data=auth_body, headers={'X-Atlassian-Token': 'no-check'}, verify=self.verify)
-        return system_info_html.content.decode("utf-8")
+        page_decoded = system_info_html.content.decode("utf-8")
+        if page_decoded:
+            return page_decoded
+        else:
+            raise Exception(f"ERROR: System info page is empty. Content: {page_decoded}")
 
     def get_installed_apps(self):
         plugins_url = f'{self.host}/rest/plugins/1.0/'
@@ -230,10 +235,13 @@ def get_installed_apps(self):
 
 
     def get_deployment_type(self):
-        html_pattern = 'deployment=terraform'
-        confluence_system_page = self.get_system_info_page()
-        if confluence_system_page.count(html_pattern):
-            return 'terraform'
+        try:
+            html_pattern = 'deployment=terraform'
+            confluence_system_page = self.get_system_info_page()
+            if confluence_system_page.count(html_pattern):
+                return 'terraform'
+        except Exception as e:
+            print(f"Warning: Could not get deployment type. Error: {e}")
         return 'other'
 
     def get_node_ip(self, node_id: str) -> str: