From 8473cdc5af30729079be68623c1137d817235745 Mon Sep 17 00:00:00 2001 From: Sagar Khatri Date: Tue, 21 Dec 2021 19:23:29 +0530 Subject: [PATCH 1/3] Added new fields for upload details instru --- bin/commands/runs.js | 12 ++++++++++++ bin/helpers/usageReporting.js | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/bin/commands/runs.js b/bin/commands/runs.js index 2c42cd46..e6d56967 100644 --- a/bin/commands/runs.js +++ b/bin/commands/runs.js @@ -201,6 +201,18 @@ module.exports = function run(args, rawArgs) { build_id: data.build_id, test_zip_size: test_zip_size, npm_zip_size: npm_zip_size, + test_suite_zip_upload: md5data.zipUrlPresent ? 0 : 1, + package_zip_upload: md5data.packageUrlPresent ? 0 : 1 + }; + + if (!md5data.zipUrlPresent && zip.tests_upload_time) { + dataToSend.test_suite_zip_size = parseFloat((test_zip_size / 1024).toFixed(2)); + dataToSend.test_suite_zip_upload_avg_speed = parseFloat(((test_zip_size * 1000) / (1024 * zip.tests_upload_time)).toFixed(2)) + }; + + if (!md5data.packageUrlPresent && zip.npm_package_upload_time) { + dataToSend.npm_package_zip_size = parseFloat((npm_zip_size / 1024).toFixed(2)), + dataToSend.npm_package_zip_upload_avg_speed = parseFloat(((npm_zip_size * 1000) / (1024 * zip.npm_package_upload_time)).toFixed(2)) }; if (zip.tests_upload_time || zip.npm_package_upload_time) { diff --git a/bin/helpers/usageReporting.js b/bin/helpers/usageReporting.js index 14a93235..74ba27ae 100644 --- a/bin/helpers/usageReporting.js +++ b/bin/helpers/usageReporting.js @@ -191,6 +191,19 @@ function send(args) { delete args.bstack_config; + let uploadDetails = { + test_suite_zip_upload: data.test_suite_zip_upload, + package_zip_upload: data.package_zip_upload, + test_suite_zip_size: data.test_suite_zip_size, + test_suite_zip_upload_avg_speed: data.test_suite_zip_upload_avg_speed, + npm_package_zip_size: data.npm_package_zip_size, + npm_package_zip_upload_avg_speed: data.npm_package_zip_upload_avg_speed, + } + + Object.keys(uploadDetails).forEach((key) => { + delete data[key]; + }) + const payload = { event_type: "cypress_cli_stats", data: { @@ -211,6 +224,7 @@ function send(args) { event_timestamp: new Date().toLocaleString(), data: JSON.stringify(data), raw_args: JSON.stringify(args.raw_args), + ...uploadDetails, ...args, }, }; From 752844a37aa3383f429ecfe7d447de26546c7dc6 Mon Sep 17 00:00:00 2001 From: Sagar Khatri Date: Mon, 27 Dec 2021 14:07:08 +0530 Subject: [PATCH 2/3] Minor change --- bin/helpers/usageReporting.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/helpers/usageReporting.js b/bin/helpers/usageReporting.js index 74ba27ae..e2e992c8 100644 --- a/bin/helpers/usageReporting.js +++ b/bin/helpers/usageReporting.js @@ -191,7 +191,7 @@ function send(args) { delete args.bstack_config; - let uploadDetails = { + let zipUploadDetails = { test_suite_zip_upload: data.test_suite_zip_upload, package_zip_upload: data.package_zip_upload, test_suite_zip_size: data.test_suite_zip_size, @@ -200,7 +200,7 @@ function send(args) { npm_package_zip_upload_avg_speed: data.npm_package_zip_upload_avg_speed, } - Object.keys(uploadDetails).forEach((key) => { + Object.keys(zipUploadDetails).forEach((key) => { delete data[key]; }) @@ -224,7 +224,7 @@ function send(args) { event_timestamp: new Date().toLocaleString(), data: JSON.stringify(data), raw_args: JSON.stringify(args.raw_args), - ...uploadDetails, + ...zipUploadDetails, ...args, }, }; From 8fdc3d2abf8c964ef039970c93056a8745967742 Mon Sep 17 00:00:00 2001 From: Sagar Khatri Date: Mon, 3 Jan 2022 12:43:47 +0530 Subject: [PATCH 3/3] Minor fix --- bin/commands/runs.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/commands/runs.js b/bin/commands/runs.js index e6d56967..923808d7 100644 --- a/bin/commands/runs.js +++ b/bin/commands/runs.js @@ -207,12 +207,12 @@ module.exports = function run(args, rawArgs) { if (!md5data.zipUrlPresent && zip.tests_upload_time) { dataToSend.test_suite_zip_size = parseFloat((test_zip_size / 1024).toFixed(2)); - dataToSend.test_suite_zip_upload_avg_speed = parseFloat(((test_zip_size * 1000) / (1024 * zip.tests_upload_time)).toFixed(2)) + dataToSend.test_suite_zip_upload_avg_speed = parseFloat(((test_zip_size * 1000) / (1024 * zip.tests_upload_time)).toFixed(2)); }; if (!md5data.packageUrlPresent && zip.npm_package_upload_time) { - dataToSend.npm_package_zip_size = parseFloat((npm_zip_size / 1024).toFixed(2)), - dataToSend.npm_package_zip_upload_avg_speed = parseFloat(((npm_zip_size * 1000) / (1024 * zip.npm_package_upload_time)).toFixed(2)) + dataToSend.npm_package_zip_size = parseFloat((npm_zip_size / 1024).toFixed(2)); + dataToSend.npm_package_zip_upload_avg_speed = parseFloat(((npm_zip_size * 1000) / (1024 * zip.npm_package_upload_time)).toFixed(2)); }; if (zip.tests_upload_time || zip.npm_package_upload_time) {