Merge pull request #191 from browserstack/time_split

instrument zip upload time split

Author: nagpalkaran95

bin/commands/runs.js

@@ -18,6 +18,7 @@ const archiver = require("../helpers/archiver"),
   downloadBuildArtifacts = require('../helpers/buildArtifacts').downloadBuildArtifacts,
   updateNotifier = require('update-notifier'),
   pkg = require('../../package.json');
+
 module.exports = function run(args, rawArgs) {
   let bsConfigPath = utils.getConfigPath(args.cf);
   //Delete build_results.txt from log folder if already present.
@@ -201,6 +202,14 @@ module.exports = function run(args, rawArgs) {
                   test_zip_size: test_zip_size,
                   npm_zip_size: npm_zip_size,
                 };
+
+                if (zip.tests_upload_time || zip.npm_package_upload_time) {
+                  dataToSend.time_components.zip.zipUploadSplit = {
+                    tests_upload_time: zip.tests_upload_time,
+                    npm_package_upload_time: zip.npm_package_upload_time,
+                  }
+                }
+
                 if (bsConfig && bsConfig.connection_settings) {
                   if (bsConfig.connection_settings.local_mode) {
                     dataToSend.local_mode = bsConfig.connection_settings.local_mode;

bin/helpers/zipUpload.js

@@ -7,6 +7,8 @@ const config = require("./config"),
 
 const uploadSuits = (bsConfig, filePath, opts) => {
   return new Promise(function (resolve, reject) {
+    let startTime = Date.now();
+
     if (opts.urlPresent) {
       return resolve({ [opts.md5ReturnKey]: opts.url });
     }
@@ -30,6 +32,7 @@ const uploadSuits = (bsConfig, filePath, opts) => {
         if (resp.statusCode != 200) {
           if (resp.statusCode == 401) {
             if (responseData && responseData["error"]) {
+              responseData["time"] = Date.now() - startTime;
               return reject(responseData["error"]);
             } else {
               return reject(Constants.validationMessages.INVALID_DEFAULT_AUTH_PARAMS);
@@ -39,6 +42,7 @@ const uploadSuits = (bsConfig, filePath, opts) => {
             return resolve({});
           }
           if(responseData && responseData["error"]){
+            responseData["time"] = Date.now() - startTime;
             reject(responseData["error"]);
           } else {
             if (resp.statusCode == 413) {
@@ -50,6 +54,7 @@ const uploadSuits = (bsConfig, filePath, opts) => {
         } else {
           logger.info(`${opts.messages.uploadingSuccess} (${responseData[opts.md5ReturnKey]})`);
           opts.cleanupMethod();
+          responseData["time"] = Date.now() - startTime;
           resolve(responseData);
         }
       }
@@ -66,12 +71,20 @@ const uploadCypressZip = (bsConfig, md5data, packageData) => {
     let zipUpload = uploadSuits(bsConfig, config.fileName, zipOptions);
     let npmPackageUpload = uploadSuits(bsConfig, config.packageFileName, npmOptions);
     Promise.all([zipUpload, npmPackageUpload]).then(function (uploads) {
-      uploads.forEach(upload => Object.assign(obj, upload))
+      uploads.forEach(upload => {
+        if(upload.zip_url && upload.time) {
+          upload.tests_upload_time = upload.time;
+        } else if (upload.npm_package_url && upload.time) {
+          upload.npm_package_upload_time = upload.time;
+        }
+        delete upload.time;
+        Object.assign(obj, upload);
+      });
       return resolve(obj);
     }).catch((error) => {
       return reject(error);
     })
   })
 }
 
-exports.zipUpload = uploadCypressZip
+exports.zipUpload = uploadCypressZip;

test/unit/bin/helpers/zipUpload.js

@@ -110,7 +110,7 @@ describe("zipUpload", () => {
       }
       return uploadSuitsrewire(bsConfig, filePath, opts)
         .then((data) => {
-          chai.assert.deepEqual(data, {});
+          chai.assert.hasAllKeys(data, ["time"]);
         })
         .catch((_error) => {
           chai.assert.fail("Promise error");
@@ -135,7 +135,7 @@ describe("zipUpload", () => {
       }
       return uploadSuitsrewire(bsConfig, filePath, opts)
         .then((data) => {
-          chai.assert.deepEqual(data, {zip_url: 'zip_url'});
+          chai.assert.hasAllKeys(data, ["zip_url", "time"]);
         })
         .catch((_error) => {
           chai.assert.fail("Promise error");