From e2451b13fcc348b1d120acacd35c5b2df506be99 Mon Sep 17 00:00:00 2001 From: rev-doshi Date: Mon, 23 Sep 2024 17:01:34 +0530 Subject: [PATCH 1/2] logs for debuggin issue --- bin/helpers/helper.js | 23 ++++++++++++++++++-- bin/testObservability/crashReporter/index.js | 4 ++-- bin/testObservability/helper/helper.js | 7 +++--- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/bin/helpers/helper.js b/bin/helpers/helper.js index 3e89e971..1023c4f5 100644 --- a/bin/helpers/helper.js +++ b/bin/helpers/helper.js @@ -55,7 +55,7 @@ exports.getPackageVersion = (package_, bsConfig = null) => { /* Try to find version from module path */ try { packages[package_] = this.requireModule(`${package_}/package.json`).version; - logger.info(`Getting ${package_} package version from module path = ${packages[package_]}`); + logger.info(`INSIDE getPackageVersion in helper Getting ${package_} package version from module path = ${packages[package_]}`); packageVersion = packages[package_]; } catch(e) { exports.debug(`Unable to find package ${package_} at module path with error ${e}`); @@ -69,7 +69,7 @@ exports.getPackageVersion = (package_, bsConfig = null) => { typeof runSettings.npm_dependencies === 'object') { if (package_ in runSettings.npm_dependencies) { packages[package_] = runSettings.npm_dependencies[package_]; - logger.info(`Getting ${package_} package version from browserstack.json = ${packages[package_]}`); + logger.info(`INSIDE getPackageVersion in helper Getting ${package_} package version from browserstack.json = ${packages[package_]}`); packageVersion = packages[package_]; } } @@ -95,6 +95,8 @@ exports.getAgentVersion = () => { } exports.getGitMetaData = () => { + logger.info("getGitMetaData o11y "); + return new Promise(async (resolve, reject) => { try { var info = getRepoInfo(); @@ -111,6 +113,23 @@ exports.getGitMetaData = () => { exports.debug(`Exception in populating Git Metadata with error : ${err}`, true, err); return resolve({}); } + + logger.info(`INSIDE getGitMetaData`); + + gitLastCommit.getLastCommit(function(err, commit) { + // read commit object properties + logger.info(`INSIDE getLastCommit commit::`); + logger.info(commit); + logger.info(commit["branch"]); + console.log('INSIDE getLastCommit commit::'); + + console.log(commit); + console.log("branch", commit["branch"]); + }); + + // if(info["branch"] == null){ + // gitLastCommit. + // } try { info["author"] = info["author"] || `${commit["author"]["name"].replace(/[“]+/g, '')} <${commit["author"]["email"].replace(/[“]+/g, '')}>`; info["authorDate"] = info["authorDate"] || commit["authoredOn"]; diff --git a/bin/testObservability/crashReporter/index.js b/bin/testObservability/crashReporter/index.js index 7433c164..737401ba 100644 --- a/bin/testObservability/crashReporter/index.js +++ b/bin/testObservability/crashReporter/index.js @@ -54,7 +54,7 @@ getPackageVersion = (package_, bsConfig = null) => { /* Try to find version from module path */ try { packages[package_] = this.requireModule(`${package_}/package.json`).version; - logger.info(`Getting ${package_} package version from module path = ${packages[package_]}`); + logger.info(`INSIDE getPackageVersion in O11y crash reporter Getting ${package_} package version from module path = ${packages[package_]}`); packageVersion = packages[package_]; } catch(e) { debug(`Unable to find package ${package_} at module path with error ${e}`); @@ -68,7 +68,7 @@ getPackageVersion = (package_, bsConfig = null) => { typeof runSettings.npm_dependencies === 'object') { if (package_ in runSettings.npm_dependencies) { packages[package_] = runSettings.npm_dependencies[package_]; - logger.info(`Getting ${package_} package version from browserstack.json = ${packages[package_]}`); + logger.info(`INSIDE getPackageVersion in O11y crash reporter Getting ${package_} package version from browserstack.json = ${packages[package_]}`); packageVersion = packages[package_]; } } diff --git a/bin/testObservability/helper/helper.js b/bin/testObservability/helper/helper.js index 1b7da41f..2f5a6c83 100644 --- a/bin/testObservability/helper/helper.js +++ b/bin/testObservability/helper/helper.js @@ -219,7 +219,7 @@ exports.getPackageVersion = (package_, bsConfig = null) => { /* Try to find version from module path */ try { packages[package_] = this.requireModule(`${package_}/package.json`).version; - logger.info(`Getting ${package_} package version from module path = ${packages[package_]}`); + logger.info(`INSIDE getPackageVersion in O11y helper Getting ${package_} package version from module path = ${packages[package_]}`); packageVersion = packages[package_]; } catch(e) { exports.debug(`Unable to find package ${package_} at module path with error ${e}`); @@ -233,7 +233,7 @@ exports.getPackageVersion = (package_, bsConfig = null) => { typeof runSettings.npm_dependencies === 'object') { if (package_ in runSettings.npm_dependencies) { packages[package_] = runSettings.npm_dependencies[package_]; - logger.info(`Getting ${package_} package version from browserstack.json = ${packages[package_]}`); + logger.info(`INSIDE getPackageVersion in O11y helper Getting ${package_} package version from browserstack.json = ${packages[package_]}`); packageVersion = packages[package_]; } } @@ -345,7 +345,8 @@ const setCrashReportingConfig = (bsConfig, bsConfigPath) => { exports.launchTestSession = async (user_config, bsConfigPath) => { setCrashReportingConfig(user_config, bsConfigPath); - + logger.info("launchTestSession o11y "); + const obsUserName = user_config["auth"]["username"]; const obsAccessKey = user_config["auth"]["access_key"]; From 057defa1c5f8fccf7220e3873033a903fc5c1f99 Mon Sep 17 00:00:00 2001 From: rev-doshi Date: Mon, 23 Sep 2024 17:46:30 +0530 Subject: [PATCH 2/2] change for adding branch --- bin/helpers/helper.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/helpers/helper.js b/bin/helpers/helper.js index 1023c4f5..3db5d594 100644 --- a/bin/helpers/helper.js +++ b/bin/helpers/helper.js @@ -127,15 +127,13 @@ exports.getGitMetaData = () => { console.log("branch", commit["branch"]); }); - // if(info["branch"] == null){ - // gitLastCommit. - // } try { info["author"] = info["author"] || `${commit["author"]["name"].replace(/[“]+/g, '')} <${commit["author"]["email"].replace(/[“]+/g, '')}>`; info["authorDate"] = info["authorDate"] || commit["authoredOn"]; info["committer"] = info["committer"] || `${commit["committer"]["name"].replace(/[“]+/g, '')} <${commit["committer"]["email"].replace(/[“]+/g, '')}>`; info["committerDate"] = info["committerDate"] || commit["committedOn"]; info["commitMessage"] = info["commitMessage"] || commit["subject"]; + info["branch"] = info["branch"] || commit["branch"]; const { remote } = await pGitconfig(info.commonGitDir); const remotes = Object.keys(remote).map(remoteName => ({name: remoteName, url: remote[remoteName]['url']}));