dd-trace 3.28.0 → 3.29.0

package/packages/dd-trace/src/telemetry/dependencies.js

@@ -7,8 +7,10 @@ const { sendData } = require('./send-data')
 const dc = require('../../../diagnostics_channel')
 const { fileURLToPath } = require('url')
 
-const savedDependencies = new Set()
-const detectedDependencyNames = new Set()
+const savedDependenciesToSend = new Set()
+const detectedDependencyKeys = new Set()
+const detectedDependencyVersions = new Set()
+
 const FILE_URI_START = `file://`
 const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
 
@@ -18,14 +20,14 @@ function waitAndSend (config, application, host) {
   if (!immediate) {
     immediate = setImmediate(() => {
       immediate = null
-      if (savedDependencies.size > 0) {
-        const dependencies = Array.from(savedDependencies.values()).splice(0, 1000).map(pair => {
-          savedDependencies.delete(pair)
+      if (savedDependenciesToSend.size > 0) {
+        const dependencies = Array.from(savedDependenciesToSend.values()).splice(0, 1000).map(pair => {
+          savedDependenciesToSend.delete(pair)
           const [name, version] = pair.split(' ')
           return { name, version }
         })
         sendData(config, application, host, 'app-dependencies-loaded', { dependencies })
-        if (savedDependencies.size > 0) {
+        if (savedDependenciesToSend.size > 0) {
           waitAndSend(config, application, host)
         }
       }
@@ -46,15 +48,24 @@ function onModuleLoad (data) {
     }
     const parseResult = filename && parse(filename)
     const request = data.request || (parseResult && parseResult.name)
-    if (filename && request && isDependency(filename, request) && !detectedDependencyNames.has(request)) {
-      detectedDependencyNames.add(request)
+    const dependencyKey = parseResult && parseResult.basedir ? parseResult.basedir : request
+
+    if (filename && request && isDependency(filename, request) && !detectedDependencyKeys.has(dependencyKey)) {
+      detectedDependencyKeys.add(dependencyKey)
+
       if (parseResult) {
         const { name, basedir } = parseResult
         if (basedir) {
           try {
             const { version } = requirePackageJson(basedir, module)
-            savedDependencies.add(`${name} ${version}`)
-            waitAndSend(config, application, host)
+            const dependencyAndVersion = `${name} ${version}`
+
+            if (!detectedDependencyVersions.has(dependencyAndVersion)) {
+              savedDependenciesToSend.add(dependencyAndVersion)
+              detectedDependencyVersions.add(dependencyAndVersion)
+
+              waitAndSend(config, application, host)
+            }
           } catch (e) {
             // can not read the package.json, do nothing
           }
@@ -88,8 +99,9 @@ function stop () {
   config = null
   application = null
   host = null
-  detectedDependencyNames.clear()
-  savedDependencies.clear()
+  detectedDependencyKeys.clear()
+  savedDependenciesToSend.clear()
+  detectedDependencyVersions.clear()
   if (moduleLoadStartChannel.hasSubscribers) {
     moduleLoadStartChannel.unsubscribe(onModuleLoad)
   }

package/packages/dd-trace/src/telemetry/metrics.js

@@ -25,6 +25,10 @@ function mapToJsonArray (map) {
   return Array.from(map.values()).map(v => v.toJSON())
 }
 
+function hasPoints (metric) {
+  return metric.points.length > 0
+}
+
 class Metric {
   constructor (namespace, metric, common, tags) {
     this.namespace = namespace.toString()
@@ -172,10 +176,16 @@ class MetricsCollection extends Map {
 
   toJSON () {
     if (!this.size) return
+
+    const series = mapToJsonArray(this)
+      .filter(hasPoints)
+
+    if (!series.length) return
+
     const { namespace } = this
     return {
       namespace,
-      series: mapToJsonArray(this)
+      series
     }
   }
 }

package/scripts/install_plugin_modules.js

@@ -12,6 +12,7 @@ const externals = require('../packages/dd-trace/test/plugins/externals')
 
 const requirePackageJsonPath = require.resolve('../packages/dd-trace/src/require-package-json')
 
+// Can remove couchbase after removing support for couchbase <= 3.2.0
 const excludeList = os.arch() === 'arm64' ? ['couchbase', 'grpc', 'oracledb'] : []
 const workspaces = new Set()
 const versionLists = {}

package/scripts/version.js

@@ -1,66 +0,0 @@
-'use strict'
-
-const path = require('path')
-const fs = require('fs')
-const semver = require('semver')
-const exec = require('./helpers/exec')
-const title = require('./helpers/title')
-
-const pkg = require('../package.json')
-const increment = getIncrement()
-const version = semver.inc(pkg.version, increment, 'pre')
-
-title(`Bumping version to v${version}.`)
-
-const currentBranch = exec.pipe(`git branch --show-current`)
-
-if (currentBranch === 'master') {
-  const major = semver.major(pkg.version)
-  const nextMajor = semver.major(pkg.version) + 1
-
-  exec(`git checkout -b v${major}.x`)
-  exec(`git push -u origin HEAD`)
-
-  bump(`${nextMajor}.0.0-pre`)
-
-  exec(`git checkout v${major}.x`)
-}
-
-bump(version)
-
-exec(`git checkout ${currentBranch}`)
-
-function bump (newVersion) {
-  pkg.version = newVersion
-
-  exec(`git checkout -b v${newVersion}-bump`)
-  write('package.json', JSON.stringify(pkg, null, 2) + '\n')
-  write('packages/dd-trace/lib/version.js', `module.exports = '${newVersion}'\n`)
-  add('package.json')
-  add('packages/dd-trace/lib/version.js')
-  exec(`git commit -m "v${newVersion}"`)
-  exec(`git push -u origin HEAD`)
-}
-
-function getIncrement () {
-  const increments = ['major', 'premajor', 'minor', 'preminor', 'patch', 'prepatch', 'prerelease']
-  const index = increments.indexOf(process.argv[2])
-
-  if (index === -1) {
-    throw new Error(`increment must be one of ${increments.join(', ')}`)
-  }
-
-  return increments[index]
-}
-
-function filename (relativePath) {
-  return path.normalize(path.join(__dirname, '..', relativePath))
-}
-
-function write (file, data) {
-  fs.writeFileSync(filename(file), data)
-}
-
-function add (file) {
-  exec(`git add ${filename(file)}`)
-}