dd-trace 5.133.0 → 5.134.0

package/packages/dd-trace/src/telemetry/logs/log-collector.js

@@ -48,7 +48,7 @@ function sanitize (logEntry) {
 
   for (let i = Math.max(firstIndex, 0); i < lines.length; i++) {
     const line = lines[i]
-    if (line.includes(ddBasePath)) {
+    if (ddBasePath !== undefined && line.includes(ddBasePath)) {
       stackLines.push(line.replace(ddBasePath, ''))
     } else {
       const match = NODE_FRAME_LINE_REGEX.exec(line)

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

@@ -145,9 +145,12 @@ function stripQueryAndFragment (target) {
 }
 
 function calculateDDBasePath (dirname) {
-  const dirSteps = dirname.split(path.sep)
-  const packagesIndex = dirSteps.lastIndexOf('packages')
-  return dirSteps.slice(0, packagesIndex).join(path.sep) + path.sep
+  // Bundled into ESM output, `__dirname` is not defined. Bundled into CJS output, it is the bundle's directory,
+  // which may contain an unrelated `packages` segment (e.g. a monorepo). Only this file's own directory identifies
+  // where dd-trace lives.
+  const suffix = path.sep + path.join('packages', 'dd-trace', 'src')
+  if (dirname === undefined || !dirname.endsWith(suffix)) return
+  return dirname.slice(0, -suffix.length) + path.sep
 }
 
 function normalizePluginEnvName (envPluginName, makeLowercase = false) {
@@ -191,7 +194,8 @@ module.exports = {
   globMatch,
   getSegment,
   stripQueryAndFragment,
-  ddBasePath: globalThis.__DD_ESBUILD_BASEPATH || calculateDDBasePath(__dirname),
+  ddBasePath: globalThis.__DD_ESBUILD_BASEPATH ||
+    calculateDDBasePath(typeof __dirname === 'string' ? __dirname : undefined),
   normalizePluginEnvName,
   formatKnuthRate,
   truncateString,

package/vendor/dist/@apm-js-collab/code-transformer/index.js

@@ -1,4 +1,4 @@
-(()=>{var i={"./@apm-js-collab/code-transformer/index.js"(i,s,k){"use strict";i.exports=k("./@apm-js-collab/code-transformer/lib/index.js")},"./@apm-js-collab/code-transformer/lib/index.js"(i,s,k){"use strict";let{InstrumentationMatcher:S}=k("./@apm-js-collab/code-transformer/lib/matcher.js");i.exports={create:function(i,s){return new S(i,s)}}},"./@apm-js-collab/code-transformer/lib/matcher.js"(i,s,k){"use strict";let S=k("./semifies/index.js"),{Transformer:E}=k("./@apm-js-collab/code-transformer/lib/transformer.js");let InstrumentationMatcher=class InstrumentationMatcher{#e=[];#t=null;#r={};#n={};constructor(i,s){this.#e=i,this.#t=s||"diagnostics_channel"}free(){this.#r={}}addTransform(i,s){this.#n[i]=s}getTransformer(i,s,k){k=k.replace(/\\/g,"/");let w=`${i}/${k}@${s}`;if(this.#r[w])return this.#r[w];let C=this.#e.filter(({module:E})=>E.name===i&&("string"==typeof E.filePath?E.filePath===k:E.filePath.test(k))&&S(s,E.versionRange));if(0!==C.length)return this.#r[w]=new E(i,s,k,C,this.#t,this.#n),this.#r[w]}};i.exports={InstrumentationMatcher}},"./@apm-js-collab/code-transformer/lib/transformer.js"(i,s,k){"use strict";let S,E,w=k("./esquery/dist/esquery.min.js"),{parse:C}=k("./meriyah/dist/meriyah.cjs"),{generate:T}=k("./astring/dist/astring.js"),_=k("./@apm-js-collab/code-transformer/lib/transforms.js");let Transformer=class Transformer{#a=null;#o=null;#i=null;#e=[];#t=null;#n={};constructor(i,s,k,S,E,w={}){this.#a=i,this.#o=s,this.#i=k,this.#e=S,this.#t=E,this.#n=w}free(){}get moduleName(){return this.#a}get filePath(){return this.#i}transform(i,s,O){let N;if(Buffer.isBuffer(i)&&(i=i.toString()),!i)return{code:i};let D={},q=0,j={..._,...this.#n,defaults:{..._}};for(let k of this.#e){let{astQuery:S,functionQuery:E={}}=k;if(!N){let k={loc:!0,ranges:!0,raw:!0,module:"esm"===s};try{N=C(i,k)}catch{N=C(i,{...k,module:!k.module})}"esm"===s&&(D=this.#s(N))}let T=this.#l(E,D),_=S||this.#c(T),O={...k,dcModule:this.#t,moduleType:s,moduleVersion:this.#o,functionQuery:T,transforms:j};O.operator=this.#u(O),w.traverse(N,w.parse(_),(...i)=>{q++,this.#p(O,...i)})}if(0===q&&this.#e.length>0){let i=this.#e.map(({astQuery:i,functionQuery:s={}})=>{if(i)return i;let k=this.#l(s,D),S=s.methodName||s.privateMethodName||s.functionName||s.expressionName||"constructor",E=s.className||s.functionName||s.expressionName,w=k.className||k.functionName||k.expressionName;return E&&E!==w?`${E} (local name: ${w})`:S});throw Error(`Failed to find injection points for: ${JSON.stringify(i)}`)}if(N){let i;S??=k("./@apm-js-collab/code-transformer/node_modules/source-map/source-map.js").SourceMapConsumer,E??=k("./@apm-js-collab/code-transformer/node_modules/source-map/source-map.js").SourceMapGenerator;let s=`${this.#a}/${this.#i}`;if(O){let k=new S(O);k.file=s,i=E.fromSourceMap(k)}else i=new E({file:s});return{code:T(N,{sourceMap:i}),map:i.toString()}}return{code:i}}#p(i,...s){let k=i.transforms[i.operator],{index:S=0}=i.functionQuery,[E]=s,w=E.init?.type||E.type;if("ClassDeclaration"===w||"ClassExpression"===w||"VariableDeclarator"!==E.type&&(i.functionIndex=++i.functionIndex||0,null===S||S===i.functionIndex))k(i,...s)}#u({transform:i,functionQuery:{kind:s}}){if(i)return i;switch(s){case"Async":return"tracePromise";case"Auto":return"traceAuto";case"Callback":return"traceCallback";default:return"traceSync"}}#s(i){let s={};for(let k of i.body)if("ExportNamedDeclaration"===k.type&&!k.source){for(let i of k.specifiers)if(i.exported&&i.local){let k=i.exported.name??i.exported.value,S=i.local.name??i.local.value;k&&S&&(s[k]=S)}}return s}#l(i,s){if(!i.isExportAlias)return i;let{functionName:k,expressionName:S,className:E}=i;return k&&s[k]?{...i,functionName:s[k]}:S&&s[S]?{...i,expressionName:s[S]}:E&&s[E]?{...i,className:s[E]}:i}#c(i){let{functionName:s,expressionName:k,className:S,objectName:E,propertyName:w}=i,C=i.privateMethodName?"PrivateIdentifier":"Identifier",T=[],_=i.methodName||i.privateMethodName;if(S?(_??="constructor",T.push(`[id.name="${S}"]`,`[id.name="${S}"] > ClassExpression`,`[id.name="${S}"] > ClassBody > [key.name="${_}"][key.type=${C}] > [async]`,`[id.name="${S}"] > ClassExpression > ClassBody > [key.name="${_}"][key.type=${C}] > [async]`)):_&&T.push(`ClassBody > [key.name="${_}"][key.type=${C}] > [async]`,`Property[key.name="${_}"][key.type=${C}] > [async]`),s?T.push(`FunctionDeclaration[id.name="${s}"][async]`):k&&T.push(`FunctionExpression[id.name="${k}"][async]`,`ArrowFunctionExpression[id.name="${k}"][async]`,`VariableDeclarator[id.name="${k}"] > FunctionExpression[async]`,`VariableDeclarator[id.name="${k}"] > ArrowFunctionExpression[async]`,`AssignmentExpression[left.property.name="${k}"] > FunctionExpression[async]`,`AssignmentExpression[left.property.name="${k}"] > ArrowFunctionExpression[async]`,`AssignmentExpression[left.name="${k}"] > FunctionExpression[async]`,`AssignmentExpression[left.name="${k}"] > ArrowFunctionExpression[async]`),E||w){if(!E||!w)throw Error(`functionQuery: 'objectName' and 'propertyName' must be used together (got objectName=${E}, propertyName=${w})`);let i="this"===E?"left.object.type=ThisExpression":`left.object.name="${E}"`;T.push(`AssignmentExpression[${i}][left.property.name="${w}"] > [async]`)}return T.join(", ")}};i.exports={Transformer}},"./@apm-js-collab/code-transformer/lib/transforms.js"(i,s,k){"use strict";let S=k("./esquery/dist/esquery.min.js"),{parse:E}=k("./meriyah/dist/meriyah.cjs"),tracingChannelPredicate=i=>i.declarations?.[0]?.id?.properties?.[0]?.value?.name==="tr_ch_apm_tracingChannel",w=/[^\w]/g,formatChannelVariable=i=>`tr_ch_apm$${i.replace(w,"_")}`;function wrapParams(i){return[...(i||[]).filter(i=>"RestElement"!==i.type&&"AssignmentPattern"!==i.type).map((i,s)=>({type:"Identifier",name:`__apm$arg${s}`})),{type:"RestElement",argument:{type:"Identifier",name:"__apm$args"}}]}function traceAny(i,s,k,S){let E=S[S.length-1];"ClassDeclaration"===s.type||"ClassExpression"===s.type?traceInstanceMethod(i,s,E):traceFunction(i,s,E)}function isChannelRunStoresReturn(i,s){if("ReturnStatement"!==i.type)return!1;let k=i.argument?.type==="CallExpression"?i.argument.callee:null;return k?.type==="MemberExpression"&&k.property?.name==="runStores"&&k.object?.type==="MemberExpression"&&k.object.property?.name==="start"&&k.object.object?.type==="Identifier"&&k.object.object.name===s}function nextWrappedFunction(i){let declInit=(i,s)=>{let k=i?.find(i=>"VariableDeclaration"===i.type&&i.declarations.some(i=>i.id?.name===s));return k?.declarations.find(i=>i.id?.name===s)?.init??null},s=declInit(i,"__apm$traced"),k=declInit(s?.body?.body,"__apm$wrapped"),S=k?.type;return"FunctionExpression"===S||"ArrowFunctionExpression"===S||"FunctionDeclaration"===S?k:null}function isWrappedForChannel(i,s){let k=new Set,S=i;for(;S&&!k.has(S);){k.add(S);let i=S.body?.body;if(!Array.isArray(i))break;if(i.some(i=>isChannelRunStoresReturn(i,s)))return!0;S=nextWrappedFunction(i)}return!1}function constructorPatchesMethod(i,s){let k=i?.value?.body?.body;return!!Array.isArray(k)&&k.some(i=>"VariableDeclaration"===i.type&&i.declarations.some(i=>i.id?.name===s))}function traceFunction(i,s,k){if(isWrappedForChannel(s,formatChannelVariable(i.channelName)))return;i.transforms.tracingChannelDeclaration(i,k);let{functionQuery:{methodName:S,privateMethodName:E,functionName:w,expressionName:C,propertyName:T}}=i,_="constructor"!==S&&(S||E||w||C||T)?s.type:"ArrowFunctionExpression",O=s.params;s.body=wrap(i,{type:_,params:O,body:s.body,async:s.async,expression:!1,generator:s.generator},k),s.params=wrapParams(O),s.generator=!1,s.async=!1,wrapSuper(i,s)}function traceInstanceMethod(i,s,k){let{functionQuery:S,operator:w,channelName:C}=i,{methodName:T}=S;if(!T)return;let _=s.body;if(_.body.some(({key:i})=>i?.name===T))return;let O=_.body.find(({kind:i})=>"constructor"===i),N=`${formatChannelVariable(C)}$${T}`;if(O&&constructorPatchesMethod(O,N))return;i.transforms.tracingChannelDeclaration(i,k),O||(O=E(s.superClass?"class A extends Object { constructor (...args) { super(...args) } }":"class A { constructor () {} }").body[0].body.body[0],_.body.unshift(O));let D=E(`
+(()=>{var i={"./@apm-js-collab/code-transformer/index.js"(i,s,k){"use strict";i.exports=k("./@apm-js-collab/code-transformer/lib/index.js")},"./@apm-js-collab/code-transformer/lib/index.js"(i,s,k){"use strict";let{InstrumentationMatcher:S}=k("./@apm-js-collab/code-transformer/lib/matcher.js");i.exports={create:function(i,s){return new S(i,s)}}},"./@apm-js-collab/code-transformer/lib/matcher.js"(i,s,k){"use strict";let S=k("./semifies/index.js"),{Transformer:E}=k("./@apm-js-collab/code-transformer/lib/transformer.js");let InstrumentationMatcher=class InstrumentationMatcher{#e=[];#t=null;#r={};#n={};constructor(i,s){this.#e=i,this.#t=s||"diagnostics_channel"}free(){this.#r={}}addTransform(i,s){this.#n[i]=s}getTransformer(i,s,k){k=k.replace(/\\/g,"/");let w=`${i}/${k}@${s}`;if(this.#r[w])return this.#r[w];let C=this.#e.filter(({module:E})=>E.name===i&&("string"==typeof E.filePath?E.filePath===k:E.filePath.test(k))&&S(s,E.versionRange));if(0!==C.length)return this.#r[w]=new E(i,s,k,C,this.#t,this.#n),this.#r[w]}};i.exports={InstrumentationMatcher}},"./@apm-js-collab/code-transformer/lib/transformer.js"(i,s,k){"use strict";let S,E,w=k("./esquery/dist/esquery.min.js"),{parse:C}=k("./meriyah/dist/meriyah.cjs"),{generate:T}=k("./astring/dist/astring.js"),_=k("./@apm-js-collab/code-transformer/lib/transforms.js");let Transformer=class Transformer{#a=null;#o=null;#i=null;#e=[];#t=null;#n={};constructor(i,s,k,S,E,w={}){this.#a=i,this.#o=s,this.#i=k,this.#e=S,this.#t=E,this.#n=w}free(){}get moduleName(){return this.#a}get filePath(){return this.#i}transform(i,s,O,N){let D,q=N?.sourceFile||`${this.#a}/${this.#i}`;if(Buffer.isBuffer(i)&&(i=i.toString()),!i)return{code:i};let j={},R=0,$={..._,...this.#n,defaults:{..._}};for(let k of this.#e){let{astQuery:S,functionQuery:E={}}=k;if(!D){let k={loc:!0,ranges:!0,raw:!0,module:"esm"===s};try{D=C(i,k)}catch{D=C(i,{...k,module:!k.module})}"esm"===s&&(j=this.#s(D))}let T=this.#l(E,j),_=S||this.#c(T),O={...k,dcModule:this.#t,moduleType:s,moduleVersion:this.#o,functionQuery:T,transforms:$};O.operator=this.#u(O),w.traverse(D,w.parse(_),(...i)=>{R++,this.#p(O,...i)})}if(0===R&&this.#e.length>0){let i=this.#e.map(({astQuery:i,functionQuery:s={}})=>{if(i)return i;let k=this.#l(s,j),S=s.methodName||s.privateMethodName||s.functionName||s.expressionName||"constructor",E=s.className||s.functionName||s.expressionName,w=k.className||k.functionName||k.expressionName;return E&&E!==w?`${E} (local name: ${w})`:S});throw Error(`Failed to find injection points for: ${JSON.stringify(i)}`)}if(D){S??=k("./@apm-js-collab/code-transformer/node_modules/source-map/source-map.js").SourceMapConsumer;let s=new(E??=k("./@apm-js-collab/code-transformer/node_modules/source-map/source-map.js").SourceMapGenerator)({file:q});s.setSourceContent(q,i);let w=T(D,{sourceMap:s});return O&&s.applySourceMap(new S(O),q),{code:w,map:s.toString()}}return{code:i}}#p(i,...s){let k="function"==typeof i.transform?i.transform:i.transforms[i.operator],{index:S=0}=i.functionQuery,[E]=s,w=E.init?.type||E.type;if("ClassDeclaration"===w||"ClassExpression"===w||"VariableDeclarator"!==E.type&&(i.functionIndex=++i.functionIndex||0,null===S||S===i.functionIndex))k(i,...s)}#u({transform:i,functionQuery:{kind:s}}){if("string"==typeof i)return i;switch(s){case"Async":return"tracePromise";case"Auto":return"traceAuto";case"Callback":return"traceCallback";default:return"traceSync"}}#s(i){let s={};for(let k of i.body)if("ExportNamedDeclaration"===k.type&&!k.source){for(let i of k.specifiers)if(i.exported&&i.local){let k=i.exported.name??i.exported.value,S=i.local.name??i.local.value;k&&S&&(s[k]=S)}}return s}#l(i,s){if(!i.isExportAlias)return i;let{functionName:k,expressionName:S,className:E}=i;return k&&s[k]?{...i,functionName:s[k]}:S&&s[S]?{...i,expressionName:s[S]}:E&&s[E]?{...i,className:s[E]}:i}#c(i){let{functionName:s,expressionName:k,className:S,objectName:E,propertyName:w}=i,C=i.privateMethodName?"PrivateIdentifier":"Identifier",T=[],_=i.methodName||i.privateMethodName;if(S?(_??="constructor",T.push(`[id.name="${S}"]`,`[id.name="${S}"] > ClassExpression`,`[id.name="${S}"] > ClassBody > [key.name="${_}"][key.type=${C}] > [async]`,`[id.name="${S}"] > ClassExpression > ClassBody > [key.name="${_}"][key.type=${C}] > [async]`)):_&&T.push(`ClassBody > [key.name="${_}"][key.type=${C}] > [async]`,`Property[key.name="${_}"][key.type=${C}] > [async]`),s?T.push(`FunctionDeclaration[id.name="${s}"][async]`):k&&T.push(`FunctionExpression[id.name="${k}"][async]`,`ArrowFunctionExpression[id.name="${k}"][async]`,`VariableDeclarator[id.name="${k}"] > FunctionExpression[async]`,`VariableDeclarator[id.name="${k}"] > ArrowFunctionExpression[async]`,`AssignmentExpression[left.property.name="${k}"] > FunctionExpression[async]`,`AssignmentExpression[left.property.name="${k}"] > ArrowFunctionExpression[async]`,`AssignmentExpression[left.name="${k}"] > FunctionExpression[async]`,`AssignmentExpression[left.name="${k}"] > ArrowFunctionExpression[async]`),E||w){if(!E||!w)throw Error(`functionQuery: 'objectName' and 'propertyName' must be used together (got objectName=${E}, propertyName=${w})`);let i="this"===E?"left.object.type=ThisExpression":`left.object.name="${E}"`;T.push(`AssignmentExpression[${i}][left.property.name="${w}"] > [async]`)}return T.join(", ")}};i.exports={Transformer}},"./@apm-js-collab/code-transformer/lib/transforms.js"(i,s,k){"use strict";let S=k("./esquery/dist/esquery.min.js"),{parse:E}=k("./meriyah/dist/meriyah.cjs"),tracingChannelPredicate=i=>i.declarations?.[0]?.id?.properties?.[0]?.value?.name==="tr_ch_apm_tracingChannel",w=/[^\w]/g,formatChannelVariable=i=>`tr_ch_apm$${i.replace(w,"_")}`;function wrapParams(i){return[...(i||[]).filter(i=>"RestElement"!==i.type&&"AssignmentPattern"!==i.type).map((i,s)=>({type:"Identifier",name:`__apm$arg${s}`})),{type:"RestElement",argument:{type:"Identifier",name:"__apm$args"}}]}function traceAny(i,s,k,S){let E=S[S.length-1];"ClassDeclaration"===s.type||"ClassExpression"===s.type?traceInstanceMethod(i,s,E):traceFunction(i,s,E)}function isChannelRunStoresReturn(i,s){if("ReturnStatement"!==i.type)return!1;let k=i.argument?.type==="CallExpression"?i.argument.callee:null;return k?.type==="MemberExpression"&&k.property?.name==="runStores"&&k.object?.type==="MemberExpression"&&k.object.property?.name==="start"&&k.object.object?.type==="Identifier"&&k.object.object.name===s}function nextWrappedFunction(i){let declInit=(i,s)=>{let k=i?.find(i=>"VariableDeclaration"===i.type&&i.declarations.some(i=>i.id?.name===s));return k?.declarations.find(i=>i.id?.name===s)?.init??null},s=declInit(i,"__apm$traced"),k=declInit(s?.body?.body,"__apm$wrapped"),S=k?.type;return"FunctionExpression"===S||"ArrowFunctionExpression"===S||"FunctionDeclaration"===S?k:null}function isWrappedForChannel(i,s){let k=new Set,S=i;for(;S&&!k.has(S);){k.add(S);let i=S.body?.body;if(!Array.isArray(i))break;if(i.some(i=>isChannelRunStoresReturn(i,s)))return!0;S=nextWrappedFunction(i)}return!1}function constructorPatchesMethod(i,s){let k=i?.value?.body?.body;return!!Array.isArray(k)&&k.some(i=>"VariableDeclaration"===i.type&&i.declarations.some(i=>i.id?.name===s))}function traceFunction(i,s,k){if(isWrappedForChannel(s,formatChannelVariable(i.channelName)))return;i.transforms.tracingChannelDeclaration(i,k);let{functionQuery:{methodName:S,privateMethodName:E,functionName:w,expressionName:C,propertyName:T}}=i,_="constructor"===S||!S&&!E&&!w&&!C&&!T,O=_?"ArrowFunctionExpression":s.type,N=s.params,D=`${formatChannelVariable(i.channelName)}$self`;i.selfBinding=_&&captureSelfAtSuper(s,D)?D:null,s.body=wrap(i,{type:O,params:N,body:s.body,async:s.async,expression:!1,generator:s.generator},k),s.params=wrapParams(N),s.generator=!1,s.async=!1,"ArrowFunctionExpression"!==O&&wrapSuper(i,s)}function traceInstanceMethod(i,s,k){let{functionQuery:S,operator:w,channelName:C}=i,{methodName:T}=S;if(!T)return;let _=s.body;if(_.body.some(({key:i})=>i?.name===T))return;let O=_.body.find(({kind:i})=>"constructor"===i),N=`${formatChannelVariable(C)}$${T}`;if(O&&constructorPatchesMethod(O,N))return;i.transforms.tracingChannelDeclaration(i,k),O||(O=E(s.superClass?"class A extends Object { constructor (...args) { super(...args) } }":"class A { constructor () {} }").body[0].body.body[0],_.body.unshift(O));let D=E(`
     const ${N} = this["${T}"]
     this["${T}"] = function () {}
     if (typeof ${N} === 'function') {
@@ -7,8 +7,8 @@
         configurable: true
       })
     }
-  `).body,q=D[1].expression.right;q.params=[{type:"RestElement",argument:{type:"Identifier",name:"__apm$args"}}],q.async="tracePromise"===w,q.body=wrap(i,{type:"Identifier",name:N},k),wrapSuper(i,q),O.value.body.body.push(...D)}function wrap(i,s,k){let w,{operator:C,moduleVersion:T}=i,{returnKind:_}=i.functionQuery,O=_?generateIterPatch(i,_,k):"";"traceCallback"===C&&(w=wrapCallback(i,s,O)),"tracePromise"===C&&(w=wrapPromise(i,s,O)),"traceSync"===C&&(w=wrapSync(i,s,O)),"traceAuto"===C&&(w=wrapAuto(i,s,O));let N=(s.params||[]).filter(i=>"RestElement"!==i.type&&"AssignmentPattern"!==i.type).map((i,s)=>`__apm$arg${s}`).concat("...__apm$args").join(", "),D=w.body[0].body,q=E("ArrowFunctionExpression"===s.type?`
-    const __apm$arguments = [${N}];
+  `).body,q=D[1].expression.right;q.params=[{type:"RestElement",argument:{type:"Identifier",name:"__apm$args"}}],q.async="tracePromise"===w,i.selfBinding=null,q.body=wrap(i,{type:"Identifier",name:N},k),wrapSuper(i,q),O.value.body.body.push(...D)}function wrap(i,s,k){let w,{operator:C,moduleVersion:T,selfBinding:_}=i,{returnKind:O}=i.functionQuery,N=O?generateIterPatch(i,O,k):"";"traceCallback"===C&&(w=wrapCallback(i,s,N)),"tracePromise"===C&&(w=wrapPromise(i,s,N)),"traceSync"===C&&(w=wrapSync(i,s,N)),"traceAuto"===C&&(w=wrapAuto(i,s,N));let D=(s.params||[]).filter(i=>"RestElement"!==i.type&&"AssignmentPattern"!==i.type).map((i,s)=>`__apm$arg${s}`).concat("...__apm$args").join(", "),q=w.body[0].body,j=E((_?`let ${_};`:"")+("ArrowFunctionExpression"===s.type?`
+    const __apm$arguments = [${D}];
     const __apm$ctx = {
       arguments: __apm$arguments,
       moduleVersion: ${JSON.stringify(T)}
@@ -18,7 +18,7 @@
       return __apm$wrapped(...__apm$arguments);
     };
   `:`
-    const __apm$arguments = [${N}].slice(0, arguments.length);
+    const __apm$arguments = [${D}].slice(0, arguments.length);
     const __apm$ctx = {
       arguments: __apm$arguments,
       self: this,
@@ -28,7 +28,7 @@
       const __apm$wrapped = () => {};
       return __apm$wrapped.apply(this, __apm$arguments);
     };
-  `).body;return D.body.unshift(...q),S.query(D,"[id.name=__apm$wrapped]")[0].init=s,D}function wrapSuper(i,s){let k=new Set;for(let i of(S.traverse(s.body,S.parse("[object.type=Super]"),(i,s)=>{let S,{name:w}=i.property;if(s.callee){let{expression:i}=E(`__apm$super['${w}'].call(this)`).body[0];s.callee=S=i.callee,s.arguments.unshift(...i.arguments)}else s.expression=S=E(`__apm$super['${w}']`).body[0];S.computed=s.callee.computed,S.optional=s.callee.optional,k.add(w)}),k)){let k=E(`
+  `)).body;return q.body.unshift(...j),S.query(q,"[id.name=__apm$wrapped]")[0].init=s,q}function captureSelfAtSuper(i,s){let k=!1,visit=(i,S)=>{let w=i[S];if(null!==w&&"object"==typeof w){if(Array.isArray(w)){for(let i=0;i<w.length;i++)visit(w,i);return}if("string"==typeof w.type&&"ClassBody"!==w.type&&"FunctionExpression"!==w.type&&"FunctionDeclaration"!==w.type){if("CallExpression"===w.type&&"Super"===w.callee.type){let C=E(`(0, ${s} = this)`).body[0].expression;C.expressions[0]=w,i[S]=C,k=!0;return}for(let i of Object.keys(w))visit(w,i)}}};return visit(i,"body"),k}function wrapSuper(i,s){let k=new Set;for(let i of(S.traverse(s.body,S.parse("[object.type=Super]"),(i,s)=>{let S,{name:w}=i.property;if(s.callee){let{expression:i}=E(`__apm$super['${w}'].call(this)`).body[0];s.callee=S=i.callee,s.arguments.unshift(...i.arguments)}else s.expression=S=E(`__apm$super['${w}']`).body[0];S.computed=s.callee.computed,S.optional=s.callee.optional,k.add(w)}),k)){let k=E(`
       class Wrapper {
         wrapper () {
           __apm$super['${i}'] = super['${i}']
@@ -73,7 +73,7 @@
           ${C}.error.publish(__apm$ctx);
           throw err;
         } finally {
-         __apm$ctx.self ??= this;
+         __apm$ctx.self ??= ${(({selfBinding:i})=>i||"this")(i)};
           ${C}.end.publish(__apm$ctx);
         }
       });
@@ -134,7 +134,7 @@
           ${w}.error.publish(__apm$ctx);
           throw err;
         } finally {
-          __apm$ctx.self ??= this;
+          __apm$ctx.self ??= ${(({selfBinding:i})=>i||"this")(i)};
           ${w}.end.publish(__apm$ctx);
         }
       });
@@ -152,7 +152,7 @@
           ${w}.error.publish(__apm$ctx);
           throw err;
         } finally {
-         __apm$ctx.self ??= this;
+         __apm$ctx.self ??= ${(({selfBinding:i})=>i||"this")(i)};
           ${w}.end.publish(__apm$ctx);
         }
         return __apm$ctx.result;