dd-trace 3.12.1 → 3.15.0

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

@@ -1,7 +1,6 @@
 'use strict'
 
 const tracerVersion = require('../../../../package.json').version
-const containerId = require('../exporters/common/docker').id()
 const os = require('os')
 const dependencies = require('./dependencies')
 const { sendData } = require('./send-data')
@@ -76,9 +75,31 @@ function createAppObject () {
 }
 
 function createHostObject () {
+  const osName = os.type()
+
+  if (osName === 'Linux' || osName === 'Darwin') {
+    return {
+      hostname: os.hostname(),
+      os: osName,
+      architecture: os.arch(),
+      kernel_version: os.version(),
+      kernel_release: os.release(),
+      kernel_name: osName
+    }
+  }
+
+  if (osName === 'Windows_NT') {
+    return {
+      hostname: os.hostname(),
+      os: osName,
+      architecture: os.arch(),
+      os_version: os.version()
+    }
+  }
+
   return {
     hostname: os.hostname(), // TODO is this enough?
-    container_id: containerId
+    os: osName
   }
 }
 

package/packages/dd-trace/src/telemetry/send-data.js

@@ -6,6 +6,9 @@ function sendData (config, application, host, reqType, payload = {}) {
     port,
     url
   } = config
+
+  const { logger, tags, serviceMapping, ...trimmedPayload } = payload
+
   const options = {
     url,
     hostname,
@@ -24,7 +27,7 @@ function sendData (config, application, host, reqType, payload = {}) {
     tracer_time: Math.floor(Date.now() / 1000),
     runtime_id: config.tags['runtime-id'],
     seq_id: ++seqId,
-    payload,
+    payload: trimmedPayload,
     application,
     host
   })

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

@@ -123,22 +123,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/scripts/check-proposal-labels.js

@@ -0,0 +1,71 @@
+/* eslint-disable no-console */
+
+const childProcess = require('child_process')
+const ORIGIN = 'origin/'
+
+let releaseBranch = process.env['GITHUB_BASE_REF'] // 'origin/v3.x'
+let releaseVersion = releaseBranch
+if (releaseBranch.startsWith(ORIGIN)) {
+  releaseVersion = releaseBranch.substring(ORIGIN.length)
+} else {
+  releaseBranch = ORIGIN + releaseBranch
+}
+let currentBranch = process.env['GITHUB_HEAD_REF'] // 'ugaitz/workflow-to-verify-dont-land-on-v3.x'
+if (!currentBranch.startsWith(ORIGIN)) {
+  currentBranch = ORIGIN + currentBranch
+}
+
+const getHashesCommandWithExclusions = 'branch-diff --user DataDog --repo dd-trace-js --exclude-label=semver-major' +
+  ` --exclude-label=dont-land-on-${releaseVersion} ${releaseBranch} ${currentBranch}`
+const getHashesCommandWithoutExclusions =
+  `branch-diff --user DataDog --repo dd-trace-js ${releaseBranch} ${currentBranch}`
+
+childProcess.exec(getHashesCommandWithExclusions, { timeout: 30000 },
+  (withExclusionError, withExclusionStdout, withExclusionStderr) => {
+    if (withExclusionError) {
+      console.error(`stdout:
+${withExclusionStdout}
+stderr:
+${withExclusionStderr}
+`, withExclusionError)
+      process.exit(1)
+      return
+    }
+    if (withExclusionStderr) {
+      console.error(withExclusionStderr)
+      process.exit(1)
+      return
+    }
+    const commitsHashesWithExclusions = withExclusionStdout.split('\n')
+
+    childProcess.exec(getHashesCommandWithoutExclusions,
+      (withoutExclusionError, withoutExclusionStdout, withoutExclusionStderr) => {
+        if (withoutExclusionError) {
+          console.error(`stdout:
+${withoutExclusionStdout}
+stderr:
+${withoutExclusionStderr}
+`, withoutExclusionError)
+          process.exit(1)
+          return
+        }
+        if (withoutExclusionStderr) {
+          console.error(withoutExclusionStderr)
+          process.exit(1)
+          return
+        }
+        const commitsHashesWithoutExclusions = withoutExclusionStdout.split('\n')
+        if (commitsHashesWithExclusions.length !== commitsHashesWithoutExclusions.length) {
+          const commitsWithInvalidLabels = []
+          commitsHashesWithoutExclusions.filter(c1 => {
+            if (!commitsHashesWithExclusions.some(c2 => c2 === c1)) {
+              commitsWithInvalidLabels.push(c1)
+            }
+          })
+          console.error('Some excluded label added in the release proposal', commitsWithInvalidLabels)
+          process.exit(1)
+        } else {
+          console.log('Commit PRs label looks OK')
+        }
+      })
+  })

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

