update: stability improvements

Author: 07souravkunda

bin/commands/runs.js

@@ -111,7 +111,10 @@ module.exports = function run(args, rawArgs) {
     /* 
       Send build start to Observability
     */
-    if(isTestObservabilitySession) await launchTestSession(bsConfig, bsConfigPath);
+    if(isTestObservabilitySession) {
+      await launchTestSession(bsConfig, bsConfigPath);
+      utils.setO11yProcessHooks(null, bsConfig, args, null, buildReportData);
+    }
 
     // accept the system env list from bsconf and set it
     utils.setSystemEnvs(bsConfig);
@@ -264,6 +267,9 @@ module.exports = function run(args, rawArgs) {
                 markBlockEnd('createBuild');
                 markBlockEnd('total');
                 utils.setProcessHooks(data.build_id, bsConfig, bs_local, args, buildReportData);
+                if(isTestObservabilitySession) {
+                  utils.setO11yProcessHooks(data.build_id, bsConfig, bs_local, args, buildReportData);
+                }
                 let message = `${data.message}! ${Constants.userMessages.BUILD_CREATED} with build id: ${data.build_id}`;
                 let dashboardLink = `${Constants.userMessages.VISIT_DASHBOARD} ${data.dashboard_url}`;
                 buildReportData = { 'build_id': data.build_id, 'parallels': userSpecifiedParallels, ...buildReportData }

bin/helpers/utils.js

@@ -1451,8 +1451,24 @@ exports.setProcessHooks = (buildId, bsConfig, bsLocal, args, buildReportData) =>
   process.on('SIGTERM', processExitHandler.bind(this, bindData));
   process.on('SIGBREAK', processExitHandler.bind(this, bindData));
   process.on('uncaughtException', processExitHandler.bind(this, bindData));
+  process.on('beforeExit', processO11yExitHandler.bind(this, bindData));
 }
 
+exports.setO11yProcessHooks = (() => {
+  let bindData = {};
+  let handlerAdded = false;
+  return (buildId, bsConfig, bsLocal, args, buildReportData) => {
+    bindData.buildId = buildId;
+    bindData.bsConfig = bsConfig;
+    bindData.bsLocal = bsLocal;
+    bindData.args = args;
+    bindData.buildReportData = buildReportData;
+    if (handlerAdded) return;
+    handlerAdded = true;
+    process.on('beforeExit', processO11yExitHandler.bind(this, bindData));
+  }
+})()
+
 async function processExitHandler(exitData){
   logger.warn(Constants.userMessages.PROCESS_KILL_MESSAGE);
   await this.stopBrowserStackBuild(exitData.bsConfig, exitData.args, exitData.buildId, null, exitData.buildReportData);
@@ -1461,6 +1477,14 @@ async function processExitHandler(exitData){
   process.exit(0);
 }
 
+async function processO11yExitHandler(exitData){
+  if (!exitData.buildId && args.async) {
+    await printBuildLink(false);
+  } else {
+    await printBuildLink(true);
+  }
+}
+
 exports.fetchZipSize = (fileName) => {
   try {
     let stats = fs.statSync(fileName)

bin/testObservability/helper/helper.js

@@ -64,8 +64,11 @@ const supportFileCleanup = () => {
   });
 }
 
+exports.buildStopped = false;
+
 exports.printBuildLink = async (shouldStopSession, exitCode = null) => {
-  if(!this.isTestObservabilitySession()) return;
+  if(!this.isTestObservabilitySession() || exports.buildStopped) return;
+  exports.buildStopped = true;
   try {
     if(shouldStopSession) {
       supportFileCleanup();
@@ -472,6 +475,10 @@ const RequestQueueHandler = require('./requestQueueHandler');
 exports.requestQueueHandler = new RequestQueueHandler();
 
 exports.uploadEventData = async (eventData, run=0) => {
+  exports.debug("I aminside upload event data")
+  exports.debug(JSON.stringify(eventData))
+  consoleHolder.log("I aminside upload event data")
+  consoleHolder.log(JSON.stringify(eventData))
   const log_tag = {
     ['TestRunStarted']: 'Test_Start_Upload',
     ['TestRunFinished']: 'Test_End_Upload',

bin/testObservability/reporter/index.js

@@ -93,6 +93,7 @@ class MyReporter {
             delete this.runStatusMarkedHash[hook.hookAnalyticsId];
             hook.hookAnalyticsId = uuidv4();
           }
+          console.log("At hook begin ", hook.hookAnalyticsId + hook.fullTitle())
           hook.hook_started_at = (new Date()).toISOString();
           hook.started_at = (new Date()).toISOString();
           this.current_hook = hook;
@@ -101,7 +102,9 @@ class MyReporter {
       })
 
       .on(EVENT_HOOK_END, async (hook) => {
+        console.log("At hook end ", this.current_hook.hookAnalyticsId, hook.fullTitle())
         if(this.testObservability == true) {
+          // console.log("At hook end bool", this.runStatusMarkedHash[hook.hookAnalyticsId])
           if(!this.runStatusMarkedHash[hook.hookAnalyticsId]) {
             if(!hook.hookAnalyticsId) {
               /* Hook objects don't maintain uuids in Cypress-Mocha */
@@ -110,6 +113,7 @@ class MyReporter {
             } else {
               this.runStatusMarkedHash[hook.hookAnalyticsId] = true;
             }
+            console.log("Sending hook finished ", hook.hookAnalyticsId);
             await this.sendTestRunEvent(hook,undefined,false,"HookRunFinished");
           }
         }
@@ -143,21 +147,27 @@ class MyReporter {
 
       .on(EVENT_TEST_PENDING, async (test) => {
         if(this.testObservability == true) {
+          test.isSkipped = true;
           if(!test.testAnalyticsId) test.testAnalyticsId = uuidv4();
           if(!this.runStatusMarkedHash[test.testAnalyticsId]) {
             this.runStatusMarkedHash[test.testAnalyticsId] = true;
+            consoleHolder.log("Inside event for event_test_pending " + test.state);
             await this.sendTestRunEvent(test,undefined,false,"TestRunSkipped");
           }
         }
       })
 
       .on(EVENT_TEST_BEGIN, async (test) => {
+        consoleHolder.log("Inside event for event_test_begin " + test.state + " " + test.isSkipped);
+        if (test.isSkipped) return;
         if(this.testObservability == true) {
           await this.testStarted(test);
         }
       })
 
       .on(EVENT_TEST_END, async (test) => {
+        consoleHolder.log("Inside event for event_test_end " + test.state + " " + test.isSkipped);
+        if (test.isSkipped) return;
         if(this.testObservability == true) {
           if(!this.runStatusMarkedHash[test.testAnalyticsId]) {
             if(test.testAnalyticsId) this.runStatusMarkedHash[test.testAnalyticsId] = true;
@@ -253,6 +263,8 @@ class MyReporter {
   }
 
   sendTestRunEvent = async (test, err = undefined, customFinished=false, eventType = "TestRunFinished") => {
+    debug("Sending test run event for " + eventType);
+    consoleHolder.log("Sending test run event for " + eventType)
     try {
       if(test.body && test.body.match(/browserstack internal helper hook/)) return;
       let failureArgs = [];