dd-trace 4.2.0 → 4.3.0

package/packages/dd-trace/src/plugins/util/git.js

@@ -1,6 +1,7 @@
-const { execSync } = require('child_process')
+const { execFileSync } = require('child_process')
 const os = require('os')
 const path = require('path')
+const fs = require('fs')
 
 const log = require('../../log')
 const { sanitizedExec } = require('./exec')
@@ -21,26 +22,35 @@ const {
 
 const GIT_REV_LIST_MAX_BUFFER = 8 * 1024 * 1024 // 8MB
 
+function isDirectory (path) {
+  try {
+    const stats = fs.statSync(path)
+    return stats.isDirectory()
+  } catch (e) {
+    return false
+  }
+}
+
 function isShallowRepository () {
-  return sanitizedExec('git rev-parse --is-shallow-repository', { stdio: 'pipe' }) === 'true'
+  return sanitizedExec('git', ['rev-parse', '--is-shallow-repository']) === 'true'
 }
 
 function unshallowRepository () {
   try {
-    execSync('git config remote.origin.partialclonefilter "blob:none"', { stdio: 'pipe' })
-    execSync('git fetch --shallow-since="1 month ago" --update-shallow --refetch', { stdio: 'pipe' })
+    sanitizedExec('git', ['config', 'remote.origin.partialclonefilter', '"blob:none"'])
+    sanitizedExec('git', ['fetch', '--shallow-since="1 month ago"', '--update-shallow', '--refetch'])
   } catch (err) {
     log.error(err)
   }
 }
 
 function getRepositoryUrl () {
-  return sanitizedExec('git config --get remote.origin.url', { stdio: 'pipe' })
+  return sanitizedExec('git', ['config', '--get', 'remote.origin.url'])
 }
 
 function getLatestCommits () {
   try {
-    return execSync('git log --format=%H -n 1000 --since="1 month ago"', { stdio: 'pipe' })
+    return execFileSync('git', ['log', '--format=%H', '-n 1000', '--since="1 month ago"'], { stdio: 'pipe' })
       .toString()
       .split('\n')
       .filter(commit => commit)
@@ -51,15 +61,21 @@ function getLatestCommits () {
 }
 
 function getCommitsToUpload (commitsToExclude) {
-  let gitCommandToGetCommitsToUpload =
-    'git rev-list --objects --no-object-names --filter=blob:none --since="1 month ago" HEAD'
-
-  commitsToExclude.forEach(commit => {
-    gitCommandToGetCommitsToUpload = `${gitCommandToGetCommitsToUpload} ^${commit}`
-  })
+  const commitsToExcludeString = commitsToExclude.map(commit => `^${commit}`)
 
   try {
-    return execSync(gitCommandToGetCommitsToUpload, { stdio: 'pipe', maxBuffer: GIT_REV_LIST_MAX_BUFFER })
+    return execFileSync(
+      'git',
+      [
+        'rev-list',
+        '--objects',
+        '--no-object-names',
+        '--filter=blob:none',
+        '--since="1 month ago"',
+        'HEAD',
+        ...commitsToExcludeString
+      ],
+      { stdio: 'pipe', maxBuffer: GIT_REV_LIST_MAX_BUFFER })
       .toString()
       .split('\n')
       .filter(commit => commit)
@@ -72,6 +88,11 @@ function getCommitsToUpload (commitsToExclude) {
 function generatePackFilesForCommits (commitsToUpload) {
   const tmpFolder = os.tmpdir()
 
+  if (!isDirectory(tmpFolder)) {
+    log.error(new Error('Provided path to generate packfiles is not a directory'))
+    return []
+  }
+
   const randomPrefix = String(Math.floor(Math.random() * 10000))
   const temporaryPath = path.join(tmpFolder, randomPrefix)
   const cwdPath = path.join(process.cwd(), randomPrefix)
@@ -79,14 +100,20 @@ function generatePackFilesForCommits (commitsToUpload) {
   // Generates pack files to upload and
   // returns the ordered list of packfiles' paths
   function execGitPackObjects (targetPath) {
-    return execSync(
-      `git pack-objects --compression=9 --max-pack-size=3m ${targetPath}`,
-      { input: commitsToUpload.join('\n') }
+    return execFileSync(
+      'git',
+      [
+        'pack-objects',
+        '--compression=9',
+        '--max-pack-size=3m',
+        targetPath
+      ],
+      { stdio: 'pipe', input: commitsToUpload.join('\n') }
     ).toString().split('\n').filter(commit => commit).map(commit => `${targetPath}-${commit}.pack`)
   }
 
   try {
-    return execGitPackObjects(temporaryPath, commitsToUpload)
+    return execGitPackObjects(temporaryPath)
   } catch (err) {
     log.error(err)
     /**
@@ -102,7 +129,7 @@ function generatePackFilesForCommits (commitsToUpload) {
      * TODO: fix issue and remove workaround.
      */
     try {
-      return execGitPackObjects(cwdPath, commitsToUpload)
+      return execGitPackObjects(cwdPath)
     } catch (err) {
       log.error(err)
     }
@@ -133,23 +160,23 @@ function getGitMetadata (ciMetadata) {
     committerName,
     committerEmail,
     committerDate
-  ] = sanitizedExec('git show -s --format=%an,%ae,%aI,%cn,%ce,%cI', { stdio: 'pipe' }).split(',')
+  ] = sanitizedExec('git', ['show', '-s', '--format=%an,%ae,%aI,%cn,%ce,%cI']).split(',')
 
   return {
     [GIT_REPOSITORY_URL]:
-      repositoryUrl || sanitizedExec('git ls-remote --get-url', { stdio: 'pipe' }),
+      repositoryUrl || sanitizedExec('git', ['ls-remote', '--get-url']),
     [GIT_COMMIT_MESSAGE]:
-      commitMessage || sanitizedExec('git show -s --format=%s', { stdio: 'pipe' }),
+      commitMessage || sanitizedExec('git', ['show', '-s', '--format=%s']),
     [GIT_COMMIT_AUTHOR_DATE]: authorDate,
     [GIT_COMMIT_AUTHOR_NAME]: ciAuthorName || authorName,
     [GIT_COMMIT_AUTHOR_EMAIL]: ciAuthorEmail || authorEmail,
     [GIT_COMMIT_COMMITTER_DATE]: committerDate,
     [GIT_COMMIT_COMMITTER_NAME]: committerName,
     [GIT_COMMIT_COMMITTER_EMAIL]: committerEmail,
-    [GIT_BRANCH]: branch || sanitizedExec('git rev-parse --abbrev-ref HEAD', { stdio: 'pipe' }),
-    [GIT_COMMIT_SHA]: commitSHA || sanitizedExec('git rev-parse HEAD', { stdio: 'pipe' }),
+    [GIT_BRANCH]: branch || sanitizedExec('git', ['rev-parse', '--abbrev-ref', 'HEAD']),
+    [GIT_COMMIT_SHA]: commitSHA || sanitizedExec('git', ['rev-parse', 'HEAD']),
     [GIT_TAG]: tag,
-    [CI_WORKSPACE_PATH]: ciWorkspacePath || sanitizedExec('git rev-parse --show-toplevel', { stdio: 'pipe' })
+    [CI_WORKSPACE_PATH]: ciWorkspacePath || sanitizedExec('git', ['rev-parse', '--show-toplevel'])
   }
 }
 

package/packages/dd-trace/src/profiling/config.js

@@ -27,6 +27,7 @@ class Config {
       DD_TRACE_AGENT_URL,
       DD_AGENT_HOST,
       DD_TRACE_AGENT_PORT,
+      DD_PROFILING_DEBUG_SOURCE_MAPS,
       DD_PROFILING_UPLOAD_TIMEOUT,
       DD_PROFILING_SOURCE_MAP,
       DD_PROFILING_UPLOAD_PERIOD,
@@ -70,6 +71,7 @@ class Config {
     this.flushInterval = flushInterval
     this.uploadTimeout = uploadTimeout
     this.sourceMap = sourceMap
+    this.debugSourceMaps = isTrue(coalesce(options.debugSourceMaps, DD_PROFILING_DEBUG_SOURCE_MAPS, false))
     this.endpointCollection = endpointCollection
     this.pprofPrefix = pprofPrefix
 

package/packages/dd-trace/src/profiling/profiler.js

@@ -4,12 +4,11 @@ const { EventEmitter } = require('events')
 const { Config } = require('./config')
 const { snapshotKinds } = require('./constants')
 
-function maybeSourceMap (sourceMap) {
+function maybeSourceMap (sourceMap, SourceMapper, debug) {
   if (!sourceMap) return
-  const { SourceMapper } = require('@datadog/pprof')
   return SourceMapper.create([
     process.cwd()
-  ])
+  ], debug)
 }
 
 class Profiler extends EventEmitter {
@@ -42,7 +41,17 @@ class Profiler extends EventEmitter {
     // of the profiler from running without source maps.
     let mapper
     try {
-      mapper = await maybeSourceMap(config.sourceMap)
+      const { setLogger, SourceMapper } = require('@datadog/pprof')
+      setLogger(config.logger)
+
+      mapper = await maybeSourceMap(config.sourceMap, SourceMapper, config.debugSourceMaps)
+      if (config.SourceMap && config.debugSourceMaps) {
+        this._logger.debug(() => {
+          return mapper.infoMap.size === 0
+            ? 'Found no source maps'
+            : `Found source maps for following files: [${Array.from(mapper.infoMap.keys()).join(', ')}]`
+        })
+      }
     } catch (err) {
       this._logger.error(err)
     }

package/packages/dd-trace/src/service-naming/schemas/v0/storage.js

@@ -12,6 +12,13 @@ function fromSystem (service, system) {
   return system ? `${service}-${system}` : undefined
 }
 
+function mysqlServiceName (service, config, dbConfig, system) {
+  if (typeof config.service === 'function') {
+    return config.service(dbConfig)
+  }
+  return config.service ? config.service : fromSystem(service, system)
+}
+
 const redisConfig = {
   opName: () => 'redis.command',
   serviceName: (service, config, system, connectionName) => {
@@ -22,11 +29,27 @@ const redisConfig = {
 const storage = {
   client: {
     ioredis: redisConfig,
+    mariadb: {
+      opName: () => 'mariadb.query',
+      serviceName: mysqlServiceName
+    },
     memcached: {
       opName: () => 'memcached.command',
       serviceName: (service, config, system) => config.service || fromSystem(service, system)
     },
-    redis: redisConfig
+    mysql: {
+      opName: () => 'mysql.query',
+      serviceName: mysqlServiceName
+    },
+    mysql2: {
+      opName: () => 'mysql.query',
+      serviceName: mysqlServiceName
+    },
+    redis: redisConfig,
+    tedious: {
+      opName: () => 'tedious.request',
+      serviceName: (service, config, system) => config.service || fromSystem(service, system)
+    }
   }
 }
 

package/packages/dd-trace/src/service-naming/schemas/v1/storage.js

@@ -1,3 +1,5 @@
+const { identityService } = require('../util')
+
 function configWithFallback (service, config) {
   return config.service || service
 }
@@ -7,14 +9,29 @@ const redisNaming = {
   serviceName: configWithFallback
 }
 
+const mySQLNaming = {
+  opName: () => 'mysql.query',
+  serviceName: identityService
+}
+
 const storage = {
   client: {
     ioredis: redisNaming,
+    mariadb: {
+      opName: () => 'mariadb.query',
+      serviceName: identityService
+    },
     memcached: {
       opName: () => 'memcached.command',
       serviceName: configWithFallback
     },
-    redis: redisNaming
+    mysql: mySQLNaming,
+    mysql2: mySQLNaming,
+    redis: redisNaming,
+    tedious: {
+      opName: () => 'mssql.query',
+      serviceName: configWithFallback
+    }
   }
 }
 

package/packages/dd-trace/src/util.js

@@ -16,7 +16,7 @@ function isError (value) {
   if (value instanceof Error) {
     return true
   }
-  if (value && value.message && value.stack) {
+  if (value && value.message) {
     return true
   }
   return false