dd-trace 1.5.0 → 1.7.0

package/packages/dd-trace/src/encode/0.4.js

@@ -61,13 +61,15 @@ class AgentEncoder {
     this._encodeArrayPrefix(bytes, trace)
 
     for (const span of trace) {
+      bytes.reserve(1)
+
       if (span.type) {
-        bytes.push(0x8c)
+        bytes.buffer[bytes.length++] = 0x8c
 
         this._encodeString(bytes, 'type')
         this._encodeString(bytes, span.type)
       } else {
-        bytes.push(0x8b)
+        bytes.buffer[bytes.length++] = 0x8b
       }
 
       this._encodeString(bytes, 'trace_id')
@@ -107,52 +109,105 @@ class AgentEncoder {
 
   _encodeArrayPrefix (bytes, value) {
     const length = value.length
+    const buffer = bytes.buffer
+    const offset = bytes.length
+
+    bytes.reserve(5)
+    bytes.length += 5
 
-    bytes.push(0xdd, length >> 24, length >> 16, length >> 8, length)
+    buffer[offset] = 0xdd
+    buffer[offset + 1] = length >> 24
+    buffer[offset + 2] = length >> 16
+    buffer[offset + 3] = length >> 8
+    buffer[offset + 4] = length
   }
 
   _encodeByte (bytes, value) {
-    bytes.push(value)
+    const buffer = bytes.buffer
+
+    bytes.reserve(1)
+
+    buffer[bytes.length++] = value
   }
 
   _encodeId (bytes, id) {
+    const buffer = bytes.buffer
+    const offset = bytes.length
+
+    bytes.reserve(9)
+    bytes.length += 9
+
     id = id.toArray()
-    bytes.push(0xcf, id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7])
+
+    buffer[offset] = 0xcf
+    buffer[offset + 1] = id[0]
+    buffer[offset + 2] = id[1]
+    buffer[offset + 3] = id[2]
+    buffer[offset + 4] = id[3]
+    buffer[offset + 5] = id[4]
+    buffer[offset + 6] = id[5]
+    buffer[offset + 7] = id[6]
+    buffer[offset + 8] = id[7]
   }
 
   _encodeInteger (bytes, value) {
-    bytes.push(0xce, value >> 24, value >> 16, value >> 8, value)
+    const buffer = bytes.buffer
+    const offset = bytes.length
+
+    bytes.reserve(5)
+    bytes.length += 5
+
+    buffer[offset] = 0xce
+    buffer[offset + 1] = value >> 24
+    buffer[offset + 2] = value >> 16
+    buffer[offset + 3] = value >> 8
+    buffer[offset + 4] = value
   }
 
   _encodeLong (bytes, value) {
+    const buffer = bytes.buffer
+    const offset = bytes.length
     const hi = (value / Math.pow(2, 32)) >> 0
     const lo = value >>> 0
 
-    bytes.push(0xcf, hi >> 24, hi >> 16, hi >> 8, hi, lo >> 24, lo >> 16, lo >> 8, lo)
+    bytes.reserve(9)
+    bytes.length += 9
+
+    buffer[offset] = 0xcf
+    buffer[offset + 1] = hi >> 24
+    buffer[offset + 2] = hi >> 16
+    buffer[offset + 3] = hi >> 8
+    buffer[offset + 4] = hi
+    buffer[offset + 5] = lo >> 24
+    buffer[offset + 6] = lo >> 16
+    buffer[offset + 7] = lo >> 8
+    buffer[offset + 8] = lo
   }
 
   _encodeMap (bytes, value) {
-    const keys = []
-    const allKeys = Object.keys(value)
+    const keys = Object.keys(value)
+    const buffer = bytes.buffer
+    const offset = bytes.length
 
-    let key = ''
+    bytes.reserve(5)
+    bytes.length += 5
 
-    for (let i = 0, l = allKeys.length; i < l; i++) {
-      key = allKeys[i]
-      if (typeof value[key] !== 'function') {
-        keys.push(key)
-      }
-    }
+    let length = 0
 
-    const length = keys.length
+    for (const key of keys) {
+      if (typeof value[key] !== 'string' && typeof value[key] !== 'number') return
 
-    bytes.push(0xdf, length >> 24, length >> 16, length >> 8, length)
+      length++
 
-    for (let i = 0; i < length; i++) {
-      key = keys[i]
       this._encodeString(bytes, key)
       this._encodeValue(bytes, value[key])
     }
+
+    buffer[offset] = 0xdf
+    buffer[offset + 1] = length >> 24
+    buffer[offset + 2] = length >> 16
+    buffer[offset + 3] = length >> 8
+    buffer[offset + 4] = length
   }
 
   _encodeValue (bytes, value) {
@@ -179,15 +234,21 @@ class AgentEncoder {
   _encodeFloat (bytes, value) {
     float64Array[0] = value
 
-    bytes.push(0xcb)
+    const buffer = bytes.buffer
+    const offset = bytes.length
+
+    bytes.reserve(9)
+    bytes.length += 9
+
+    buffer[offset] = 0xcb
 
     if (bigEndian) {
       for (let i = 0; i <= 7; i++) {
-        bytes.push(uInt8Float64Array[i])
+        buffer[offset + i + 1] = uInt8Float64Array[i]
       }
     } else {
       for (let i = 7; i >= 0; i--) {
-        bytes.push(uInt8Float64Array[i])
+        buffer[bytes.length - i - 1] = uInt8Float64Array[i]
       }
     }
   }

package/packages/dd-trace/src/encode/chunk.js

@@ -14,26 +14,24 @@ class Chunk {
     this._minSize = minSize
   }
 
-  push (...bytes) {
-    this._reserve(bytes.length)
-
-    for (const byte of bytes) {
-      this.buffer[this.length++] = byte
-    }
-  }
-
   write (value) {
     const length = Buffer.byteLength(value)
     const offset = this.length
 
     if (length < 0x20) { // fixstr
-      this.push(length | 0xa0)
+      this.reserve(length + 1)
+      this.length += 1
+      this.buffer[offset] = length | 0xa0
     } else if (length < 0x100000000) { // str 32
-      this.push(0xdb, length >> 24, length >> 16, length >> 8, length)
+      this.reserve(length + 5)
+      this.length += 5
+      this.buffer[offset] = 0xdb
+      this.buffer[offset + 1] = length >> 24
+      this.buffer[offset + 2] = length >> 16
+      this.buffer[offset + 3] = length >> 8
+      this.buffer[offset + 4] = length
     }
 
-    this._reserve(length)
-
     this.length += this.buffer.utf8Write(value, this.length, length)
 
     return this.length - offset
@@ -44,13 +42,13 @@ class Chunk {
   }
 
   set (array) {
-    this._reserve(array.length)
+    this.reserve(array.length)
 
     this.buffer.set(array, this.length)
     this.length += array.length
   }
 
-  _reserve (size) {
+  reserve (size) {
     if (this.length + size > this.buffer.length) {
       this._resize(this._minSize * Math.ceil((this.length + size) / this._minSize))
     }

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

@@ -25,6 +25,7 @@ function format (span) {
 
   extractError(formatted, span)
   extractRootTags(formatted, span)
+  extractChunkTags(formatted, span)
   extractTags(formatted, span)
 
   return formatted
@@ -112,6 +113,17 @@ function extractRootTags (trace, span) {
   addTag({}, trace.metrics, SAMPLING_AGENT_DECISION, context._trace[SAMPLING_AGENT_DECISION])
 }
 
+function extractChunkTags (trace, span) {
+  const context = span.context()
+  const isLocalRoot = span === context._trace.started[0]
+
+  if (!isLocalRoot) return
+
+  for (const key in context._trace.tags) {
+    addTag(trace.meta, trace.metrics, key, context._trace.tags[key])
+  }
+}
+
 function extractError (trace, span) {
   const error = span.context()._tags['error']
   if (isError(error)) {

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

@@ -1,17 +1,17 @@
 'use strict'
 
-const { randomBytes } = require('crypto')
+const { randomFillSync } = require('crypto')
 
 const UINT_MAX = 4294967296
 
+const data = new Uint8Array(8 * 8192)
 const zeroId = new Uint8Array(8)
 
-// Cryptographically secure local seeds to mitigate Math.random() seed reuse.
-const seed = new Uint32Array(randomBytes(8).buffer)
-
 const map = Array.prototype.map
 const pad = byte => `${byte < 16 ? '0' : ''}${byte.toString(16)}`
 
+let batch = 0
+
 // Internal representation of a trace or span ID.
 class Identifier {
   constructor (value, radix) {
@@ -36,7 +36,7 @@ class Identifier {
     if (this._buffer.length === 8) {
       return this._buffer
     }
-    return this._buffer.subarray(-8)
+    return this._buffer.slice(-8)
   }
 
   toJSON () {
@@ -50,7 +50,7 @@ function createBuffer (value) {
   if (!value) return pseudoRandom()
 
   const size = Math.ceil(value.length / 2)
-  const buffer = new Uint8Array(size)
+  const buffer = new Array(size)
 
   for (let i = 0; i < size; i++) {
     buffer[i] = parseInt(value.substring(i * 2, i * 2 + 2), 16)
@@ -61,7 +61,7 @@ function createBuffer (value) {
 
 // Convert a numerical string to a buffer using the specified radix.
 function fromString (str, raddix) {
-  const buffer = new Uint8Array(8)
+  const buffer = new Array(8)
   const len = str.length
 
   let pos = 0
@@ -126,20 +126,24 @@ function toHexString (buffer) {
 
 // Simple pseudo-random 64-bit ID generator.
 function pseudoRandom () {
-  const buffer = new Uint8Array(8)
-
-  const hi = randomUInt32(seed[0]) & 0x7FFFFFFF // only positive int64
-  const lo = randomUInt32(seed[1])
+  if (batch === 0) {
+    randomFillSync(data)
+  }
 
-  writeUInt32BE(buffer, hi, 0)
-  writeUInt32BE(buffer, lo, 4)
+  batch = (batch + 1) % 8192
 
-  return buffer
-}
+  const offset = batch * 8
 
-// Generate a random unsigned 32-bit integer.
-function randomUInt32 (seed) {
-  return seed ^ Math.floor(Math.random() * (0xFFFFFFFF + 1))
+  return [
+    data[offset] & 0x7F, // only positive int64,
+    data[offset + 1],
+    data[offset + 2],
+    data[offset + 3],
+    data[offset + 4],
+    data[offset + 5],
+    data[offset + 6],
+    data[offset + 7]
+  ]
 }
 
 // Read a buffer to unsigned integer bytes.

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

@@ -7,10 +7,10 @@ const Loader = require('./loader')
 const { isTrue } = require('./util')
 const plugins = require('./plugins')
 
-const disabldPlugins = process.env.DD_TRACE_DISABLED_PLUGINS
+const disabledPlugins = process.env.DD_TRACE_DISABLED_PLUGINS
 
 const collectDisabledPlugins = () => {
-  return new Set(disabldPlugins && disabldPlugins.split(',').map(plugin => plugin.trim()))
+  return new Set(disabledPlugins && disabledPlugins.split(',').map(plugin => plugin.trim()))
 }
 
 function cleanEnv (name) {

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -11,6 +11,7 @@ const spanKey = 'x-datadog-parent-id'
 const originKey = 'x-datadog-origin'
 const samplingKey = 'x-datadog-sampling-priority'
 const sampleKey = 'x-datadog-sampled'
+const tagsKey = 'x-datadog-tags'
 const baggagePrefix = 'ot-baggage-'
 const b3TraceKey = 'x-b3-traceid'
 const b3TraceExpr = /^([0-9a-f]{16}){1,2}$/i
@@ -41,6 +42,7 @@ class TextMapPropagator {
     this._injectSamplingPriority(spanContext, carrier)
     this._injectBaggageItems(spanContext, carrier)
     this._injectB3(spanContext, carrier)
+    this._injectTags(spanContext, carrier)
 
     log.debug(() => `Inject into carrier: ${JSON.stringify(pick(carrier, logKeys))}.`)
   }
@@ -53,6 +55,7 @@ class TextMapPropagator {
     this._extractOrigin(carrier, spanContext)
     this._extractBaggageItems(carrier, spanContext)
     this._extractSamplingPriority(carrier, spanContext)
+    this._extractTags(carrier, spanContext)
 
     log.debug(() => `Extract from carrier: ${JSON.stringify(pick(carrier, logKeys))}.`)
 
@@ -81,6 +84,25 @@ class TextMapPropagator {
     })
   }
 
+  _injectTags (spanContext, carrier) {
+    const trace = spanContext._trace
+    const tags = []
+
+    for (const key in trace.tags) {
+      if (!key.startsWith('_dd.p.')) continue
+
+      tags.push(`${key}=${trace.tags[key]}`)
+    }
+
+    const header = tags.join(',')
+
+    if (header.length <= 512) {
+      carrier[tagsKey] = header
+    } else {
+      trace.tags['_dd.propagation_error:max_size'] = 1
+    }
+  }
+
   _injectB3 (spanContext, carrier) {
     if (!this._config.experimental.b3) return
 
@@ -241,6 +263,18 @@ class TextMapPropagator {
     }
   }
 
+  _extractTags (carrier, spanContext) {
+    if (!carrier[tagsKey]) return
+
+    const pairs = carrier[tagsKey].split(',')
+
+    for (const pair of pairs) {
+      const [key, value] = pair.split('=')
+
+      spanContext._trace.tags[key] = value
+    }
+  }
+
   _isSampled (sampled, debug) {
     if (debug || sampled === '1') {
       return true

package/packages/dd-trace/src/opentracing/span_context.js

@@ -22,7 +22,8 @@ class DatadogSpanContext extends SpanContext {
     this._noop = props.noop || null
     this._trace = props.trace || {
       started: [],
-      finished: []
+      finished: [],
+      tags: {}
     }
   }
 

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

@@ -70,6 +70,7 @@ function resolveTilde (filePath) {
 }
 
 module.exports = {
+  normalizeRef,
   getCIMetadata () {
     const { env } = process
 
@@ -124,7 +125,7 @@ module.exports = {
         CI_PIPELINE_IID,
         CI_PIPELINE_URL: GITLAB_PIPELINE_URL,
         CI_PROJECT_DIR,
-        CI_COMMIT_BRANCH,
+        CI_COMMIT_REF_NAME,
         CI_COMMIT_TAG,
         CI_COMMIT_SHA,
         CI_REPOSITORY_URL,
@@ -143,7 +144,7 @@ module.exports = {
         [GIT_REPOSITORY_URL]: CI_REPOSITORY_URL,
         [CI_JOB_URL]: GITLAB_CI_JOB_URL,
         [GIT_TAG]: CI_COMMIT_TAG,
-        [GIT_BRANCH]: CI_COMMIT_BRANCH,
+        [GIT_BRANCH]: CI_COMMIT_REF_NAME,
         [CI_WORKSPACE_PATH]: CI_PROJECT_DIR,
         [CI_PIPELINE_URL]: GITLAB_PIPELINE_URL && GITLAB_PIPELINE_URL.replace('/-/pipelines/', '/pipelines/'),
         [CI_STAGE_NAME]: CI_JOB_STAGE,
@@ -190,11 +191,19 @@ module.exports = {
         GITHUB_HEAD_REF,
         GITHUB_REF,
         GITHUB_SHA,
-        GITHUB_REPOSITORY
+        GITHUB_REPOSITORY,
+        GITHUB_SERVER_URL,
+        GITHUB_RUN_ATTEMPT
       } = env
 
-      const repositoryURL = `https://github.com/${GITHUB_REPOSITORY}.git`
-      const pipelineURL = `https://github.com/${GITHUB_REPOSITORY}/commit/${GITHUB_SHA}/checks`
+      const repositoryURL = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git`
+      let pipelineURL = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}`
+
+      if (GITHUB_RUN_ATTEMPT) {
+        pipelineURL = `${pipelineURL}/attempts/${GITHUB_RUN_ATTEMPT}`
+      }
+
+      const jobUrl = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/commit/${GITHUB_SHA}/checks`
 
       const ref = GITHUB_HEAD_REF || GITHUB_REF || ''
       const refKey = ref.includes('tags') ? GIT_TAG : GIT_BRANCH
@@ -207,7 +216,7 @@ module.exports = {
         [CI_PROVIDER_NAME]: 'github',
         [GIT_COMMIT_SHA]: GITHUB_SHA,
         [GIT_REPOSITORY_URL]: repositoryURL,
-        [CI_JOB_URL]: pipelineURL,
+        [CI_JOB_URL]: jobUrl,
         [CI_WORKSPACE_PATH]: GITHUB_WORKSPACE,
         [refKey]: ref
       }
@@ -274,11 +283,13 @@ module.exports = {
         BUILD_SOURCEVERSION,
         BUILD_REQUESTEDFORID,
         BUILD_REQUESTEDFOREMAIL,
-        BUILD_SOURCEVERSIONMESSAGE
+        BUILD_SOURCEVERSIONMESSAGE,
+        SYSTEM_STAGEDISPLAYNAME,
+        SYSTEM_JOBDISPLAYNAME
       } = env
 
       const ref = SYSTEM_PULLREQUEST_SOURCEBRANCH || BUILD_SOURCEBRANCH || BUILD_SOURCEBRANCHNAME
-      const refKey = ref.includes('tags') ? GIT_TAG : GIT_BRANCH
+      const refKey = (ref || '').includes('tags') ? GIT_TAG : GIT_BRANCH
 
       tags = {
         [CI_PROVIDER_NAME]: 'azurepipelines',
@@ -291,7 +302,9 @@ module.exports = {
         [refKey]: ref,
         [GIT_COMMIT_AUTHOR_NAME]: BUILD_REQUESTEDFORID,
         [GIT_COMMIT_AUTHOR_EMAIL]: BUILD_REQUESTEDFOREMAIL,
-        [GIT_COMMIT_MESSAGE]: BUILD_SOURCEVERSIONMESSAGE
+        [GIT_COMMIT_MESSAGE]: BUILD_SOURCEVERSIONMESSAGE,
+        [CI_STAGE_NAME]: SYSTEM_STAGEDISPLAYNAME,
+        [CI_JOB_NAME]: SYSTEM_JOBDISPLAYNAME
       }
 
       if (SYSTEM_TEAMFOUNDATIONSERVERURI && SYSTEM_TEAMPROJECTID && BUILD_BUILDID) {

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

@@ -39,34 +39,20 @@ function getGitMetadata (ciMetadata) {
     committerDate
   ] = sanitizedExec('git show -s --format=%an,%ae,%ad,%cn,%ce,%cd', { stdio: 'pipe' }).split(',')
 
-  const {
-    DD_GIT_REPOSITORY_URL,
-    DD_GIT_COMMIT_SHA,
-    DD_GIT_BRANCH,
-    DD_GIT_TAG,
-    DD_GIT_COMMIT_MESSAGE,
-    DD_GIT_COMMIT_AUTHOR_NAME,
-    DD_GIT_COMMIT_AUTHOR_EMAIL,
-    DD_GIT_COMMIT_AUTHOR_DATE,
-    DD_GIT_COMMIT_COMMITTER_NAME,
-    DD_GIT_COMMIT_COMMITTER_EMAIL,
-    DD_GIT_COMMIT_COMMITTER_DATE
-  } = process.env
-
   return {
     [GIT_REPOSITORY_URL]:
-      DD_GIT_REPOSITORY_URL || repositoryUrl || sanitizedExec('git ls-remote --get-url', { stdio: 'pipe' }),
+      repositoryUrl || sanitizedExec('git ls-remote --get-url', { stdio: 'pipe' }),
     [GIT_COMMIT_MESSAGE]:
-      DD_GIT_COMMIT_MESSAGE || commitMessage || sanitizedExec('git show -s --format=%s', { stdio: 'pipe' }),
-    [GIT_COMMIT_AUTHOR_DATE]: DD_GIT_COMMIT_AUTHOR_DATE || authorDate,
-    [GIT_COMMIT_AUTHOR_NAME]: DD_GIT_COMMIT_AUTHOR_NAME || ciAuthorName || authorName,
-    [GIT_COMMIT_AUTHOR_EMAIL]: DD_GIT_COMMIT_AUTHOR_EMAIL || ciAuthorEmail || authorEmail,
-    [GIT_COMMIT_COMMITTER_DATE]: DD_GIT_COMMIT_COMMITTER_DATE || committerDate,
-    [GIT_COMMIT_COMMITTER_NAME]: DD_GIT_COMMIT_COMMITTER_NAME || committerName,
-    [GIT_COMMIT_COMMITTER_EMAIL]: DD_GIT_COMMIT_COMMITTER_EMAIL || committerEmail,
-    [GIT_BRANCH]: DD_GIT_BRANCH || branch || sanitizedExec('git rev-parse --abbrev-ref HEAD', { stdio: 'pipe' }),
-    [GIT_COMMIT_SHA]: DD_GIT_COMMIT_SHA || commitSHA || sanitizedExec('git rev-parse HEAD', { stdio: 'pipe' }),
-    [GIT_TAG]: DD_GIT_TAG || tag,
+      commitMessage || sanitizedExec('git show -s --format=%s', { stdio: 'pipe' }),
+    [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_TAG]: tag,
     [CI_WORKSPACE_PATH]: ciWorkspacePath || sanitizedExec('git rev-parse --show-toplevel', { stdio: 'pipe' })
   }
 }

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

@@ -25,8 +25,6 @@ const redis = {
         'span.type': 'redis',
         'db.type': 'redis',
         'db.name': db || '0',
-        'out.host': '127.0.0.1',
-        'out.port': String(6379),
         'redis.raw_command': formatCommand(command, args)
       }
     })

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

@@ -1,6 +1,7 @@
 const path = require('path')
 
 const { getGitMetadata } = require('./git')
+const { getUserProviderGitMetadata } = require('./user-provided-git')
 const { getCIMetadata } = require('./ci')
 const { getRuntimeAndOSMetadata } = require('./env')
 const {
@@ -16,12 +17,14 @@ const {
 const id = require('../../id')
 
 const TEST_FRAMEWORK = 'test.framework'
+const TEST_FRAMEWORK_VERSION = 'test.framework_version'
 const TEST_TYPE = 'test.type'
 const TEST_NAME = 'test.name'
 const TEST_SUITE = 'test.suite'
 const TEST_STATUS = 'test.status'
 const TEST_PARAMETERS = 'test.parameters'
 const TEST_SKIP_REASON = 'test.skip_reason'
+const TEST_IS_RUM_ACTIVE = 'test.is_rum_active'
 
 const ERROR_TYPE = 'error.type'
 const ERROR_MESSAGE = 'error.msg'
@@ -29,14 +32,19 @@ const ERROR_STACK = 'error.stack'
 
 const CI_APP_ORIGIN = 'ciapp-test'
 
+const JEST_TEST_RUNNER = 'test.jest.test_runner'
+
 module.exports = {
   TEST_FRAMEWORK,
+  TEST_FRAMEWORK_VERSION,
+  JEST_TEST_RUNNER,
   TEST_TYPE,
   TEST_NAME,
   TEST_SUITE,
   TEST_STATUS,
   TEST_PARAMETERS,
   TEST_SKIP_REASON,
+  TEST_IS_RUM_ACTIVE,
   ERROR_TYPE,
   ERROR_MESSAGE,
   ERROR_STACK,
@@ -48,7 +56,7 @@ module.exports = {
   getTestSuitePath
 }
 
-function getTestEnvironmentMetadata (testFramework) {
+function getTestEnvironmentMetadata (testFramework, config) {
   // TODO: eventually these will come from the tracer (generally available)
   const ciMetadata = getCIMetadata()
   const {
@@ -73,14 +81,21 @@ function getTestEnvironmentMetadata (testFramework) {
     ciWorkspacePath
   })
 
+  const userProvidedGitMetadata = getUserProviderGitMetadata()
+
   const runtimeAndOSMetadata = getRuntimeAndOSMetadata()
 
-  return {
+  const metadata = {
     [TEST_FRAMEWORK]: testFramework,
     ...gitMetadata,
     ...ciMetadata,
+    ...userProvidedGitMetadata,
     ...runtimeAndOSMetadata
   }
+  if (config && config.service) {
+    metadata['service.name'] = config.service
+  }
+  return metadata
 }
 
 function getTestParametersString (parametersByTestName, testName) {
@@ -119,7 +134,10 @@ function getTestParentSpan (tracer) {
  */
 function getTestSuitePath (testSuiteAbsolutePath, sourceRoot) {
   if (!testSuiteAbsolutePath) {
-    return testSuiteAbsolutePath
+    return sourceRoot
   }
-  return path.relative(sourceRoot, testSuiteAbsolutePath).replace(path.sep, '/')
+  const testSuitePath = testSuiteAbsolutePath === sourceRoot
+    ? testSuiteAbsolutePath : path.relative(sourceRoot, testSuiteAbsolutePath)
+
+  return testSuitePath.replace(path.sep, '/')
 }