DAPT-26 : ignore browser metric resolution time

Author: hagrawal4

app/selenium_ui/base_page.py

@@ -188,14 +188,6 @@ def delete_all_cookies(self):
     def scroll_down_till_bottom(self):
         self.driver.execute_script("window.scrollTo(0, document.body.scrollHeight)")
 
-    def click_page_body(self):
-        try:
-            body_element = self.driver.find_element(By.TAG_NAME, "body")
-            body_element.click()
-            print("Successfully clicked on page body")
-        except Exception as e:
-            print(f"Failed to click on page body: {e}")
-
 
 class AnyEc:
     """ Use with WebDriverWait to combine expected_conditions

app/selenium_ui/confluence/modules.py

@@ -1,5 +1,5 @@
 import random
-from selenium_ui.conftest import print_timing, measure_browser_navi_metrics, measure_dom_requests
+from selenium_ui.conftest import print_timing, measure_timing, measure_browser_navi_metrics, measure_dom_requests, measure_with_browser_metrics
 
 from selenium_ui.confluence.pages.pages import Login, AllUpdates, PopupManager, Page, Dashboard, TopNavPanel, Editor, \
     Logout
@@ -84,7 +84,6 @@ def sub_measure():
             if login_page.is_first_login():
                 login_page.first_user_setup()
             all_updates_page.wait_for_page_loaded()
-            all_updates_page.click_page_body()
             measure_dom_requests(webdriver, interaction="selenium_login:login_and_view_dashboard")
             if CONFLUENCE_SETTINGS.extended_metrics:
                 measure_browser_navi_metrics(webdriver, datasets, expected_metrics=browser_metrics['selenium_login'])
@@ -108,16 +107,17 @@ def view_page(webdriver, datasets):
     datasets['current_session']['view_page_cache'] = random_page
     page = Page(webdriver, page_id=page_id)
 
-    @print_timing("selenium_view_page")
     def measure():
         page.go_to()
         page.wait_for_page_loaded()
-        page.click_page_body()
         measure_dom_requests(webdriver, interaction=f"selenium_view_page", description=page_description)
-        if CONFLUENCE_SETTINGS.extended_metrics:
-            measure_browser_navi_metrics(webdriver, datasets, expected_metrics=browser_metrics['selenium_view_page'])
 
-    measure()
+    measure_with_browser_metrics(
+        "selenium_view_page",
+        webdriver,
+        datasets,
+        measure
+    )
 
 
 def view_page_from_cache(webdriver, datasets):
@@ -128,18 +128,17 @@ def view_page_from_cache(webdriver, datasets):
 
     page = Page(webdriver, page_id=page_id)
 
-    @print_timing("selenium_view_page_from_cache")
     def measure():
         page.go_to()
         page.wait_for_page_loaded()
-        page.click_page_body()
         measure_dom_requests(webdriver, interaction=f"selenium_view_page_from_cache", description=page_description)
-        if CONFLUENCE_SETTINGS.extended_metrics:
-            measure_browser_navi_metrics(webdriver, datasets,
-                                         expected_metrics=browser_metrics['selenium_view_page_from_cache'])
-
-    measure()
 
+    measure_with_browser_metrics(
+        "selenium_view_page_from_cache",
+        webdriver,
+        datasets,
+        measure
+    )
 
 def view_blog(webdriver, datasets):
     random_blog = random.choice(datasets[BLOGS])
@@ -148,33 +147,33 @@ def view_blog(webdriver, datasets):
     blog = Page(webdriver, page_id=blog_id)
     datasets['current_session']['view_blog'] = random_blog
 
-    @print_timing("selenium_view_blog")
     def measure():
         blog.go_to()
         blog.wait_for_page_loaded()
-        blog.click_page_body()
         measure_dom_requests(webdriver, interaction=f"selenium_view_blog", description=blog_description)
-        if CONFLUENCE_SETTINGS.extended_metrics:
-            measure_browser_navi_metrics(webdriver, datasets, expected_metrics=browser_metrics['selenium_view_blog'])
 
-    measure()
+    measure_with_browser_metrics(
+        "selenium_view_blog",
+        webdriver,
+        datasets,
+        measure
+    )
 
 
 def view_dashboard(webdriver, datasets):
     dashboard_page = Dashboard(webdriver)
 
-    @print_timing("selenium_view_dashboard")
     def measure():
         dashboard_page.go_to()
         dashboard_page.wait_for_page_loaded()
-        dashboard_page.click_page_body()
         measure_dom_requests(webdriver, interaction="selenium_view_dashboard")
-        if CONFLUENCE_SETTINGS.extended_metrics:
-            measure_browser_navi_metrics(webdriver, datasets,
-                                         expected_metrics=browser_metrics['selenium_view_dashboard'])
-
-    measure()
 
+    measure_with_browser_metrics(
+        "selenium_view_dashboard",
+        webdriver,
+        datasets,
+        measure
+    )
 
 def create_confluence_page(webdriver, datasets):
     nav_panel = TopNavPanel(webdriver)
@@ -187,7 +186,6 @@ def sub_measure():
             nav_panel.click_create()
             PopupManager(webdriver).dismiss_default_popup()
             create_page.wait_for_create_page_open()
-            create_page.click_page_body()
             measure_dom_requests(webdriver, interaction="selenium_create_page:open_create_page_editor")
             if CONFLUENCE_SETTINGS.extended_metrics:
                 measure_browser_navi_metrics(webdriver, datasets,
@@ -223,7 +221,6 @@ def measure():
         def sub_measure():
             edit_page.go_to()
             edit_page.wait_for_page_loaded()
-            edit_page.click_page_body()
             measure_dom_requests(webdriver, interaction=f"selenium_edit_page_by_url:open_create_page_editor",
                                  description=page_description)
             if CONFLUENCE_SETTINGS.extended_metrics:
@@ -260,7 +257,6 @@ def sub_measure():
             PopupManager(webdriver).dismiss_default_popup()
             page.click_edit()
             edit_page.wait_for_page_loaded()
-            edit_page.click_page_body()
             measure_dom_requests(webdriver, interaction=f"selenium_quick_edit_page_click:open_create_page_editor",
                                  description=page_description)
             if CONFLUENCE_SETTINGS.extended_metrics:

app/selenium_ui/conftest.py

@@ -18,6 +18,7 @@
 
 from util.common_util import webdriver_pretty_debug
 from util.conf import CONFLUENCE_SETTINGS, JIRA_SETTINGS, BITBUCKET_SETTINGS, JSM_SETTINGS, BAMBOO_SETTINGS
+from util.confluence.browser_metrics import browser_metrics
 from util.exceptions import WebDriverExceptionPostpone
 from util.project_paths import JIRA_DATASET_ISSUES, JIRA_DATASET_JQLS, JIRA_DATASET_KANBAN_BOARDS, \
     JIRA_DATASET_PROJECTS, JIRA_DATASET_SCRUM_BOARDS, JIRA_DATASET_USERS, JIRA_DATASET_CUSTOM_ISSUES, BITBUCKET_USERS, \
@@ -139,6 +140,46 @@ def is_docker():
     )
 
 
+def measure_timing(func):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        start = time()
+        func(*args, **kwargs)
+        end = time()
+        return end - start
+    return wrapper
+
+
+def measure_with_browser_metrics(interaction_name, webdriver, datasets, measure_func):
+    """
+    Helper function that combines measure_timing + ready_for_user_timing.
+    """
+    # Step 1: Measure core operations
+    @measure_timing
+    def measure1():
+        measure_func()
+    
+    timing = measure1()
+    
+    # Step 2: Measure browser metrics AFTER core operations (not included in core timing)
+    ready_for_user_timing = None
+    if CONFLUENCE_SETTINGS.extended_metrics:
+        ready_for_user_timing = measure_browser_navi_metrics(
+            webdriver, datasets, expected_metrics=browser_metrics[interaction_name]
+        )
+    
+    # Step 3: Calculate combined timing
+    if ready_for_user_timing is not None:
+        timing = timing + (int(ready_for_user_timing) / 1000)
+    
+    # Step 4: Record combined timing using print_timing with explicit_timing
+    @print_timing(interaction_name, explicit_timing=timing)
+    def record_result():
+        pass
+    
+    record_result()
+
+
 def print_timing(interaction=None, explicit_timing=None):
     assert interaction is not None, "Interaction name is not passed to print_timing decorator"
 
@@ -295,11 +336,22 @@ def get_requests_by_url(requests, url_path):
     return filtered_requests
 
 
+def click_page_body(webdriver):
+    try:
+        body_element = webdriver.find_element("tag name", "body")
+        body_element.click()
+        print("Successfully clicked on page body")
+    except Exception as e:
+        print(f"Failed to click on page body: {e}")
+
+
 def get_wait_browser_metrics(webdriver, expected_metrics):
     attempts = 15
     sleep_time = 0.5
     data = {}
 
+    click_page_body(webdriver) #this resolves browser metric
+
     for i in range(attempts):
         requests = get_performance_logs(webdriver)
         requests_bulk = get_requests_by_url(requests, 'bulk')
@@ -398,8 +450,11 @@ def measure_browser_navi_metrics(webdriver, dataset, expected_metrics):
     lockfile = f'{selenium_results_file}.lock'
     error_msg = 'Success'
     success = True
+    ready_for_user_timing = None
+    
     if not metrics:
-        return
+        return ready_for_user_timing
+    
     with filelock.SoftFileLock(lockfile):
         with open(selenium_results_file, "a+") as jtl_file:
             for metric in metrics:
@@ -411,6 +466,8 @@ def measure_browser_navi_metrics(webdriver, dataset, expected_metrics):
                     f"{timestamp},{ready_for_user_timing},{interaction},,{error_msg},,{success},0,0,0,0,{node_ip},0\n")
                 print(
                     f"{timestamp},{ready_for_user_timing},{interaction},{error_msg},{success},{node_ip}")
+    
+    return ready_for_user_timing
 
 
 @pytest.fixture(scope="module")