[ci-visibility] More verbose logging for git upload (#3251)

DataDog · Jun 29, 2023 · c0b2da9 · c0b2da9
1 parent 7b729a1
commit c0b2da9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js b/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js
@@ -48,6 +48,9 @@ function getCommonRequestOptions (url) {
  */
 function getCommitsToExclude ({ url, isEvpProxy, repositoryUrl }, callback) {
   const latestCommits = getLatestCommits()
+
+  log.debug(`There were ${latestCommits.length} commits since last month.`)
+
   const [headCommit] = latestCommits
 
   const commonOptions = getCommonRequestOptions(url)
@@ -158,26 +161,35 @@ function sendGitMetadata (url, isEvpProxy, configRepositoryUrl, callback) {
     repositoryUrl = getRepositoryUrl()
   }
 
+  log.debug(`Uploading git history for repository ${repositoryUrl}`)
+
   if (!repositoryUrl) {
     return callback(new Error('Repository URL is empty'))
   }
 
   if (isShallowRepository()) {
+    log.debug('It is shallow clone, unshallowing...')
     unshallowRepository()
   }
 
   getCommitsToExclude({ url, repositoryUrl, isEvpProxy }, (err, commitsToExclude, headCommit) => {
     if (err) {
       return callback(err)
     }
+    log.debug(`There are ${commitsToExclude.length} commits to exclude.`)
+
     const commitsToUpload = getCommitsToUpload(commitsToExclude)
 
     if (!commitsToUpload.length) {
       log.debug('No commits to upload')
       return callback(null)
     }
+    log.debug(`There are ${commitsToUpload.length} commits to upload`)
+
     const packFilesToUpload = generatePackFilesForCommits(commitsToUpload)
 
+    log.debug(`Uploading ${packFilesToUpload.length} packfiles.`)
+
     if (!packFilesToUpload.length) {
       return callback(new Error('Failed to generate packfiles'))
     }

diff --git a/packages/dd-trace/src/plugins/util/exec.js b/packages/dd-trace/src/plugins/util/exec.js
@@ -1,9 +1,11 @@
 const cp = require('child_process')
+const log = require('../../log')
 
 const sanitizedExec = (cmd, flags, options = { stdio: 'pipe' }) => {
   try {
     return cp.execFileSync(cmd, flags, options).toString().replace(/(\r\n|\n|\r)/gm, '')
   } catch (e) {
+    log.error(e)
     return ''
   }
 }

diff --git a/packages/dd-trace/src/plugins/util/git.js b/packages/dd-trace/src/plugins/util/git.js
@@ -36,12 +36,8 @@ function isShallowRepository () {
 }
 
 function unshallowRepository () {
-  try {
-    sanitizedExec('git', ['config', 'remote.origin.partialclonefilter', '"blob:none"'])
-    sanitizedExec('git', ['fetch', '--shallow-since="1 month ago"', '--update-shallow', '--refetch'])
-  } catch (err) {
-    log.error(err)
-  }
+  sanitizedExec('git', ['config', 'remote.origin.partialclonefilter', '"blob:none"'])
+  sanitizedExec('git', ['fetch', '--shallow-since="1 month ago"', '--update-shallow', '--refetch'])
 }
 
 function getRepositoryUrl () {
@@ -55,7 +51,7 @@ function getLatestCommits () {
       .split('\n')
       .filter(commit => commit)
   } catch (err) {
-    log.error(err)
+    log.error(`Get latest commits failed: ${err.message}`)
     return []
   }
 }
@@ -80,7 +76,7 @@ function getCommitsToUpload (commitsToExclude) {
       .split('\n')
       .filter(commit => commit)
   } catch (err) {
-    log.error(err)
+    log.error(`Get commits to upload failed: ${err.message}`)
     return []
   }
 }