Better instrument check zip present (#164)

* better instrument check zip present

* close block on error

* spec fix

Co-authored-by: Sparsh Agarwal <[email protected]>

Author: sparsh00

bin/commands/runs.js

@@ -93,7 +93,7 @@ module.exports = function run(args) {
       utils.warnSpecLimit(bsConfig, args, specFiles);
       markBlockEnd('preArchiveSteps');
       markBlockStart('checkAlreadyUploaded');
-      return checkUploaded.checkUploadedMd5(bsConfig, args).then(function (md5data) {
+      return checkUploaded.checkUploadedMd5(bsConfig, args, {markBlockStart, markBlockEnd}).then(function (md5data) {
         markBlockEnd('checkAlreadyUploaded');
 
         // Archive the spec files

bin/helpers/checkUploaded.js

@@ -10,7 +10,7 @@ const crypto = require('crypto'),
   utils = require('./utils');
 
 
-const checkSpecsMd5 = (runSettings, excludeFiles) => {
+const checkSpecsMd5 = (runSettings, excludeFiles, instrumentBlocks) => {
   return new Promise(function (resolve, reject) {
     let cypressFolderPath = path.dirname(runSettings.cypressConfigFilePath);
     let ignoreFiles = utils.getFilesToIgnore(runSettings, excludeFiles, false);
@@ -19,7 +19,7 @@ const checkSpecsMd5 = (runSettings, excludeFiles) => {
       ignore: ignoreFiles,
       pattern: `**/*.+(${Constants.allowedFileTypes.join("|")})`
     };
-    hashHelper.hashWrapper(options).then(function (data) {
+    hashHelper.hashWrapper(options, instrumentBlocks).then(function (data) {
       const outputHash = crypto.createHash(Constants.hashingOptions.algo);
       outputHash.update(data);
       outputHash.update(checkPackageMd5(runSettings));
@@ -62,17 +62,21 @@ const checkPackageMd5 = (runSettings) => {
   return outputHash.digest(Constants.hashingOptions.encoding)
 };
 
-const checkUploadedMd5 = (bsConfig, args) => {
+const checkUploadedMd5 = (bsConfig, args, instrumentBlocks) => {
   return new Promise(function (resolve) {
     let obj = {
       zipUrlPresent: false,
     };
     if (args["force-upload"]) {
       return resolve(obj);
     }
-    checkSpecsMd5(bsConfig.run_settings, args.exclude).then(function (md5data) {
+    instrumentBlocks.markBlockStart("checkAlreadyUploaded.md5Total");
+    checkSpecsMd5(bsConfig.run_settings, args.exclude, instrumentBlocks).then(function (md5data) {
       Object.assign(obj, {md5sum: md5data});
+      instrumentBlocks.markBlockStart("checkAlreadyUploaded.md5Package");
       let package_md5sum = checkPackageMd5(bsConfig.run_settings);
+      instrumentBlocks.markBlockEnd("checkAlreadyUploaded.md5Package");
+      instrumentBlocks.markBlockEnd("checkAlreadyUploaded.md5Total");
       let data = JSON.stringify({ zip_md5sum: md5data, instrument_package_md5sum: package_md5sum});
 
       let options = {
@@ -88,8 +92,10 @@ const checkUploadedMd5 = (bsConfig, args) => {
         body: data
       };
 
+      instrumentBlocks.markBlockStart("checkAlreadyUploaded.railsCheck");
       request.post(options, function (err, resp, body) {
         if (err) {
+          instrumentBlocks.markBlockEnd("checkAlreadyUploaded.railsCheck");
           resolve(obj);
         } else {
           let zipData = null;
@@ -101,6 +107,7 @@ const checkUploadedMd5 = (bsConfig, args) => {
           if (resp.statusCode === 200 && !utils.isUndefined(zipData.zipUrl)) {
             Object.assign(obj, zipData, {zipUrlPresent: true});
           }
+          instrumentBlocks.markBlockEnd("checkAlreadyUploaded.railsCheck");
           resolve(obj);
         }
       });

bin/helpers/hashUtil.js

@@ -4,12 +4,16 @@ const glob = require('readdir-glob'),
   crypto = require('crypto'),
   fs = require('fs');
 
-const hashWrapper = (options) => {
+const hashWrapper = (options, instrumentBlocks) => {
+  instrumentBlocks.markBlockStart("checkAlreadyUploaded.md5Stats");
   return folderStats(options).then((files) => {
+    instrumentBlocks.markBlockEnd("checkAlreadyUploaded.md5Stats");
+    instrumentBlocks.markBlockStart("checkAlreadyUploaded.md5Batch");
     return batchHashFile(files);
   }).then((hashes) => {
     const combinedHash = crypto.createHash(Constants.hashingOptions.algo);
     hashes.forEach((hash) => combinedHash.update(hash));
+    instrumentBlocks.markBlockEnd("checkAlreadyUploaded.md5Batch");
     return combinedHash.digest(Constants.hashingOptions.encoding);
   });
 }

test/unit/bin/helpers/checkUploaded.js

@@ -43,8 +43,11 @@ describe("checkUploaded", () => {
         checkSpecsMd5: checkSpecsMd5Stub
       });
       let checkUploadedMd5rewire = checkUploaded.__get__('checkUploadedMd5');
-
-      return checkUploadedMd5rewire(bsConfig, {})
+      let instrumentBlocks = {
+        markBlockStart: sinon.stub(),
+        markBlockEnd: sinon.stub()
+      }
+      return checkUploadedMd5rewire(bsConfig, {}, instrumentBlocks)
         .then(function (data) {
           chai.assert.equal(data.md5sum, 'random_md5sum');
           chai.assert.equal(data.zipUrlPresent, false);
@@ -67,8 +70,11 @@ describe("checkUploaded", () => {
         checkSpecsMd5: checkSpecsMd5Stub
       });
       let checkUploadedMd5rewire = checkUploaded.__get__('checkUploadedMd5');
-
-      return checkUploadedMd5rewire(bsConfig, {})
+      let instrumentBlocks = {
+        markBlockStart: sinon.stub(),
+        markBlockEnd: sinon.stub()
+      }
+      return checkUploadedMd5rewire(bsConfig, {}, instrumentBlocks)
         .then(function (data) {
           chai.assert.deepEqual(data, { md5sum: 'random_md5sum', zipUrlPresent: true, zipUrl: 'bs://random_hashid' })
           sinon.assert.calledOnce(requestStub);
@@ -90,8 +96,11 @@ describe("checkUploaded", () => {
         checkSpecsMd5: checkSpecsMd5Stub
       });
       let checkUploadedMd5rewire = checkUploaded.__get__('checkUploadedMd5');
-
-      return checkUploadedMd5rewire(bsConfig, {})
+      let instrumentBlocks = {
+        markBlockStart: sinon.stub(),
+        markBlockEnd: sinon.stub()
+      }
+      return checkUploadedMd5rewire(bsConfig, {}, instrumentBlocks)
         .then(function (data) {
           chai.assert.deepEqual(data, { md5sum: 'random_md5sum', zipUrlPresent: false })
           sinon.assert.calledOnce(requestStub);