Bug 1763474 - Report thread wake-ups and CPU time per thread through glean, r=gerald,chutten

Differential Revision: https://phabricator.services.mozilla.com/D141147

toolkit/components/processtools/metrics.yaml

@@ -157,3 +157,143 @@ power:
       - florian@mozilla.com
     expires: never
     telemetry_mirror: POWER_TOTAL_THREAD_WAKEUPS
+
+power.wakeups_per_thread:
+  parent_active: &per_thread_wakeups
+    type: labeled_counter
+    description: >
+      How many times threads woke up and could have woken up a CPU core.
+      Broken down by thread name for a given process type.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1763474
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1763474
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - florian@mozilla.com
+    expires: never
+    labels: &per_thread_labels
+      - asynclogger
+      - audioipc
+      - audioipc_callback_rpc
+      - audioipc_client_callback
+      - audioipc_client_rpc
+      - audioipc_devicecollection_rpc
+      - audioipc_server_callback
+      - audioipc_server_rpc
+      - backgroundthreadpool
+      - bgiothreadpool
+      - bgreadurls
+      - bhmgr_monitor
+      - bhmgr_processor
+      - cameras_ipc
+      - capturethread
+      - classifier_update
+      - com_mta
+      - compositor
+      - cookie
+      - cubeboperation
+      - datachannel_io
+      - dns_resolver
+      - dom_worker
+      - domcachethread
+      - extensionprotocolhandler
+      - font_loader
+      - fontenumthread
+      - fs_broker
+      - geckomain
+      - gmpthread
+      - graphrunner
+      - html5_parser
+      - imagebridgechld
+      - imageio
+      - indexeddb
+      - initfontlist
+      - inotifyeventthread
+      - ipc_i_o_child
+      - ipc_i_o_parent
+      - ipc_launch
+      - ipdl_background
+      - js_watchdog
+      - jump_list
+      - libwebrtcmodulethread
+      - link_monitor
+      - ls_thread
+      - mediacache
+      - mediadecoderstatemachine
+      - mediapdecoder
+      - mediasupervisor
+      - mediatimer
+      - mediatrackgrph
+      - memorypoller
+      - mozstorage
+      - mtransport
+      - netlink_monitor
+      - pacerthread
+      - permission
+      - playeventsound
+      - processhangmon
+      - profilerchild
+      - proxyresolution
+      - quotamanager_io
+      - registerfonts
+      - remotebackbuffer
+      - remotelzystream
+      - remvidchild
+      - renderer
+      - sandboxreporter
+      - savescripts
+      - socket_thread
+      - softwarevsyncthread
+      - ssl_cert
+      - startupcache
+      - streamtrans
+      - stylethread
+      - swcomposite
+      - taskcontroller
+      - timer
+      - toastbgthread
+      - trr_background
+      - untrusted_modules
+      - url_classifier
+      - videocapture
+      - vsynciothread
+      - webrtccallthread
+      - webrtcworker
+      - wincompositor
+      - windowsvsyncthread
+      - winwindowocclusioncalc
+      - worker_launcher
+      - wrrenderbackend
+      - wrscenebuilder
+      - wrscenebuilderlp
+      - wrworker
+      - wrworkerlp
+
+  parent_inactive: *per_thread_wakeups
+  content_foreground: *per_thread_wakeups
+  content_background: *per_thread_wakeups
+  gpu_process: *per_thread_wakeups
+
+power.cpu_ms_per_thread:
+  parent_active: &per_thread_cpu_ms
+    type: labeled_counter
+    description: >
+      How many miliseconds of CPU time were used.
+      Broken down by thread name for a given process type.
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1763474
+    data_reviews:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1763474
+    data_sensitivity:
+      - technical
+    notification_emails:
+      - florian@mozilla.com
+    expires: never
+    labels: *per_thread_labels
+
+  parent_inactive: *per_thread_cpu_ms
+  content_foreground: *per_thread_cpu_ms
+  content_background: *per_thread_cpu_ms
+  gpu_process: *per_thread_cpu_ms

toolkit/components/processtools/tests/browser/browser_test_powerMetrics.js

@@ -287,4 +287,45 @@ add_task(async () => {
     undefined,
     "no GPU time should be recorded in the __other__ label"
   );
+
+  // Now test per-thread CPU time.
+  // We don't test parentActive as the user is not marked active on infra.
+  let processTypes = [
+    "parentInactive",
+    "contentBackground",
+    "contentForeground",
+  ];
+  if (beforeProcInfo.children.some(p => p.type == "gpu")) {
+    processTypes.push("gpuProcess");
+  }
+  // The list of accepted labels is not accessible to the JS code, so test only the main thread.
+  const kThreadName = "geckomain";
+  if (AppConstants.NIGHTLY_BUILD) {
+    for (let processType of processTypes) {
+      Assert.greater(
+        Glean.powerCpuMsPerThread[processType][kThreadName].testGetValue(),
+        0,
+        `some CPU time should have been recorded for the ${processType} main thread`
+      );
+      Assert.greater(
+        Glean.powerWakeupsPerThread[processType][kThreadName].testGetValue(),
+        0,
+        `some thread wake ups should have been recorded for the ${processType} main thread`
+      );
+    }
+  } else {
+    // We are not recording per thread CPU use outside of the Nightly channel.
+    for (let processType of processTypes) {
+      Assert.equal(
+        Glean.powerCpuMsPerThread[processType][kThreadName].testGetValue(),
+        undefined,
+        `no CPU time should have been recorded for the ${processType} main thread`
+      );
+      Assert.equal(
+        Glean.powerWakeupsPerThread[processType][kThreadName].testGetValue(),
+        undefined,
+        `no thread wake ups should have been recorded for the ${processType} main thread`
+      );
+    }
+  }
 });