@@ -1,143 +0,0 @@
-'use strict'
-
-const { storage } = require('../../datadog-core')
-
-const _default = {
-  debug: msg => console.debug(msg), /* eslint-disable-line no-console */
-  info: msg => console.info(msg), /* eslint-disable-line no-console */
-  warn: msg => console.warn(msg), /* eslint-disable-line no-console */
-  error: msg => console.error(msg) /* eslint-disable-line no-console */
-}
-
-// based on: https://github.com/trentm/node-bunyan#levels
-const _logLevels = {
-  'debug': 20,
-  'info': 30,
-  'warn': 40,
-  'error': 50
-}
-
-const _defaultLogLevel = 'debug'
-
-const _checkLogLevel = (logLevel) => {
-  if (logLevel && typeof logLevel === 'string') {
-    return _logLevels[logLevel.toLowerCase().trim()] || _logLevels[_defaultLogLevel]
-  }
-
-  return _logLevels[_defaultLogLevel]
-}
-
-const memoize = func => {
-  const cache = {}
-  const memoized = function (key) {
-    if (!cache[key]) {
-      cache[key] = func.apply(this, arguments)
-    }
-
-    return cache[key]
-  }
-
-  return memoized
-}
-
-function processMsg (msg) {
-  return typeof msg === 'function' ? msg() : msg
-}
-
-function withNoop (fn) {
-  const store = storage.getStore()
-
-  storage.enterWith({ noop: true })
-  fn()
-  storage.enterWith(store)
-}
-
-const log = {
-  _isLogLevelEnabled (level) {
-    return _logLevels[level] >= this._logLevel
-  },
-
-  use (logger) {
-    if (logger && logger.debug instanceof Function && logger.error instanceof Function) {
-      this._logger = logger
-    }
-
-    return this
-  },
-
-  toggle (enabled, logLevel, tracer) {
-    this._enabled = enabled
-    this._logLevel = _checkLogLevel(logLevel)
-    this._tracer = tracer
-
-    return this
-  },
-
-  reset () {
-    this._logger = _default
-    this._enabled = false
-    this._deprecate = memoize((code, message) => {
-      withNoop(() => this._logger.error(message))
-      return this
-    })
-    this._logLevel = _checkLogLevel()
-
-    return this
-  },
-
-  debug (message) {
-    if (this._enabled && this._isLogLevelEnabled('debug')) {
-      withNoop(() => this._logger.debug(processMsg(message)))
-    }
-
-    return this
-  },
-
-  info (message) {
-    if (!this._logger.info) return this.debug(message)
-    if (this._enabled && this._isLogLevelEnabled('info')) {
-      withNoop(() => this._logger.info(processMsg(message)))
-    }
-
-    return this
-  },
-
-  warn (message) {
-    if (!this._logger.warn) return this.debug(message)
-    if (this._enabled && this._isLogLevelEnabled('warn')) {
-      withNoop(() => this._logger.warn(processMsg(message)))
-    }
-
-    return this
-  },
-
-  error (err) {
-    if (this._enabled && this._isLogLevelEnabled('error')) {
-      if (err instanceof Function) {
-        err = err()
-      }
-
-      if (typeof err !== 'object' || !err) {
-        err = String(err)
-      } else if (!err.stack) {
-        err = String(err.message || err)
-      }
-
-      if (typeof err === 'string') {
-        err = new Error(err)
-      }
-
-      withNoop(() => this._logger.error(err))
-    }
-
-    return this
-  },
-
-  deprecate (code, message) {
-    return this._deprecate(code, message)
-  }
-}
-
-log.reset()
-
-module.exports = log