dd-trace 2.27.1 → 2.29.0

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

@@ -1,6 +1,7 @@
 'use strict'
 
 const tracerVersion = require('../../../../package.json').version
+const dc = require('diagnostics_channel')
 const os = require('os')
 const dependencies = require('./dependencies')
 const { sendData } = require('./send-data')
@@ -9,6 +10,9 @@ const HEARTBEAT_INTERVAL = process.env.DD_TELEMETRY_HEARTBEAT_INTERVAL
   ? Number(process.env.DD_TELEMETRY_HEARTBEAT_INTERVAL) * 1000
   : 60000
 
+const telemetryStartChannel = dc.channel('datadog:telemetry:start')
+const telemetryStopChannel = dc.channel('datadog:telemetry:stop')
+
 let config
 let pluginManager
 
@@ -103,8 +107,12 @@ function createHostObject () {
   }
 }
 
+function getTelemetryData () {
+  return { config, application, host, heartbeatInterval: HEARTBEAT_INTERVAL }
+}
+
 function start (aConfig, thePluginManager) {
-  if (!aConfig.telemetryEnabled) {
+  if (!aConfig.telemetry.enabled) {
     return
   }
   config = aConfig
@@ -118,6 +126,8 @@ function start (aConfig, thePluginManager) {
   }, HEARTBEAT_INTERVAL)
   interval.unref()
   process.on('beforeExit', onBeforeExit)
+
+  telemetryStartChannel.publish(getTelemetryData())
 }
 
 function stop () {
@@ -126,10 +136,14 @@ function stop () {
   }
   clearInterval(interval)
   process.removeListener('beforeExit', onBeforeExit)
+
+  telemetryStopChannel.publish(getTelemetryData())
+
+  config = undefined
 }
 
 function updateIntegrations () {
-  if (!config || !config.telemetryEnabled) {
+  if (!config || !config.telemetry.enabled) {
     return
   }
   const integrations = getIntegrations()

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

@@ -127,22 +127,6 @@ class DatadogTracer extends Tracer {
 <meta name="dd-trace-id" content="${traceId}" />\
 <meta name="dd-trace-time" content="${traceTime}" />`
   }
-
-  setUser (user) {
-    if (!user || !user.id) return this
-
-    const span = this.scope().active()
-    if (!span) return this
-
-    const rootSpan = span._spanContext._trace.started[0]
-    if (!rootSpan) return this
-
-    for (const k of Object.keys(user)) {
-      rootSpan.setTag(`usr.${k}`, '' + user[k])
-    }
-
-    return this
-  }
 }
 
 function addError (span, error) {

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

@@ -1,5 +1,7 @@
 'use strict'
 
+const path = require('path')
+
 function isTrue (str) {
   str = String(str).toLowerCase()
   return str === 'true' || str === '1'
@@ -61,9 +63,16 @@ function globMatch (pattern, subject) {
   return true
 }
 
+function calculateDDBasePath (dirname) {
+  const dirSteps = dirname.split(path.sep)
+  const packagesIndex = dirSteps.lastIndexOf('packages')
+  return dirSteps.slice(0, packagesIndex).join(path.sep) + path.sep
+}
+
 module.exports = {
   isTrue,
   isFalse,
   isError,
-  globMatch
+  globMatch,
+  calculateDDBasePath
 }

package/scripts/install_plugin_modules.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const fs = require('fs')
+const os = require('os')
 const path = require('path')
 const crypto = require('crypto')
 const semver = require('semver')
@@ -11,6 +12,7 @@ const externals = require('../packages/dd-trace/test/plugins/externals')
 
 const requirePackageJsonPath = require.resolve('../packages/dd-trace/src/require-package-json')
 
+const excludeList = os.arch() === 'arm64' ? ['couchbase', 'grpc', 'oracledb'] : []
 const workspaces = new Set()
 const versionLists = {}
 const deps = {}
@@ -42,6 +44,8 @@ async function run () {
   assertFolder()
   await assertVersions()
   assertWorkspace()
+  // Some native addon packages rely on libraries that are not supported on ARM64
+  excludeList.forEach(pkg => delete workspaces[pkg])
   install()
 }
 
@@ -197,7 +201,7 @@ function install () {
 
 function addFolder (name, version) {
   const basename = [name, version].filter(val => val).join('@')
-  workspaces.add(basename)
+  if (!excludeList.includes(name)) workspaces.add(basename)
 }
 
 function folder (name, version) {

package/scripts/junit_report.js

@@ -1,25 +0,0 @@
-/* eslint-disable no-console */
-
-const { execSync } = require('child_process')
-
-function uploadJUnitXMLReport () {
-  if (process.env.CIRCLE_PR_NUMBER) {
-    console.log('Running in a fork. Skipping step.')
-    return
-  }
-  // we install @datadog/datadog-ci
-  execSync('yarn global add @datadog/datadog-ci@0.13.2', { stdio: 'inherit' })
-  const service = process.env.PLUGINS ? 'plugins' : 'core'
-  // we execute the upload command
-  execSync(
-    `DD_ENV=ci datadog-ci junit upload \
-    --tags runtime.version:${process.version} \
-    --service dd-trace-js-${service}-tests \
-    ./test-results/mocha/test-results.xml`,
-    {
-      stdio: 'inherit'
-    }
-  )
-}
-
-uploadJUnitXMLReport()

package/scripts/tdd.js

@@ -1,34 +0,0 @@
-'use strict'
-
-const execSync = require('child_process').execSync
-const fs = require('fs')
-const path = require('path')
-
-const options = { stdio: [0, 1, 2] }
-const command = 'yarn services && NO_DEPRECATION=* mocha --watch --expose-gc'
-
-const base = path.join(__dirname, '..', 'packages')
-const globs = [
-  'packages/dd-trace/test/setup/node.js'
-].map(glob => `'${glob}'`).join(' ')
-
-const pluginName = /\/?datadog-plugin-([\w -]+)\/?/
-const plugins = []
-const args = process.argv.slice(2).map((arg) => {
-  if (fs.existsSync(path.join(base, `datadog-plugin-${arg}`))) {
-    plugins.push(arg)
-    return `'packages/datadog-plugin-${arg}/test/**/*.spec.js'`
-  } else if (pluginName.test(arg)) {
-    const plugin = arg.match(pluginName)[1]
-    plugins.push(plugin)
-  }
-  return arg
-}).join(' ')
-
-const pluginEnvList = plugins.join('|')
-
-if (plugins) {
-  execSync(`PLUGINS=${pluginEnvList} ${command} ${globs} ${args}`, options)
-} else {
-  execSync(`${command} ${globs} ${args}`, options)
-}