dd-trace 1.7.0 → 1.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

package/packages/dd-trace/lib/version.js

@@ -1 +1 @@
-module.exports = '1.7.0'
+module.exports = '1.7.1'

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

@@ -10,10 +10,5 @@ module.exports = {
   SAMPLING_RULE_DECISION: '_dd.rule_psr',
   SAMPLING_LIMIT_DECISION: '_dd.limit_psr',
   SAMPLING_AGENT_DECISION: '_dd.agent_psr',
-  SAMPLING_MECHANISM_DEFAULT: 0,
-  SAMPLING_MECHANISM_AGENT: 1,
-  SAMPLING_MECHANISM_RULE: 3,
-  SAMPLING_MECHANISM_MANUAL: 4,
-  DATADOG_LAMBDA_EXTENSION_PATH: '/opt/extensions/datadog-agent',
-  UPSTREAM_SERVICES_KEY: '_dd.p.upstream_services'
+  DATADOG_LAMBDA_EXTENSION_PATH: '/opt/extensions/datadog-agent'
 }

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

@@ -11,7 +11,6 @@ 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
@@ -42,7 +41,6 @@ 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))}.`)
   }
@@ -55,7 +53,6 @@ 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))}.`)
 
@@ -84,25 +81,6 @@ 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
 
@@ -263,18 +241,6 @@ 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/priority_sampler.js

@@ -1,20 +1,14 @@
 'use strict'
 
-const coalesce = require('koalas')
 const RateLimiter = require('./rate_limiter')
 const Sampler = require('./sampler')
 const ext = require('../../../ext')
 const { setSamplingRules } = require('./startup-log')
 
 const {
-  SAMPLING_MECHANISM_DEFAULT,
-  SAMPLING_MECHANISM_AGENT,
-  SAMPLING_MECHANISM_RULE,
-  SAMPLING_MECHANISM_MANUAL,
   SAMPLING_RULE_DECISION,
   SAMPLING_LIMIT_DECISION,
-  SAMPLING_AGENT_DECISION,
-  UPSTREAM_SERVICES_KEY
+  SAMPLING_AGENT_DECISION
 } = require('./constants')
 
 const SERVICE_NAME = ext.tags.SERVICE_NAME
@@ -28,7 +22,6 @@ const USER_KEEP = ext.priority.USER_KEEP
 const DEFAULT_KEY = 'service:,env:'
 
 const defaultSampler = new Sampler(AUTO_KEEP)
-const serviceNames = new Map()
 
 class PrioritySampler {
   constructor (env, { sampleRate, rateLimit = 100, rules = [] } = {}) {
@@ -59,14 +52,9 @@ class PrioritySampler {
 
     if (this.validate(tag)) {
       context._sampling.priority = tag
-      context._sampling.mechanism = SAMPLING_MECHANISM_MANUAL
     } else if (auto) {
       context._sampling.priority = this._getPriorityFromAuto(root)
-    } else {
-      return
     }
-
-    this._addUpstreamService(root)
   }
 
   update (rates) {
@@ -127,7 +115,6 @@ class PrioritySampler {
 
   _getPriorityByRule (context, rule) {
     context._trace[SAMPLING_RULE_DECISION] = rule.sampleRate
-    context._sampling.mechanism = SAMPLING_MECHANISM_RULE
 
     return rule.sampler.isSampled(context) && this._isSampledByRateLimit(context) ? USER_KEEP : USER_REJECT
   }
@@ -146,44 +133,9 @@ class PrioritySampler {
 
     context._trace[SAMPLING_AGENT_DECISION] = sampler.rate()
 
-    if (sampler === defaultSampler) {
-      context._sampling.mechanism = SAMPLING_MECHANISM_DEFAULT
-    } else {
-      context._sampling.mechanism = SAMPLING_MECHANISM_AGENT
-    }
-
     return sampler.isSampled(context) ? AUTO_KEEP : AUTO_REJECT
   }
 
-  _addUpstreamService (span) {
-    const context = span.context()
-    const trace = context._trace
-    const service = this._toBase64(context._tags['service.name'])
-    const priority = context._sampling.priority
-    const mechanism = context._sampling.mechanism
-    const rate = Math.ceil(coalesce(
-      context._trace[SAMPLING_RULE_DECISION],
-      context._trace[SAMPLING_AGENT_DECISION]
-    ) * 10000) / 10000
-    const group = `${service}|${priority}|${mechanism}|${rate}`
-    const groups = trace.tags[UPSTREAM_SERVICES_KEY]
-      ? `${trace.tags[UPSTREAM_SERVICES_KEY]};${group}`
-      : group
-
-    trace.tags[UPSTREAM_SERVICES_KEY] = groups
-  }
-
-  _toBase64 (serviceName) {
-    let encoded = serviceNames.get(serviceName)
-
-    if (!encoded) {
-      encoded = Buffer.from(serviceName).toString('base64')
-      serviceNames.set(serviceName, encoded)
-    }
-
-    return encoded
-  }
-
   _normalizeRules (rules, sampleRate) {
     return rules
       .concat({ sampleRate })

package/NOTICE

@@ -1,4 +0,0 @@
-Datadog dd-trace-js
-Copyright 2016-Present Datadog, Inc.
-
-This product includes software developed at Datadog, Inc. (https://www.datadoghq.com/).