Fix: use math.ceil, calculations in bytes

TamsilAmani · TamsilAmani · commit e4e9fcf0f290 · 2024-05-23T09:56:16.000+05:30
diff --git a/packages/wdio-browserstack-service/src/constants.ts b/packages/wdio-browserstack-service/src/constants.ts
@@ -94,9 +94,9 @@ export const RERUN_ENV = 'BROWSERSTACK_RERUN'
 export const TESTOPS_BUILD_COMPLETED_ENV = 'BS_TESTOPS_BUILD_COMPLETED'
 
 // Maximum size of VCS info which is allowed
-export const MAX_GIT_META_DATA_SIZE_IN_KB = 64
+export const MAX_GIT_META_DATA_SIZE_IN_BYTES = 65536
 
 /* The value to be appended at the end if git metadata is larger than
-MAX_GIT_META_DATA_SIZE_IN_KB
+MAX_GIT_META_DATA_SIZE_IN_BYTES
 */
 export const GIT_META_DATA_TRUNCATED = '...[TRUNCATED]'
diff --git a/packages/wdio-browserstack-service/src/util.ts b/packages/wdio-browserstack-service/src/util.ts
@@ -35,7 +35,7 @@ import {
     RERUN_ENV,
     TESTOPS_BUILD_COMPLETED_ENV,
     TESTOPS_JWT_ENV,
-    MAX_GIT_META_DATA_SIZE_IN_KB,
+    MAX_GIT_META_DATA_SIZE_IN_BYTES,
     GIT_META_DATA_TRUNCATED
 } from './constants.js'
 import CrashReporter from './crash-reporter.js'
@@ -1186,13 +1186,13 @@ export function getFailureObject(error: string|Error) {
     }
 }
 
-export function truncateString(field: string, truncateSizeInKb: number) {
+export function truncateString(field: string, truncateSizeInBytes: number) {
     try {
         const bufferSizeInBytes = Buffer.from(GIT_META_DATA_TRUNCATED).length
 
         const fieldBufferObj = Buffer.from(field)
         const lenOfFieldBufferObj = fieldBufferObj.length
-        const finalLen = Math.round(lenOfFieldBufferObj - (truncateSizeInKb * 1024) - (bufferSizeInBytes))
+        const finalLen = Math.ceil(lenOfFieldBufferObj - truncateSizeInBytes - bufferSizeInBytes)
         if (finalLen > 0) {
             const truncatedString = fieldBufferObj.subarray(0, finalLen).toString() + GIT_META_DATA_TRUNCATED
             return truncatedString
@@ -1203,12 +1203,12 @@ export function truncateString(field: string, truncateSizeInKb: number) {
     return field
 }
 
-export function getSizeOfJsonObjectInKb(jsonData: Object) {
+export function getSizeOfJsonObjectInBytes(jsonData: Object) {
     try {
         if (jsonData) {
             const buffer = Buffer.from(JSON.stringify(jsonData))
 
-            return Math.floor(buffer.length/1024)
+            return buffer.length
         }
     } catch (error) {
         BStackLogger.debug(`Something went wrong while calculating size of JSON object: ${error}`)
@@ -1218,13 +1218,13 @@ export function getSizeOfJsonObjectInKb(jsonData: Object) {
 }
 
 export function checkAndTruncateVCSInfo(gitMetaData: any) {
-    const gitMetaDataSizeInKb = getSizeOfJsonObjectInKb(gitMetaData)
+    const gitMetaDataSizeInBytes = getSizeOfJsonObjectInBytes(gitMetaData)
 
-    if (gitMetaDataSizeInKb && gitMetaDataSizeInKb > 0 && gitMetaDataSizeInKb > MAX_GIT_META_DATA_SIZE_IN_KB) {
-        const truncateSize = gitMetaDataSizeInKb - MAX_GIT_META_DATA_SIZE_IN_KB
+    if (gitMetaDataSizeInBytes && gitMetaDataSizeInBytes > MAX_GIT_META_DATA_SIZE_IN_BYTES) {
+        const truncateSize = gitMetaDataSizeInBytes - MAX_GIT_META_DATA_SIZE_IN_BYTES
         const truncatedCommitMessage = truncateString(gitMetaData.commit_message, truncateSize)
         gitMetaData.commit_message = truncatedCommitMessage
-        BStackLogger.info(`The commit has been truncated. Size of commit after truncation is ${ getSizeOfJsonObjectInKb(gitMetaData) }`)
+        BStackLogger.info(`The commit has been truncated. Size of commit after truncation is ${ getSizeOfJsonObjectInBytes(gitMetaData) /1024 } KB`)
     }
 
     return gitMetaData
