dd-trace 5.98.0 → 5.99.1

package/packages/dd-trace/src/service-naming/schemas/v0/web.js

@@ -35,6 +35,10 @@ const web = {
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
       serviceSource: optionServiceSource,
     },
+    'modelcontextprotocol-sdk': {
+      opName: () => 'mcp.tool.call',
+      serviceName: ({ pluginService, tracerService }) => pluginService || tracerService,
+    },
     aws: {
       opName: () => 'aws.request',
       serviceName: awsServiceV0,

package/packages/dd-trace/src/service-naming/schemas/v1/web.js

@@ -22,6 +22,10 @@ const web = {
       serviceName: ({ pluginConfig, tracerService }) => pluginConfig.service || tracerService,
       serviceSource: optionServiceSource,
     },
+    'modelcontextprotocol-sdk': {
+      opName: () => 'mcp.tool.call',
+      serviceName: identityService,
+    },
     fetch: {
       opName: () => 'http.client.request',
       serviceName: httpPluginClientService,

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

@@ -5,7 +5,6 @@ const spanFormat = require('./span_format')
 const SpanSampler = require('./span_sampler')
 const GitMetadataTagger = require('./git_metadata_tagger')
 const processTags = require('./process-tags')
-const { getValueFromEnvSources } = require('./config/helper')
 
 const startedSpans = new WeakSet()
 const finishedSpans = new WeakSet()
@@ -88,7 +87,7 @@ class SpanProcessor {
   }
 
   _erase (trace, active) {
-    if (getValueFromEnvSources('DD_TRACE_EXPERIMENTAL_STATE_TRACKING') === 'true') {
+    if (this._config.DD_TRACE_EXPERIMENTAL_STATE_TRACKING) {
       const started = new Set()
       const startedIds = new Set()
       const finished = new Set()

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

@@ -8,7 +8,7 @@ function addNonEmpty (carrier, key, value) {
   }
 }
 
-function add (carrier, keyValuePairs) {
+function add (carrier, keyValuePairs, valueSeparator = ':') {
   if (!carrier) return
 
   if (typeof keyValuePairs === 'string') {
@@ -18,7 +18,7 @@ function add (carrier, keyValuePairs) {
     for (let i = 0; i < keyValuePairs.length; i++) {
       const char = keyValuePairs[i]
 
-      if (char === ':') {
+      if (char === valueSeparator) {
         if (valueStart === 0) {
           valueStart = i
         }

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

@@ -2,8 +2,6 @@
 
 const request = require('../exporters/common/request')
 const log = require('../log')
-const { isTrue } = require('../util')
-const { getValueFromEnvSources } = require('../config/helper')
 
 /**
  * @typedef {Record<string, unknown>} TelemetryPayloadObject
@@ -139,16 +137,16 @@ function sendData (config, application, host, reqType, payload = {}, cb = () =>
     hostname,
     port,
     isCiVisibility,
+    DD_CIVISIBILITY_AGENTLESS_ENABLED,
   } = config
 
   let url = config.url
 
-  const isCiVisibilityAgentlessMode = isCiVisibility &&
-                                      isTrue(getValueFromEnvSources('DD_CIVISIBILITY_AGENTLESS_ENABLED'))
+  const isCiVisibilityAgentlessMode = isCiVisibility && DD_CIVISIBILITY_AGENTLESS_ENABLED
 
   if (isCiVisibilityAgentlessMode) {
     try {
-      url = url || new URL(getAgentlessTelemetryEndpoint(config.site))
+      url ||= new URL(getAgentlessTelemetryEndpoint(config.site))
     } catch (err) {
       log.error('Telemetry endpoint url is invalid', err)
       // No point to do the request if the URL is invalid
@@ -178,14 +176,14 @@ function sendData (config, application, host, reqType, payload = {}, cb = () =>
   })
 
   request(data, options, (error) => {
-    if (error && getValueFromEnvSources('DD_API_KEY') && config.site) {
+    if (error && config.apiKey && config.site) {
       if (agentTelemetry) {
         log.warn('Agent telemetry failed, started agentless telemetry')
         agentTelemetry = false
       }
       // figure out which data center to send to
       const backendUrl = getAgentlessTelemetryEndpoint(config.site)
-      const backendHeader = { ...options.headers, 'DD-API-KEY': getValueFromEnvSources('DD_API_KEY') }
+      const backendHeader = { ...options.headers, 'DD-API-KEY': config.apiKey }
       const backendOptions = {
         ...options,
         url: backendUrl,

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

@@ -17,8 +17,8 @@ const SERVICE_NAME = tags.SERVICE_NAME
 const MEASURED = tags.MEASURED
 
 class DatadogTracer extends Tracer {
-  constructor (config, prioritySampler, exporter) {
-    super(config, prioritySampler, exporter)
+  constructor (config, prioritySampler) {
+    super(config, prioritySampler)
     this._dataStreamsProcessor = new DataStreamsProcessor(config)
     this._dataStreamsManager = new DataStreamsManager(this._dataStreamsProcessor)
     this.dataStreamsCheckpointer = new DataStreamsCheckpointer(this)

package/vendor/dist/ignore/LICENSE

@@ -1,21 +0,0 @@
-Copyright (c) 2013 Kael Zhang <i@kael.me>, contributors
-http://kael.me/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/vendor/dist/ignore/index.js

@@ -1 +0,0 @@
-(()=>{var e={"./ignore/index.js"(e){function makeArray(e){return Array.isArray(e)?e:[e]}let t,r=/^\s+$/,s=/(?:[^\\]|^)\\$/,i=/^\\!/,n=/^\\#/,a=/\r?\n/g,h=/^\.{0,2}\/|^\.{1,2}$/,o=/\/$/,l="node-ignore";"u">typeof Symbol&&(l=Symbol.for("node-ignore"));let c=l,define=(e,t,r)=>(Object.defineProperty(e,t,{value:r}),r),u=/([0-z])-([0-z])/g,RETURN_FALSE=()=>!1,_=[[/^\uFEFF/,()=>""],[/((?:\\\\)*?)(\\?\s+)$/,(e,t,r)=>t+(0===r.indexOf("\\")?" ":"")],[/(\\+?)\s/g,(e,t)=>{let{length:r}=t;return t.slice(0,r-r%2)+" "}],[/[\\$.|*+(){^]/g,e=>`\\${e}`],[/(?!\\)\?/g,()=>"[^/]"],[/^\//,()=>"^"],[/\//g,()=>"\\/"],[/^\^*\\\*\\\*\\\//,()=>"^(?:.*\\/)?"],[/^(?=[^^])/,function(){return/\/(?!$)/.test(this)?"^":"(?:^|\\/)"}],[/\\\/\\\*\\\*(?=\\\/|$)/g,(e,t,r)=>t+6<r.length?"(?:\\/[^\\/]+)*":"\\/.+"],[/(^|[^\\]+)(\\\*)+(?=.+)/g,(e,t,r)=>t+r.replace(/\\\*/g,"[^\\/]*")],[/\\\\\\(?=[$.|*+(){^])/g,()=>"\\"],[/\\\\/g,()=>"\\"],[/(\\)?\[([^\]/]*?)(\\*)($|\])/g,(e,t,r,s,i)=>"\\"===t?`\\[${r}${(e=>{let{length:t}=e;return e.slice(0,t-t%2)})(s)}${i}`:"]"===i&&s.length%2==0?`[${r.replace(u,(e,t,r)=>t.charCodeAt(0)<=r.charCodeAt(0)?e:"")}${s}]`:"[]"],[/(?:[^*])$/,e=>/\/$/.test(e)?`${e}$`:`${e}(?=$|\\/$)`]],d=/(^|\\\/)?\\\*$/,g="regex",p="checkRegex",f={[g](e,t){let r=t?`${t}[^/]+`:"[^/]*";return`${r}(?=$|\\/$)`},[p](e,t){let r=t?`${t}[^/]*`:"[^/]*";return`${r}(?=$|\\/$)`}};let IgnoreRule=class IgnoreRule{constructor(e,t,r,s,i,n){this.pattern=e,this.mark=t,this.negative=i,define(this,"body",r),define(this,"ignoreCase",s),define(this,"regexPrefix",n)}get regex(){let e="_"+g;return this[e]?this[e]:this._make(g,e)}get checkRegex(){let e="_"+p;return this[e]?this[e]:this._make(p,e)}_make(e,t){let r=this.regexPrefix.replace(d,f[e]);return define(this,t,this.ignoreCase?RegExp(r,"i"):new RegExp(r))}};let RuleManager=class RuleManager{constructor(e){this._ignoreCase=e,this._rules=[]}_add(e){let t;if(e&&e[c]){this._rules=this._rules.concat(e._rules._rules),this._added=!0;return}if("string"==typeof e&&(e={pattern:e}),(t=e.pattern)&&"string"==typeof t&&!r.test(t)&&!s.test(t)&&0!==t.indexOf("#")){let t=(({pattern:e,mark:t},r)=>{let s,a=!1,h=e;0===h.indexOf("!")&&(a=!0,h=h.substr(1));let o=(s=h=h.replace(i,"!").replace(n,"#"),_.reduce((e,[t,r])=>e.replace(t,r.bind(s)),s));return new IgnoreRule(e,t,h,r,a,o)})(e,this._ignoreCase);this._added=!0,this._rules.push(t)}}add(e){return this._added=!1,makeArray("string"==typeof e?e.split(a).filter(Boolean):e).forEach(this._add,this),this._added}test(e,r,s){let i,n=!1,a=!1;this._rules.forEach(h=>{let{negative:o}=h;(a!==o||n===a)&&(!o||n||a||r)&&h[s].test(e)&&(n=!o,a=o,i=o?t:h)});let h={ignored:n,unignored:a};return i&&(h.rule=i),h}};let throwError=(e,t)=>{throw new t(e)},checkPath=(e,t,r)=>"string"!=typeof e?r(`path must be a string, but got \`${t}\``,TypeError):e?!checkPath.isNotRelative(e)||r(`path should be a \`path.relative()\`d string, but got "${t}"`,RangeError):r("path must not be empty",TypeError),isNotRelative=e=>h.test(e);checkPath.isNotRelative=isNotRelative,checkPath.convert=e=>e;let Ignore=class Ignore{constructor({ignorecase:e=!0,ignoreCase:t=e,allowRelativePaths:r=!1}={}){define(this,c,!0),this._rules=new RuleManager(t),this._strictPathCheck=!r,this._initCache()}_initCache(){this._ignoreCache=Object.create(null),this._testCache=Object.create(null)}add(e){return this._rules.add(e)&&this._initCache(),this}addPattern(e){return this.add(e)}_test(e,t,r,s){let i=e&&checkPath.convert(e);return checkPath(i,e,this._strictPathCheck?throwError:RETURN_FALSE),this._t(i,t,r,s)}checkIgnore(e){if(!o.test(e))return this.test(e);let t=e.split("/").filter(Boolean);if(t.pop(),t.length){let e=this._t(t.join("/")+"/",this._testCache,!0,t);if(e.ignored)return e}return this._rules.test(e,!1,p)}_t(e,t,r,s){if(e in t)return t[e];if(s||(s=e.split("/").filter(Boolean)),s.pop(),!s.length)return t[e]=this._rules.test(e,r,g);let i=this._t(s.join("/")+"/",t,r,s);return t[e]=i.ignored?i:this._rules.test(e,r,g)}ignores(e){return this._test(e,this._ignoreCache,!1).ignored}createFilter(){return e=>!this.ignores(e)}filter(e){return makeArray(e).filter(this.createFilter())}test(e){return this._test(e,this._testCache,!0)}};let factory=e=>new Ignore(e),setupWindows=()=>{checkPath.convert=e=>/^\\\\\?\\/.test(e)||/["<>|\u0000-\u001F]+/u.test(e)?e:e.replace(/\\/g,"/");let e=/^[a-z]:\//i;checkPath.isNotRelative=t=>e.test(t)||isNotRelative(t)};"u">typeof process&&"win32"===process.platform&&setupWindows(),e.exports=factory,factory.default=factory,e.exports.isPathValid=e=>checkPath(e&&checkPath.convert(e),e,RETURN_FALSE),define(e.exports,Symbol.for("setupWindows"),setupWindows)}},t={};function __webpack_require__(r){var s=t[r];if(void 0!==s)return s.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,__webpack_require__),i.exports}var r=__webpack_require__("./ignore/index.js");module.exports=r})();