@depup/dd-trace 5.96.0-depup.0 → 6.4.0-depup.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (646) hide show
  1. package/LICENSE-3rdparty.csv +89 -104
  2. package/README.md +9 -3
  3. package/changes.json +8 -3
  4. package/ci/init.js +25 -5
  5. package/ci/vitest-no-worker-init-setup.mjs +430 -0
  6. package/ext/exporters.js +1 -0
  7. package/ext/tags.js +3 -0
  8. package/index.d.ts +349 -244
  9. package/index.electron.js +3 -0
  10. package/initialize.mjs +9 -8
  11. package/loader-hook.mjs +154 -47
  12. package/package.json +121 -79
  13. package/packages/datadog-core/src/storage.js +47 -48
  14. package/packages/datadog-esbuild/index.js +52 -10
  15. package/packages/datadog-esbuild/src/utils.js +46 -3
  16. package/packages/datadog-instrumentations/src/aerospike.js +3 -3
  17. package/packages/datadog-instrumentations/src/ai.js +131 -76
  18. package/packages/datadog-instrumentations/src/amqplib.js +6 -7
  19. package/packages/datadog-instrumentations/src/anthropic.js +10 -10
  20. package/packages/datadog-instrumentations/src/apollo-server-core.js +3 -3
  21. package/packages/datadog-instrumentations/src/apollo-server.js +10 -18
  22. package/packages/datadog-instrumentations/src/avsc.js +6 -6
  23. package/packages/datadog-instrumentations/src/aws-durable-execution-sdk-js-context-methods.js +18 -0
  24. package/packages/datadog-instrumentations/src/aws-durable-execution-sdk-js.js +111 -0
  25. package/packages/datadog-instrumentations/src/aws-sdk.js +172 -72
  26. package/packages/datadog-instrumentations/src/azure-cosmos.js +7 -0
  27. package/packages/datadog-instrumentations/src/azure-durable-functions.js +8 -8
  28. package/packages/datadog-instrumentations/src/azure-functions.js +3 -0
  29. package/packages/datadog-instrumentations/src/bluebird.js +2 -2
  30. package/packages/datadog-instrumentations/src/body-parser.js +5 -2
  31. package/packages/datadog-instrumentations/src/cassandra-driver.js +12 -9
  32. package/packages/datadog-instrumentations/src/child_process.js +22 -32
  33. package/packages/datadog-instrumentations/src/claude-agent-sdk.js +587 -0
  34. package/packages/datadog-instrumentations/src/confluentinc-kafka-javascript.js +41 -24
  35. package/packages/datadog-instrumentations/src/connect.js +14 -12
  36. package/packages/datadog-instrumentations/src/cookie-parser.js +5 -4
  37. package/packages/datadog-instrumentations/src/cookie.js +9 -3
  38. package/packages/datadog-instrumentations/src/couchbase.js +73 -238
  39. package/packages/datadog-instrumentations/src/crypto.js +50 -6
  40. package/packages/datadog-instrumentations/src/cucumber-worker-threads.js +19 -0
  41. package/packages/datadog-instrumentations/src/cucumber.js +751 -188
  42. package/packages/datadog-instrumentations/src/cypress-config.js +432 -0
  43. package/packages/datadog-instrumentations/src/cypress.js +88 -4
  44. package/packages/datadog-instrumentations/src/dns.js +61 -61
  45. package/packages/datadog-instrumentations/src/elasticsearch.js +9 -12
  46. package/packages/datadog-instrumentations/src/electron/preload.js +42 -0
  47. package/packages/datadog-instrumentations/src/electron.js +240 -0
  48. package/packages/datadog-instrumentations/src/express-mongo-sanitize.js +11 -9
  49. package/packages/datadog-instrumentations/src/express-session.js +14 -13
  50. package/packages/datadog-instrumentations/src/express.js +56 -34
  51. package/packages/datadog-instrumentations/src/fastify.js +169 -86
  52. package/packages/datadog-instrumentations/src/fetch.js +5 -5
  53. package/packages/datadog-instrumentations/src/fs.js +47 -47
  54. package/packages/datadog-instrumentations/src/google-cloud-pubsub.js +5 -7
  55. package/packages/datadog-instrumentations/src/google-genai.js +4 -4
  56. package/packages/datadog-instrumentations/src/graphql.js +26 -362
  57. package/packages/datadog-instrumentations/src/grpc/client.js +48 -32
  58. package/packages/datadog-instrumentations/src/grpc/server.js +20 -2
  59. package/packages/datadog-instrumentations/src/hapi.js +2 -2
  60. package/packages/datadog-instrumentations/src/helpers/bundler-register.js +41 -13
  61. package/packages/datadog-instrumentations/src/helpers/callback-instrumentor.js +74 -0
  62. package/packages/datadog-instrumentations/src/helpers/check-require-cache.js +85 -9
  63. package/packages/datadog-instrumentations/src/helpers/hook.js +34 -6
  64. package/packages/datadog-instrumentations/src/helpers/hooks.js +24 -19
  65. package/packages/datadog-instrumentations/src/helpers/instrument.js +61 -14
  66. package/packages/datadog-instrumentations/src/helpers/kafka.js +58 -0
  67. package/packages/datadog-instrumentations/src/helpers/optional-peer-bundler.js +65 -0
  68. package/packages/datadog-instrumentations/src/helpers/promise-instrumentor.js +42 -0
  69. package/packages/datadog-instrumentations/src/helpers/promise.js +2 -2
  70. package/packages/datadog-instrumentations/src/helpers/register.js +109 -146
  71. package/packages/datadog-instrumentations/src/helpers/require-optional-peer.js +17 -0
  72. package/packages/datadog-instrumentations/src/helpers/rewriter/compiler.js +13 -5
  73. package/packages/datadog-instrumentations/src/helpers/rewriter/index.js +24 -7
  74. package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/ai.js +6 -6
  75. package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/aws-durable-execution-sdk-js.js +31 -0
  76. package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/azure-cosmos.js +50 -0
  77. package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/claude-agent-sdk.js +17 -0
  78. package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/graphql.js +201 -0
  79. package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/index.js +7 -0
  80. package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/langgraph.js +4 -2
  81. package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/mercurius.js +31 -0
  82. package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/modelcontextprotocol-sdk.js +35 -0
  83. package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/playwright.js +85 -0
  84. package/packages/datadog-instrumentations/src/helpers/rewriter/loader.mjs +18 -2
  85. package/packages/datadog-instrumentations/src/helpers/rewriter/transforms.js +49 -224
  86. package/packages/datadog-instrumentations/src/helpers/router-helper.js +8 -8
  87. package/packages/datadog-instrumentations/src/hono.js +71 -9
  88. package/packages/datadog-instrumentations/src/http/client.js +50 -27
  89. package/packages/datadog-instrumentations/src/http/server.js +77 -34
  90. package/packages/datadog-instrumentations/src/http2/client.js +16 -15
  91. package/packages/datadog-instrumentations/src/http2/server.js +156 -25
  92. package/packages/datadog-instrumentations/src/ioredis.js +17 -14
  93. package/packages/datadog-instrumentations/src/iovalkey.js +1 -2
  94. package/packages/datadog-instrumentations/src/jest/bail-reporter.js +42 -0
  95. package/packages/datadog-instrumentations/src/jest/coverage-backfill.js +163 -0
  96. package/packages/datadog-instrumentations/src/jest.js +1795 -404
  97. package/packages/datadog-instrumentations/src/kafkajs.js +284 -170
  98. package/packages/datadog-instrumentations/src/knex.js +17 -17
  99. package/packages/datadog-instrumentations/src/koa.js +15 -14
  100. package/packages/datadog-instrumentations/src/ldapjs.js +5 -5
  101. package/packages/datadog-instrumentations/src/light-my-request.js +2 -2
  102. package/packages/datadog-instrumentations/src/limitd-client.js +5 -5
  103. package/packages/datadog-instrumentations/src/lodash.js +4 -4
  104. package/packages/datadog-instrumentations/src/mariadb.js +18 -16
  105. package/packages/datadog-instrumentations/src/memcached.js +4 -3
  106. package/packages/datadog-instrumentations/src/mercurius.js +11 -0
  107. package/packages/datadog-instrumentations/src/microgateway-core.js +2 -2
  108. package/packages/datadog-instrumentations/src/mocha/common.js +7 -4
  109. package/packages/datadog-instrumentations/src/mocha/main.js +557 -118
  110. package/packages/datadog-instrumentations/src/mocha/utils.js +531 -128
  111. package/packages/datadog-instrumentations/src/mocha/worker.js +27 -9
  112. package/packages/datadog-instrumentations/src/modelcontextprotocol-sdk.js +254 -0
  113. package/packages/datadog-instrumentations/src/mongodb-core.js +43 -31
  114. package/packages/datadog-instrumentations/src/mongodb.js +79 -5
  115. package/packages/datadog-instrumentations/src/mongoose.js +43 -34
  116. package/packages/datadog-instrumentations/src/mquery.js +5 -5
  117. package/packages/datadog-instrumentations/src/multer.js +5 -4
  118. package/packages/datadog-instrumentations/src/mysql.js +17 -17
  119. package/packages/datadog-instrumentations/src/mysql2.js +39 -5
  120. package/packages/datadog-instrumentations/src/nats.js +182 -0
  121. package/packages/datadog-instrumentations/src/net.js +21 -19
  122. package/packages/datadog-instrumentations/src/next.js +44 -10
  123. package/packages/datadog-instrumentations/src/nyc.js +43 -6
  124. package/packages/datadog-instrumentations/src/openai.js +124 -38
  125. package/packages/datadog-instrumentations/src/oracledb.js +12 -7
  126. package/packages/datadog-instrumentations/src/otel-sdk-trace.js +27 -6
  127. package/packages/datadog-instrumentations/src/passport-utils.js +5 -5
  128. package/packages/datadog-instrumentations/src/path-to-regexp.js +44 -0
  129. package/packages/datadog-instrumentations/src/pg.js +58 -25
  130. package/packages/datadog-instrumentations/src/pino.js +26 -42
  131. package/packages/datadog-instrumentations/src/playwright-browser-scripts.js +27 -0
  132. package/packages/datadog-instrumentations/src/playwright.js +1090 -351
  133. package/packages/datadog-instrumentations/src/prisma.js +1 -2
  134. package/packages/datadog-instrumentations/src/protobufjs.js +16 -16
  135. package/packages/datadog-instrumentations/src/redis.js +28 -15
  136. package/packages/datadog-instrumentations/src/restify.js +6 -5
  137. package/packages/datadog-instrumentations/src/router.js +243 -87
  138. package/packages/datadog-instrumentations/src/selenium.js +5 -3
  139. package/packages/datadog-instrumentations/src/sequelize.js +1 -1
  140. package/packages/datadog-instrumentations/src/stripe.js +47 -33
  141. package/packages/datadog-instrumentations/src/tedious.js +28 -0
  142. package/packages/datadog-instrumentations/src/url.js +1 -3
  143. package/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js +1297 -0
  144. package/packages/datadog-instrumentations/src/vitest-main.js +1592 -0
  145. package/packages/datadog-instrumentations/src/vitest-util.js +251 -0
  146. package/packages/datadog-instrumentations/src/vitest-worker.js +822 -0
  147. package/packages/datadog-instrumentations/src/vitest.js +11 -1258
  148. package/packages/datadog-instrumentations/src/vm.js +1 -3
  149. package/packages/datadog-instrumentations/src/winston.js +4 -4
  150. package/packages/datadog-instrumentations/src/ws.js +7 -7
  151. package/packages/datadog-instrumentations/src/zlib.js +29 -0
  152. package/packages/datadog-plugin-ai/src/index.js +1 -1
  153. package/packages/datadog-plugin-ai/src/tracing.js +66 -3
  154. package/packages/datadog-plugin-ai/src/utils.js +17 -4
  155. package/packages/datadog-plugin-apollo/src/gateway/request.js +1 -21
  156. package/packages/datadog-plugin-avsc/src/schema_iterator.js +3 -3
  157. package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/checkpoint.js +31 -0
  158. package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/client.js +55 -0
  159. package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/context.js +123 -0
  160. package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/handler.js +129 -0
  161. package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/index.js +19 -0
  162. package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/trace-checkpoint.js +224 -0
  163. package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/util.js +79 -0
  164. package/packages/datadog-plugin-aws-sdk/src/base.js +90 -53
  165. package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/tracing.js +1 -1
  166. package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/utils.js +218 -4
  167. package/packages/datadog-plugin-aws-sdk/src/services/cloudwatchlogs.js +1 -1
  168. package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js +2 -1
  169. package/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js +59 -14
  170. package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js +174 -75
  171. package/packages/datadog-plugin-aws-sdk/src/services/lambda.js +34 -23
  172. package/packages/datadog-plugin-aws-sdk/src/services/redshift.js +2 -1
  173. package/packages/datadog-plugin-aws-sdk/src/services/s3.js +1 -1
  174. package/packages/datadog-plugin-aws-sdk/src/services/sns.js +26 -26
  175. package/packages/datadog-plugin-aws-sdk/src/services/sqs.js +187 -101
  176. package/packages/datadog-plugin-aws-sdk/src/services/stepfunctions.js +20 -18
  177. package/packages/datadog-plugin-azure-cosmos/src/index.js +144 -0
  178. package/packages/datadog-plugin-azure-event-hubs/src/producer.js +8 -15
  179. package/packages/datadog-plugin-azure-functions/src/index.js +7 -3
  180. package/packages/datadog-plugin-azure-service-bus/src/producer.js +5 -10
  181. package/packages/datadog-plugin-bullmq/src/consumer.js +5 -4
  182. package/packages/datadog-plugin-bullmq/src/filter.js +35 -0
  183. package/packages/datadog-plugin-bullmq/src/producer.js +121 -33
  184. package/packages/datadog-plugin-bunyan/src/index.js +28 -0
  185. package/packages/datadog-plugin-child_process/src/index.js +13 -2
  186. package/packages/datadog-plugin-child_process/src/scrub-cmd-params.js +6 -6
  187. package/packages/datadog-plugin-claude-agent-sdk/src/index.js +31 -0
  188. package/packages/datadog-plugin-claude-agent-sdk/src/tracing.js +107 -0
  189. package/packages/datadog-plugin-claude-agent-sdk/src/util.js +15 -0
  190. package/packages/datadog-plugin-couchbase/src/index.js +58 -52
  191. package/packages/datadog-plugin-cucumber/src/index.js +46 -24
  192. package/packages/datadog-plugin-cypress/src/cypress-plugin.js +1018 -97
  193. package/packages/datadog-plugin-cypress/src/index.js +104 -2
  194. package/packages/datadog-plugin-cypress/src/plugin.js +6 -14
  195. package/packages/datadog-plugin-cypress/src/source-map-utils.js +48 -1
  196. package/packages/datadog-plugin-cypress/src/support.js +180 -25
  197. package/packages/datadog-plugin-dd-trace-api/src/index.js +1 -1
  198. package/packages/datadog-plugin-dns/src/lookup.js +8 -6
  199. package/packages/datadog-plugin-elasticsearch/src/index.js +28 -8
  200. package/packages/datadog-plugin-electron/src/index.js +17 -0
  201. package/packages/datadog-plugin-electron/src/ipc.js +143 -0
  202. package/packages/datadog-plugin-electron/src/net.js +82 -0
  203. package/packages/datadog-plugin-express/src/code_origin.js +1 -1
  204. package/packages/datadog-plugin-fastify/src/code_origin.js +1 -1
  205. package/packages/datadog-plugin-fs/src/index.js +2 -1
  206. package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js +2 -5
  207. package/packages/datadog-plugin-google-cloud-pubsub/src/producer.js +27 -18
  208. package/packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js +5 -8
  209. package/packages/datadog-plugin-graphql/src/execute.js +706 -34
  210. package/packages/datadog-plugin-graphql/src/index.js +43 -9
  211. package/packages/datadog-plugin-graphql/src/parse.js +45 -4
  212. package/packages/datadog-plugin-graphql/src/request.js +135 -0
  213. package/packages/datadog-plugin-graphql/src/tools/signature.js +32 -7
  214. package/packages/datadog-plugin-graphql/src/tools/transforms.js +118 -100
  215. package/packages/datadog-plugin-graphql/src/utils.js +261 -3
  216. package/packages/datadog-plugin-graphql/src/validate.js +53 -7
  217. package/packages/datadog-plugin-grpc/src/client.js +7 -8
  218. package/packages/datadog-plugin-grpc/src/server.js +1 -1
  219. package/packages/datadog-plugin-grpc/src/util.js +57 -22
  220. package/packages/datadog-plugin-http/src/client.js +12 -14
  221. package/packages/datadog-plugin-http/src/index.js +6 -8
  222. package/packages/datadog-plugin-http/src/server.js +63 -20
  223. package/packages/datadog-plugin-http2/src/client.js +6 -3
  224. package/packages/datadog-plugin-http2/src/server.js +48 -8
  225. package/packages/datadog-plugin-jest/src/index.js +136 -68
  226. package/packages/datadog-plugin-jest/src/util.js +37 -16
  227. package/packages/datadog-plugin-kafkajs/src/batch-consumer.js +31 -4
  228. package/packages/datadog-plugin-kafkajs/src/consumer.js +2 -9
  229. package/packages/datadog-plugin-kafkajs/src/producer.js +37 -8
  230. package/packages/datadog-plugin-langgraph/src/stream.js +1 -1
  231. package/packages/datadog-plugin-memcached/src/index.js +1 -1
  232. package/packages/datadog-plugin-mocha/src/index.js +66 -17
  233. package/packages/datadog-plugin-modelcontextprotocol-sdk/src/index.js +24 -0
  234. package/packages/datadog-plugin-modelcontextprotocol-sdk/src/tracing.js +173 -0
  235. package/packages/datadog-plugin-modelcontextprotocol-sdk/src/utils.js +30 -0
  236. package/packages/datadog-plugin-mongodb-core/src/bulk-write.js +43 -0
  237. package/packages/datadog-plugin-mongodb-core/src/index.js +8 -206
  238. package/packages/datadog-plugin-mongodb-core/src/query.js +452 -0
  239. package/packages/datadog-plugin-mysql/src/index.js +9 -4
  240. package/packages/datadog-plugin-nats/src/consumer.js +43 -0
  241. package/packages/datadog-plugin-nats/src/index.js +20 -0
  242. package/packages/datadog-plugin-nats/src/producer.js +62 -0
  243. package/packages/datadog-plugin-nats/src/util.js +33 -0
  244. package/packages/datadog-plugin-next/src/index.js +14 -18
  245. package/packages/datadog-plugin-openai/src/services.js +5 -3
  246. package/packages/datadog-plugin-openai/src/tracing.js +27 -25
  247. package/packages/datadog-plugin-oracledb/src/index.js +13 -2
  248. package/packages/datadog-plugin-pg/src/index.js +13 -3
  249. package/packages/datadog-plugin-pino/src/index.js +42 -0
  250. package/packages/datadog-plugin-playwright/src/index.js +21 -11
  251. package/packages/datadog-plugin-protobufjs/src/schema_iterator.js +3 -3
  252. package/packages/datadog-plugin-redis/src/index.js +54 -25
  253. package/packages/datadog-plugin-rhea/src/producer.js +1 -1
  254. package/packages/datadog-plugin-router/src/index.js +46 -44
  255. package/packages/datadog-plugin-selenium/src/index.js +1 -1
  256. package/packages/datadog-plugin-tedious/src/index.js +1 -1
  257. package/packages/datadog-plugin-undici/src/index.js +24 -2
  258. package/packages/datadog-plugin-vitest/src/index.js +160 -90
  259. package/packages/datadog-plugin-winston/src/index.js +30 -0
  260. package/packages/datadog-plugin-ws/src/close.js +3 -1
  261. package/packages/datadog-plugin-ws/src/producer.js +2 -0
  262. package/packages/datadog-plugin-ws/src/receiver.js +2 -1
  263. package/packages/datadog-shimmer/src/shimmer.js +101 -39
  264. package/packages/datadog-webpack/index.js +20 -4
  265. package/packages/datadog-webpack/src/optional-peer-loader.js +17 -0
  266. package/packages/dd-trace/index.electron.js +3 -0
  267. package/packages/dd-trace/index.js +2 -34
  268. package/packages/dd-trace/src/aiguard/channels.js +7 -0
  269. package/packages/dd-trace/src/aiguard/index.js +16 -34
  270. package/packages/dd-trace/src/aiguard/integrations/evaluate.js +46 -0
  271. package/packages/dd-trace/src/aiguard/integrations/index.js +34 -0
  272. package/packages/dd-trace/src/aiguard/integrations/openai.js +80 -0
  273. package/packages/dd-trace/src/aiguard/integrations/vercel-ai.js +92 -0
  274. package/packages/dd-trace/src/aiguard/messages/openai.js +382 -0
  275. package/packages/{datadog-instrumentations/src/helpers/ai-messages.js → dd-trace/src/aiguard/messages/vercel-ai.js} +30 -27
  276. package/packages/dd-trace/src/aiguard/sdk.js +151 -54
  277. package/packages/dd-trace/src/aiguard/tags.js +26 -10
  278. package/packages/dd-trace/src/appsec/api_security/index.js +55 -0
  279. package/packages/dd-trace/src/appsec/api_security/sampler.js +147 -0
  280. package/packages/dd-trace/src/appsec/blocked_templates.js +4 -3
  281. package/packages/dd-trace/src/appsec/blocking.js +84 -41
  282. package/packages/dd-trace/src/appsec/channels.js +5 -1
  283. package/packages/dd-trace/src/appsec/downstream_requests.js +116 -62
  284. package/packages/dd-trace/src/appsec/graphql.js +20 -17
  285. package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-rules.js +1 -1
  286. package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-secret-rules.js +81 -81
  287. package/packages/dd-trace/src/appsec/iast/analyzers/nosql-injection-mongodb-analyzer.js +23 -23
  288. package/packages/dd-trace/src/appsec/iast/iast-plugin.js +1 -1
  289. package/packages/dd-trace/src/appsec/iast/index.js +3 -2
  290. package/packages/dd-trace/src/appsec/iast/security-controls/index.js +4 -4
  291. package/packages/dd-trace/src/appsec/iast/taint-tracking/plugins/kafka.js +2 -2
  292. package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js +4 -4
  293. package/packages/dd-trace/src/appsec/iast/taint-tracking/taint-tracking-impl.js +2 -2
  294. package/packages/dd-trace/src/appsec/iast/telemetry/index.js +2 -1
  295. package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/ldap-sensitive-analyzer.js +54 -12
  296. package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/url-sensitive-analyzer.js +5 -1
  297. package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-handler.js +32 -5
  298. package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/index.js +1 -3
  299. package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js +84 -49
  300. package/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js +1 -1
  301. package/packages/dd-trace/src/appsec/index.js +65 -47
  302. package/packages/dd-trace/src/appsec/lambda.js +135 -0
  303. package/packages/dd-trace/src/appsec/rasp/command_injection.js +4 -5
  304. package/packages/dd-trace/src/appsec/rasp/lfi.js +8 -4
  305. package/packages/dd-trace/src/appsec/rasp/sql_injection.js +5 -10
  306. package/packages/dd-trace/src/appsec/rasp/ssrf.js +26 -18
  307. package/packages/dd-trace/src/appsec/recommended.json +2438 -13
  308. package/packages/dd-trace/src/appsec/remote_config.js +1 -0
  309. package/packages/dd-trace/src/appsec/reporter.js +87 -28
  310. package/packages/dd-trace/src/appsec/rule_manager.js +4 -2
  311. package/packages/dd-trace/src/appsec/sdk/index.js +4 -0
  312. package/packages/dd-trace/src/appsec/sdk/set_user.js +1 -1
  313. package/packages/dd-trace/src/appsec/sdk/track_event.js +5 -5
  314. package/packages/dd-trace/src/appsec/sdk/user_blocking.js +7 -11
  315. package/packages/dd-trace/src/appsec/sdk/utils.js +5 -3
  316. package/packages/dd-trace/src/appsec/store.js +50 -0
  317. package/packages/dd-trace/src/appsec/telemetry/api_security.js +34 -0
  318. package/packages/dd-trace/src/appsec/telemetry/index.js +27 -1
  319. package/packages/dd-trace/src/appsec/user_tracking.js +5 -4
  320. package/packages/dd-trace/src/appsec/waf/index.js +19 -9
  321. package/packages/dd-trace/src/appsec/waf/waf_context_wrapper.js +35 -20
  322. package/packages/dd-trace/src/appsec/waf/waf_manager.js +1 -1
  323. package/packages/dd-trace/src/azure_metadata.js +17 -6
  324. package/packages/dd-trace/src/baggage.js +32 -13
  325. package/packages/dd-trace/src/bootstrap.js +39 -0
  326. package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/index.js +36 -6
  327. package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/worker/index.js +122 -24
  328. package/packages/dd-trace/src/ci-visibility/early-flake-detection/get-known-tests.js +22 -7
  329. package/packages/dd-trace/src/ci-visibility/exporters/agent-proxy/index.js +5 -2
  330. package/packages/dd-trace/src/ci-visibility/exporters/agentless/coverage-writer.js +2 -2
  331. package/packages/dd-trace/src/ci-visibility/exporters/agentless/di-logs-writer.js +2 -2
  332. package/packages/dd-trace/src/ci-visibility/exporters/agentless/index.js +6 -2
  333. package/packages/dd-trace/src/ci-visibility/exporters/agentless/writer.js +2 -2
  334. package/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js +148 -25
  335. package/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js +3 -4
  336. package/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js +28 -10
  337. package/packages/dd-trace/src/ci-visibility/exporters/test-worker/writer.js +22 -0
  338. package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites.js +105 -22
  339. package/packages/dd-trace/src/ci-visibility/lage.js +2 -1
  340. package/packages/dd-trace/src/ci-visibility/log-submission/log-submission-plugin.js +4 -5
  341. package/packages/dd-trace/src/ci-visibility/requests/fs-cache.js +4 -5
  342. package/packages/dd-trace/src/ci-visibility/requests/get-library-configuration.js +73 -55
  343. package/packages/dd-trace/src/ci-visibility/requests/request.js +14 -50
  344. package/packages/dd-trace/src/ci-visibility/requests/upload-coverage-report.js +4 -4
  345. package/packages/dd-trace/src/ci-visibility/requests/upload-test-screenshot.js +156 -0
  346. package/packages/dd-trace/src/ci-visibility/test-api-manual/test-api-manual-plugin.js +9 -3
  347. package/packages/dd-trace/src/ci-visibility/test-management/get-test-management-tests.js +24 -6
  348. package/packages/dd-trace/src/ci-visibility/test-optimization-cache.js +70 -6
  349. package/packages/dd-trace/src/ci-visibility/test-optimization-http-cache-schema.js +128 -0
  350. package/packages/dd-trace/src/ci-visibility/test-optimization-http-cache.js +291 -0
  351. package/packages/dd-trace/src/config/config-types.d.ts +8 -6
  352. package/packages/dd-trace/src/config/defaults.js +341 -144
  353. package/packages/dd-trace/src/config/generated-config-types.d.ts +679 -131
  354. package/packages/dd-trace/src/config/git_properties.js +2 -2
  355. package/packages/dd-trace/src/config/helper.js +183 -28
  356. package/packages/dd-trace/src/config/index.js +565 -1515
  357. package/packages/dd-trace/src/config/major-overrides.js +100 -0
  358. package/packages/dd-trace/src/config/normalize-service.js +31 -0
  359. package/packages/dd-trace/src/config/parsers.js +384 -0
  360. package/packages/dd-trace/src/config/remote_config.js +59 -2
  361. package/packages/dd-trace/src/config/supported-configurations.json +638 -530
  362. package/packages/dd-trace/src/constants.js +15 -0
  363. package/packages/dd-trace/src/crashtracking/crashtracker.js +25 -7
  364. package/packages/dd-trace/src/crashtracking/index.js +1 -7
  365. package/packages/dd-trace/src/datastreams/checkpointer.js +6 -12
  366. package/packages/dd-trace/src/datastreams/context.js +4 -2
  367. package/packages/dd-trace/src/datastreams/encoding.js +39 -28
  368. package/packages/dd-trace/src/datastreams/index.js +2 -1
  369. package/packages/dd-trace/src/datastreams/manager.js +1 -1
  370. package/packages/dd-trace/src/datastreams/pathway.js +35 -30
  371. package/packages/dd-trace/src/datastreams/processor.js +31 -22
  372. package/packages/dd-trace/src/datastreams/size.js +6 -2
  373. package/packages/dd-trace/src/datastreams/writer.js +15 -6
  374. package/packages/dd-trace/src/debugger/config.js +9 -4
  375. package/packages/dd-trace/src/debugger/devtools_client/breakpoints.js +49 -35
  376. package/packages/dd-trace/src/debugger/devtools_client/condition.js +5 -8
  377. package/packages/dd-trace/src/debugger/devtools_client/config.js +3 -2
  378. package/packages/dd-trace/src/debugger/devtools_client/index.js +33 -71
  379. package/packages/dd-trace/src/debugger/devtools_client/probe_sampler.js +83 -0
  380. package/packages/dd-trace/src/debugger/devtools_client/send.js +27 -6
  381. package/packages/dd-trace/src/debugger/devtools_client/snapshot/collector.js +2 -2
  382. package/packages/dd-trace/src/debugger/devtools_client/snapshot/processor.js +5 -2
  383. package/packages/dd-trace/src/debugger/devtools_client/snapshot-pruner.js +1 -0
  384. package/packages/dd-trace/src/debugger/devtools_client/source-maps.js +1 -1
  385. package/packages/dd-trace/src/debugger/devtools_client/state.js +3 -1
  386. package/packages/dd-trace/src/debugger/index.js +14 -10
  387. package/packages/dd-trace/src/debugger/probe_sampler.js +112 -0
  388. package/packages/dd-trace/src/debugger/probe_sampler_constants.js +19 -0
  389. package/packages/dd-trace/src/dogstatsd.js +45 -36
  390. package/packages/dd-trace/src/encode/0.4.js +830 -269
  391. package/packages/dd-trace/src/encode/0.5.js +158 -22
  392. package/packages/dd-trace/src/encode/agentless-ci-visibility.js +141 -65
  393. package/packages/dd-trace/src/encode/agentless-json.js +12 -6
  394. package/packages/dd-trace/src/encode/coverage-ci-visibility.js +52 -15
  395. package/packages/dd-trace/src/encode/span-stats.js +19 -16
  396. package/packages/dd-trace/src/encode/tags-processors.js +30 -25
  397. package/packages/dd-trace/src/exporter.js +3 -1
  398. package/packages/dd-trace/src/exporters/agent/index.js +4 -5
  399. package/packages/dd-trace/src/exporters/agent/writer.js +8 -3
  400. package/packages/dd-trace/src/exporters/agentless/index.js +12 -13
  401. package/packages/dd-trace/src/exporters/agentless/intake.js +43 -0
  402. package/packages/dd-trace/src/exporters/agentless/writer.js +12 -11
  403. package/packages/dd-trace/src/exporters/common/agents.js +3 -1
  404. package/packages/dd-trace/src/exporters/common/buffering-exporter.js +3 -3
  405. package/packages/dd-trace/src/exporters/common/request.js +55 -26
  406. package/packages/dd-trace/src/exporters/common/retry.js +104 -0
  407. package/packages/dd-trace/src/exporters/common/url.js +34 -0
  408. package/packages/dd-trace/src/exporters/common/util.js +2 -2
  409. package/packages/dd-trace/src/exporters/common/writer.js +29 -3
  410. package/packages/dd-trace/src/exporters/electron/index.js +49 -0
  411. package/packages/dd-trace/src/exporters/span-stats/index.js +1 -2
  412. package/packages/dd-trace/src/exporters/span-stats/writer.js +1 -3
  413. package/packages/dd-trace/src/external-logger/src/index.js +2 -1
  414. package/packages/dd-trace/src/feature-registry.js +22 -0
  415. package/packages/dd-trace/src/git_metadata.js +68 -0
  416. package/packages/dd-trace/src/git_metadata_tagger.js +13 -5
  417. package/packages/dd-trace/src/guardrails/index.js +11 -6
  418. package/packages/dd-trace/src/guardrails/telemetry.js +40 -3
  419. package/packages/dd-trace/src/heap_snapshots.js +7 -4
  420. package/packages/dd-trace/src/id.js +46 -27
  421. package/packages/dd-trace/src/index.js +6 -4
  422. package/packages/dd-trace/src/lambda/handler-paths.js +52 -0
  423. package/packages/dd-trace/src/lambda/handler.js +2 -6
  424. package/packages/dd-trace/src/lambda/index.js +62 -14
  425. package/packages/dd-trace/src/lambda/runtime/patch.js +21 -46
  426. package/packages/dd-trace/src/llmobs/constants/tags.js +13 -0
  427. package/packages/dd-trace/src/llmobs/index.js +41 -8
  428. package/packages/dd-trace/src/llmobs/plugins/ai/ddTelemetry.js +403 -0
  429. package/packages/dd-trace/src/llmobs/plugins/ai/index.js +8 -391
  430. package/packages/dd-trace/src/llmobs/plugins/ai/util.js +178 -18
  431. package/packages/dd-trace/src/llmobs/plugins/ai/vercelTelemetry.js +363 -0
  432. package/packages/dd-trace/src/llmobs/plugins/{anthropic.js → anthropic/index.js} +32 -79
  433. package/packages/dd-trace/src/llmobs/plugins/anthropic/util.js +109 -0
  434. package/packages/dd-trace/src/llmobs/plugins/base.js +4 -4
  435. package/packages/dd-trace/src/llmobs/plugins/bedrockruntime.js +92 -38
  436. package/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/index.js +270 -0
  437. package/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/utils.js +10 -0
  438. package/packages/dd-trace/src/llmobs/plugins/genai/index.js +5 -1
  439. package/packages/dd-trace/src/llmobs/plugins/genai/util.js +81 -16
  440. package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/chain.js +3 -2
  441. package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/chat_model.js +3 -2
  442. package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/embedding.js +2 -1
  443. package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/index.js +1 -50
  444. package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/vectorstore.js +2 -1
  445. package/packages/dd-trace/src/llmobs/plugins/langchain/index.js +14 -8
  446. package/packages/dd-trace/src/llmobs/plugins/langchain/messages.js +76 -0
  447. package/packages/dd-trace/src/llmobs/plugins/langgraph/index.js +3 -28
  448. package/packages/dd-trace/src/llmobs/plugins/modelcontextprotocol-sdk/index.js +68 -0
  449. package/packages/dd-trace/src/llmobs/plugins/modelcontextprotocol-sdk/utils.js +57 -0
  450. package/packages/dd-trace/src/llmobs/plugins/openai/index.js +21 -51
  451. package/packages/dd-trace/src/llmobs/sdk.js +66 -41
  452. package/packages/dd-trace/src/llmobs/span_processor.js +91 -12
  453. package/packages/dd-trace/src/llmobs/tagger.js +135 -7
  454. package/packages/dd-trace/src/llmobs/telemetry.js +31 -1
  455. package/packages/dd-trace/src/llmobs/util.js +202 -9
  456. package/packages/dd-trace/src/llmobs/writers/base.js +13 -5
  457. package/packages/dd-trace/src/llmobs/writers/spans.js +1 -1
  458. package/packages/dd-trace/src/llmobs/writers/util.js +4 -2
  459. package/packages/dd-trace/src/log/index.js +28 -69
  460. package/packages/dd-trace/src/log/writer.js +10 -20
  461. package/packages/dd-trace/src/msgpack/chunk.js +430 -11
  462. package/packages/dd-trace/src/msgpack/index.js +101 -2
  463. package/packages/dd-trace/src/noop/proxy.js +13 -4
  464. package/packages/dd-trace/src/noop/span.js +3 -1
  465. package/packages/dd-trace/src/openfeature/encoding.js +70 -0
  466. package/packages/dd-trace/src/openfeature/eval-metrics-hook.js +103 -0
  467. package/packages/dd-trace/src/openfeature/flagging_provider.js +26 -1
  468. package/packages/dd-trace/src/openfeature/noop.js +40 -36
  469. package/packages/dd-trace/src/openfeature/register.js +46 -0
  470. package/packages/dd-trace/src/openfeature/remote_config.js +6 -1
  471. package/packages/dd-trace/src/openfeature/span-enrichment-hook.js +143 -0
  472. package/packages/dd-trace/src/openfeature/span-enrichment.js +149 -0
  473. package/packages/dd-trace/src/openfeature/writers/base.js +3 -11
  474. package/packages/dd-trace/src/openfeature/writers/exposures.js +82 -70
  475. package/packages/dd-trace/src/openfeature/writers/util.js +1 -2
  476. package/packages/dd-trace/src/opentelemetry/active-span-proxy.js +42 -0
  477. package/packages/dd-trace/src/opentelemetry/bridge-span-base.js +107 -0
  478. package/packages/dd-trace/src/opentelemetry/context_manager.js +27 -13
  479. package/packages/dd-trace/src/opentelemetry/logs/index.js +7 -7
  480. package/packages/dd-trace/src/opentelemetry/logs/otlp_http_log_exporter.js +3 -2
  481. package/packages/dd-trace/src/opentelemetry/metrics/index.js +62 -13
  482. package/packages/dd-trace/src/opentelemetry/metrics/instruments.js +28 -14
  483. package/packages/dd-trace/src/opentelemetry/metrics/meter.js +7 -10
  484. package/packages/dd-trace/src/opentelemetry/metrics/otlp_http_metric_exporter.js +3 -2
  485. package/packages/dd-trace/src/opentelemetry/metrics/otlp_span_stats_exporter.js +40 -0
  486. package/packages/dd-trace/src/opentelemetry/metrics/otlp_span_stats_transformer.js +169 -0
  487. package/packages/dd-trace/src/opentelemetry/metrics/periodic_metric_reader.js +99 -5
  488. package/packages/dd-trace/src/opentelemetry/metrics/time.js +19 -0
  489. package/packages/dd-trace/src/opentelemetry/otlp/common.proto +2 -2
  490. package/packages/dd-trace/src/opentelemetry/otlp/logs.proto +1 -1
  491. package/packages/dd-trace/src/opentelemetry/otlp/logs_service.proto +1 -1
  492. package/packages/dd-trace/src/opentelemetry/otlp/metrics.proto +1 -1
  493. package/packages/dd-trace/src/opentelemetry/otlp/metrics_service.proto +1 -1
  494. package/packages/dd-trace/src/opentelemetry/otlp/otlp_http_exporter_base.js +56 -82
  495. package/packages/dd-trace/src/opentelemetry/otlp/otlp_transformer_base.js +1 -2
  496. package/packages/dd-trace/src/opentelemetry/otlp/protobuf_loader.js +14 -2
  497. package/packages/dd-trace/src/opentelemetry/otlp/trace.proto +358 -0
  498. package/packages/dd-trace/src/opentelemetry/otlp/trace_service.proto +78 -0
  499. package/packages/dd-trace/src/opentelemetry/span-helpers.js +325 -0
  500. package/packages/dd-trace/src/opentelemetry/span.js +59 -109
  501. package/packages/dd-trace/src/opentelemetry/span_context.js +1 -0
  502. package/packages/dd-trace/src/opentelemetry/span_processor.js +7 -5
  503. package/packages/dd-trace/src/opentelemetry/trace/index.js +75 -0
  504. package/packages/dd-trace/src/opentelemetry/trace/otlp_http_trace_exporter.js +75 -0
  505. package/packages/dd-trace/src/opentelemetry/trace/otlp_transformer.js +375 -0
  506. package/packages/dd-trace/src/opentelemetry/tracer.js +20 -69
  507. package/packages/dd-trace/src/opentelemetry/tracer_provider.js +33 -17
  508. package/packages/dd-trace/src/opentracing/propagation/log.js +28 -8
  509. package/packages/dd-trace/src/opentracing/propagation/text_map.js +280 -145
  510. package/packages/dd-trace/src/opentracing/propagation/text_map_dsm.js +11 -11
  511. package/packages/dd-trace/src/opentracing/propagation/tracestate.js +98 -32
  512. package/packages/dd-trace/src/opentracing/span.js +127 -73
  513. package/packages/dd-trace/src/opentracing/span_context.js +68 -3
  514. package/packages/dd-trace/src/opentracing/tracer.js +46 -19
  515. package/packages/dd-trace/src/payload-tagging/config/index.js +8 -7
  516. package/packages/dd-trace/src/plugin_manager.js +44 -20
  517. package/packages/dd-trace/src/plugins/apollo.js +3 -1
  518. package/packages/dd-trace/src/plugins/ci_plugin.js +391 -85
  519. package/packages/dd-trace/src/plugins/database.js +61 -18
  520. package/packages/dd-trace/src/plugins/index.js +14 -0
  521. package/packages/dd-trace/src/plugins/log_injection.js +56 -0
  522. package/packages/dd-trace/src/plugins/log_plugin.js +4 -44
  523. package/packages/dd-trace/src/plugins/outbound.js +1 -1
  524. package/packages/dd-trace/src/plugins/plugin.js +22 -28
  525. package/packages/dd-trace/src/plugins/storage.js +2 -2
  526. package/packages/dd-trace/src/plugins/tracing.js +70 -13
  527. package/packages/dd-trace/src/plugins/util/ci.js +127 -40
  528. package/packages/dd-trace/src/plugins/util/git-cache.js +23 -23
  529. package/packages/dd-trace/src/plugins/util/git.js +3 -1
  530. package/packages/dd-trace/src/plugins/util/http-otel-semantics.js +276 -0
  531. package/packages/dd-trace/src/plugins/util/llm.js +6 -1
  532. package/packages/dd-trace/src/plugins/util/stacktrace.js +2 -2
  533. package/packages/dd-trace/src/plugins/util/test.js +894 -65
  534. package/packages/dd-trace/src/plugins/util/url.js +71 -5
  535. package/packages/dd-trace/src/plugins/util/user-provided-git.js +18 -16
  536. package/packages/dd-trace/src/plugins/util/web.js +116 -180
  537. package/packages/dd-trace/src/priority_sampler.js +12 -21
  538. package/packages/dd-trace/src/process-tags/index.js +3 -0
  539. package/packages/dd-trace/src/profiler.js +27 -2
  540. package/packages/dd-trace/src/profiling/config.js +145 -393
  541. package/packages/dd-trace/src/profiling/constants.js +4 -7
  542. package/packages/dd-trace/src/profiling/exporter_cli.js +10 -13
  543. package/packages/dd-trace/src/profiling/exporters/agent.js +61 -28
  544. package/packages/dd-trace/src/profiling/exporters/event_serializer.js +50 -15
  545. package/packages/dd-trace/src/profiling/exporters/file.js +16 -5
  546. package/packages/dd-trace/src/profiling/oom.js +71 -0
  547. package/packages/dd-trace/src/profiling/profiler.js +123 -132
  548. package/packages/dd-trace/src/profiling/profilers/event_plugins/crypto.js +32 -0
  549. package/packages/dd-trace/src/profiling/profilers/event_plugins/zlib.js +19 -0
  550. package/packages/dd-trace/src/profiling/profilers/events.js +57 -14
  551. package/packages/dd-trace/src/profiling/profilers/space.js +27 -16
  552. package/packages/dd-trace/src/profiling/profilers/wall.js +136 -39
  553. package/packages/dd-trace/src/profiling/ssi-heuristics.js +7 -4
  554. package/packages/dd-trace/src/propagation-hash/index.js +3 -2
  555. package/packages/dd-trace/src/proxy.js +82 -39
  556. package/packages/dd-trace/src/rate_limiter.js +1 -1
  557. package/packages/dd-trace/src/remote_config/index.js +9 -5
  558. package/packages/dd-trace/src/remote_config/scheduler.js +1 -1
  559. package/packages/dd-trace/src/require-package-json.js +8 -4
  560. package/packages/dd-trace/src/ritm.js +63 -28
  561. package/packages/dd-trace/src/runtime_metrics/client.js +30 -0
  562. package/packages/dd-trace/src/runtime_metrics/index.js +17 -4
  563. package/packages/dd-trace/src/runtime_metrics/otlp_runtime_metrics.js +284 -0
  564. package/packages/dd-trace/src/runtime_metrics/runtime_metrics.js +45 -41
  565. package/packages/dd-trace/src/sampler.js +1 -1
  566. package/packages/dd-trace/src/sampling_rule.js +7 -7
  567. package/packages/dd-trace/src/scope.js +10 -15
  568. package/packages/dd-trace/src/serverless.js +6 -7
  569. package/packages/dd-trace/src/service-naming/extra-services.js +14 -0
  570. package/packages/dd-trace/src/service-naming/index.js +1 -1
  571. package/packages/dd-trace/src/service-naming/schemas/definition.js +4 -1
  572. package/packages/dd-trace/src/service-naming/schemas/util.js +48 -3
  573. package/packages/dd-trace/src/service-naming/schemas/v0/graphql.js +6 -0
  574. package/packages/dd-trace/src/service-naming/schemas/v0/messaging.js +61 -2
  575. package/packages/dd-trace/src/service-naming/schemas/v0/serverless.js +12 -0
  576. package/packages/dd-trace/src/service-naming/schemas/v0/storage.js +60 -0
  577. package/packages/dd-trace/src/service-naming/schemas/v0/web.js +25 -1
  578. package/packages/dd-trace/src/service-naming/schemas/v0/websocket.js +5 -0
  579. package/packages/dd-trace/src/service-naming/schemas/v1/graphql.js +8 -0
  580. package/packages/dd-trace/src/service-naming/schemas/v1/messaging.js +32 -0
  581. package/packages/dd-trace/src/service-naming/schemas/v1/serverless.js +12 -0
  582. package/packages/dd-trace/src/service-naming/schemas/v1/storage.js +17 -0
  583. package/packages/dd-trace/src/service-naming/schemas/v1/web.js +23 -3
  584. package/packages/dd-trace/src/service-naming/schemas/v1/websocket.js +6 -0
  585. package/packages/dd-trace/src/service-naming/source-resolver.js +50 -0
  586. package/packages/dd-trace/src/span_format.js +269 -81
  587. package/packages/dd-trace/src/span_processor.js +13 -13
  588. package/packages/dd-trace/src/span_stats.js +101 -79
  589. package/packages/dd-trace/src/spanleak.js +1 -2
  590. package/packages/dd-trace/src/standalone/index.js +6 -25
  591. package/packages/dd-trace/src/startup-log.js +3 -3
  592. package/packages/dd-trace/src/tagger.js +2 -4
  593. package/packages/dd-trace/src/telemetry/dependencies.js +2 -2
  594. package/packages/dd-trace/src/telemetry/endpoints.js +7 -5
  595. package/packages/dd-trace/src/telemetry/index.js +2 -3
  596. package/packages/dd-trace/src/telemetry/logs/index.js +1 -1
  597. package/packages/dd-trace/src/telemetry/send-data.js +25 -39
  598. package/packages/dd-trace/src/telemetry/session-propagation.js +20 -45
  599. package/packages/dd-trace/src/telemetry/telemetry.js +42 -183
  600. package/packages/dd-trace/src/tracer.js +23 -9
  601. package/packages/dd-trace/src/tracer_metadata.js +1 -1
  602. package/packages/dd-trace/src/util.js +31 -9
  603. package/register.js +58 -1
  604. package/vendor/dist/@apm-js-collab/code-transformer/index.js +94 -42
  605. package/vendor/dist/@datadog/sketches-js/LICENSE +10 -36
  606. package/vendor/dist/@datadog/sketches-js/index.js +1 -1
  607. package/vendor/dist/pprof-format/index.js +1 -1
  608. package/vendor/dist/protobufjs/index.js +1 -1
  609. package/vendor/dist/protobufjs/minimal/index.js +1 -1
  610. package/vendor/dist/shell-quote/index.js +1 -1
  611. package/packages/datadog-plugin-graphql/src/resolve.js +0 -178
  612. package/packages/dd-trace/src/agent/url.js +0 -28
  613. package/packages/dd-trace/src/appsec/api_security_sampler.js +0 -117
  614. package/packages/dd-trace/src/lambda/runtime/ritm.js +0 -133
  615. package/packages/dd-trace/src/log/utils.js +0 -16
  616. package/packages/dd-trace/src/msgpack/encoder.js +0 -308
  617. package/packages/dd-trace/src/plugins/structured_log_plugin.js +0 -9
  618. package/scripts/preinstall.js +0 -34
  619. package/vendor/dist/ignore/LICENSE +0 -21
  620. package/vendor/dist/ignore/index.js +0 -1
  621. package/vendor/dist/opentracing/LICENSE +0 -201
  622. package/vendor/dist/opentracing/binary_carrier.d.ts +0 -11
  623. package/vendor/dist/opentracing/constants.d.ts +0 -61
  624. package/vendor/dist/opentracing/examples/demo/demo.d.ts +0 -2
  625. package/vendor/dist/opentracing/ext/tags.d.ts +0 -90
  626. package/vendor/dist/opentracing/functions.d.ts +0 -20
  627. package/vendor/dist/opentracing/global_tracer.d.ts +0 -14
  628. package/vendor/dist/opentracing/index.d.ts +0 -12
  629. package/vendor/dist/opentracing/index.js +0 -1
  630. package/vendor/dist/opentracing/mock_tracer/index.d.ts +0 -5
  631. package/vendor/dist/opentracing/mock_tracer/mock_context.d.ts +0 -13
  632. package/vendor/dist/opentracing/mock_tracer/mock_report.d.ts +0 -16
  633. package/vendor/dist/opentracing/mock_tracer/mock_span.d.ts +0 -50
  634. package/vendor/dist/opentracing/mock_tracer/mock_tracer.d.ts +0 -26
  635. package/vendor/dist/opentracing/noop.d.ts +0 -8
  636. package/vendor/dist/opentracing/reference.d.ts +0 -33
  637. package/vendor/dist/opentracing/span.d.ts +0 -147
  638. package/vendor/dist/opentracing/span_context.d.ts +0 -26
  639. package/vendor/dist/opentracing/test/api_compatibility.d.ts +0 -16
  640. package/vendor/dist/opentracing/test/mocktracer_implemenation.d.ts +0 -3
  641. package/vendor/dist/opentracing/test/noop_implementation.d.ts +0 -4
  642. package/vendor/dist/opentracing/test/opentracing_api.d.ts +0 -3
  643. package/vendor/dist/opentracing/test/unittest.d.ts +0 -2
  644. package/vendor/dist/opentracing/tracer.d.ts +0 -127
  645. package/vendor/dist/path-to-regexp/LICENSE +0 -21
  646. package/vendor/dist/path-to-regexp/index.js +0 -1
@@ -24,24 +24,21 @@ function wrapTransportPrototype (Transport) {
24
24
  addHook({ name: '@elastic/elasticsearch', file: 'lib/Transport.js', versions: ['>=5.6.16 <8', '>=8'] }, Transport => {
25
25
  shimmer.wrap(Transport.prototype, 'request', createWrapRequest('elasticsearch'))
26
26
  shimmer.wrap(Transport.prototype, 'getConnection', createWrapGetConnection('elasticsearch'))
27
- return Transport
28
27
  })
29
28
 
30
29
  addHook({ name: 'elasticsearch', file: 'src/lib/transport.js', versions: ['>=10'] }, Transport => {
31
30
  shimmer.wrap(Transport.prototype, 'request', createWrapRequest('elasticsearch'))
32
- return Transport
33
31
  })
34
32
 
35
33
  addHook({ name: 'elasticsearch', file: 'src/lib/connection_pool.js', versions: ['>=10'] }, ConnectionPool => {
36
- shimmer.wrap(ConnectionPool.prototype, 'select', createWrapSelect('elasticsearch'))
37
- return ConnectionPool
34
+ shimmer.wrap(ConnectionPool.prototype, 'select', createWrapSelect())
38
35
  })
39
36
 
40
37
  function createWrapGetConnection (name) {
41
38
  const connectCh = channel(`apm:${name}:query:connect`)
42
39
  return function wrapRequest (request) {
43
- return function () {
44
- const connection = request.apply(this, arguments)
40
+ return function (...args) {
41
+ const connection = request.apply(this, args)
45
42
  if (connectCh.hasSubscribers && connection && connection.url) {
46
43
  connectCh.publish(connection.url)
47
44
  }
@@ -53,17 +50,17 @@ function createWrapGetConnection (name) {
53
50
  function createWrapSelect () {
54
51
  const connectCh = channel('apm:elasticsearch:query:connect')
55
52
  return function wrapRequest (request) {
56
- return function () {
57
- if (arguments.length === 1) {
58
- const cb = arguments[0]
59
- arguments[0] = shimmer.wrapFunction(cb, cb => function (err, connection) {
53
+ return function (...args) {
54
+ const cb = args[0]
55
+ if (args.length === 1 && typeof cb === 'function') {
56
+ args[0] = shimmer.wrapCallback(cb, cb => function (err, connection) {
60
57
  if (connectCh.hasSubscribers && connection && connection.host) {
61
58
  connectCh.publish({ hostname: connection.host.host, port: connection.host.port })
62
59
  }
63
60
  cb(err, connection)
64
61
  })
65
62
  }
66
- return request.apply(this, arguments)
63
+ return request.apply(this, args)
67
64
  }
68
65
  }
69
66
  }
@@ -88,7 +85,7 @@ function createWrapRequest (name) {
88
85
  cb = arguments[lastIndex]
89
86
 
90
87
  if (typeof cb === 'function') {
91
- arguments[lastIndex] = shimmer.wrapFunction(cb, cb => function (error) {
88
+ arguments[lastIndex] = shimmer.wrapCallback(cb, cb => function (error) {
92
89
  if (error) {
93
90
  ctx.error = error
94
91
  errorCh.publish(ctx)
@@ -0,0 +1,42 @@
1
+ 'use strict'
2
+
3
+ // eslint-disable-next-line n/no-missing-require
4
+ const { contextBridge, ipcRenderer } = require('electron')
5
+
6
+ const BRIDGE_CHANNEL = 'datadog:bridge-send'
7
+ const CONFIG_CHANNEL = 'datadog:bridge-config'
8
+
9
+ // Privacy levels matching @datadog/browser-core DefaultPrivacyLevel
10
+ const MASK = 'mask'
11
+
12
+ const config = ipcRenderer.sendSync(CONFIG_CHANNEL)
13
+
14
+ const defaultPrivacyLevel = config?.defaultPrivacyLevel ?? MASK
15
+ const configuredHosts = config?.allowedWebViewHosts ?? []
16
+ // eslint-disable-next-line no-undef
17
+ const allowedHosts = [...new Set([location.hostname, ...configuredHosts])]
18
+
19
+ const bridge = {
20
+ getCapabilities () {
21
+ return '[]'
22
+ },
23
+ getPrivacyLevel () {
24
+ return defaultPrivacyLevel
25
+ },
26
+ getAllowedWebViewHosts () {
27
+ return JSON.stringify(allowedHosts)
28
+ },
29
+ send (msg) {
30
+ ipcRenderer.send(BRIDGE_CHANNEL, msg)
31
+ },
32
+ }
33
+
34
+ // Support both contextIsolation enabled (default) and disabled
35
+
36
+ window.DatadogEventBridge = bridge
37
+
38
+ try {
39
+ contextBridge.exposeInMainWorld('DatadogEventBridge', bridge)
40
+ } catch {
41
+ // exposeInMainWorld throws when contextIsolation is disabled
42
+ }
@@ -0,0 +1,240 @@
1
+ 'use strict'
2
+
3
+ const { join } = require('path')
4
+ const { wrap } = require('../../datadog-shimmer')
5
+ const { addHook, channel, tracingChannel } = require('./helpers/instrument')
6
+
7
+ const requestCh = tracingChannel('apm:electron:net:request')
8
+ const mainReceiveCh = tracingChannel('apm:electron:ipc:main:receive')
9
+ const mainHandleCh = tracingChannel('apm:electron:ipc:main:handle')
10
+ const mainSendCh = tracingChannel('apm:electron:ipc:main:send')
11
+ const rendererPatchedCh = channel('apm:electron:ipc:renderer:patched')
12
+ const rendererReceiveCh = tracingChannel('apm:electron:ipc:renderer:receive')
13
+ const rendererSendCh = tracingChannel('apm:electron:ipc:renderer:send')
14
+
15
+ const listeners = {}
16
+ const handlers = {}
17
+
18
+ function createWrapRequest (ch) {
19
+ return function wrapRequest (request) {
20
+ return function (...args) {
21
+ if (!ch.start.hasSubscribers) return request.apply(this, arguments)
22
+
23
+ const ctx = { args }
24
+
25
+ return ch.start.runStores(ctx, () => {
26
+ try {
27
+ const req = request.apply(this, ctx.args)
28
+ const emit = req.emit
29
+
30
+ ctx.req = req
31
+
32
+ req.emit = function (eventName, arg) {
33
+ /* eslint-disable no-fallthrough */
34
+ switch (eventName) {
35
+ case 'response':
36
+ ctx.res = arg
37
+ ctx.res.on('error', error => {
38
+ ctx.error = error
39
+ ch.error.publish(ctx)
40
+ ch.asyncStart.publish(ctx)
41
+ })
42
+ ctx.res.on('end', () => ch.asyncStart.publish(ctx))
43
+ break
44
+ case 'error':
45
+ ctx.error = arg
46
+ ch.error.publish(ctx)
47
+ case 'abort':
48
+ ch.asyncStart.publish(ctx)
49
+ }
50
+
51
+ return emit.apply(this, arguments)
52
+ }
53
+
54
+ return req
55
+ } catch (e) {
56
+ ctx.error = e
57
+ ch.error.publish(ctx)
58
+ throw e
59
+ } finally {
60
+ ch.end.publish(ctx)
61
+ }
62
+ })
63
+ }
64
+ }
65
+ }
66
+
67
+ function createWrapAddListener (ch, mappings) {
68
+ return function wrapAddListener (addListener) {
69
+ return function (channel, listener) {
70
+ const wrappedListener = (event, ...args) => {
71
+ const ctx = { args, channel, event }
72
+
73
+ return ch.tracePromise(() => listener.call(this, event, ...args), ctx)
74
+ }
75
+
76
+ const mapping = mappings[channel] || new WeakMap()
77
+ const wrapper = mapping.get(listener) || wrappedListener
78
+
79
+ mapping.set(listener, wrapper)
80
+
81
+ return addListener.call(this, channel, wrappedListener)
82
+ }
83
+ }
84
+ }
85
+
86
+ function createWrapRemoveListener (mappings) {
87
+ return function wrapRemoveListener (removeListener) {
88
+ return function (channel, listener) {
89
+ const mapping = mappings[channel]
90
+
91
+ if (mapping) {
92
+ const wrapper = mapping.get(listener)
93
+
94
+ if (wrapper) {
95
+ return removeListener.call(this, channel, wrapper)
96
+ }
97
+ }
98
+
99
+ return removeListener.call(this, channel, listener)
100
+ }
101
+ }
102
+ }
103
+
104
+ function createWrapRemoveAllListeners (mappings) {
105
+ return function wrapRemoveAllListeners (removeAllListeners) {
106
+ return function (channel) {
107
+ if (channel) {
108
+ delete mappings[channel]
109
+ } else {
110
+ for (const key of Object.keys(mappings)) delete mappings[key]
111
+ }
112
+
113
+ return removeAllListeners.call(this, channel)
114
+ }
115
+ }
116
+ }
117
+
118
+ function createWrapSend (ch, promise = false) {
119
+ const trace = (promise ? ch.tracePromise : ch.traceSync).bind(ch)
120
+
121
+ return function wrapSend (send) {
122
+ return function (channel, ...args) {
123
+ const ctx = { args, channel, self: this }
124
+
125
+ return trace(() => send.call(this, channel, ...args), ctx)
126
+ }
127
+ }
128
+ }
129
+
130
+ function wrapSendToFrame (send) {
131
+ return function (frameId, channel, ...args) {
132
+ const ctx = { args, channel, frameId, self: this }
133
+
134
+ return mainSendCh.traceSync(() => send.call(this, frameId, channel, ...args), ctx)
135
+ }
136
+ }
137
+
138
+ function wrapBrowserWindow (electron) {
139
+ const moduleExports = {}
140
+
141
+ class DatadogBrowserWindow extends electron.BrowserWindow {
142
+ constructor (options = {}) {
143
+ const win = super(options)
144
+
145
+ win.webContents.session.registerPreloadScript({
146
+ type: 'frame', // TODO: service-worker
147
+ filePath: join(__dirname, 'electron', 'preload.js'),
148
+ })
149
+
150
+ // BrowserWindow doesn't support subclassing because it's all native code
151
+ // so we return an instance of it instead of the subclass.
152
+ return win
153
+ }
154
+ }
155
+
156
+ Object.defineProperty(moduleExports, 'BrowserWindow', {
157
+ enumerable: true,
158
+ get: () => DatadogBrowserWindow,
159
+ configurable: false,
160
+ })
161
+
162
+ for (const key of Reflect.ownKeys(electron)) {
163
+ const descriptor = Reflect.getOwnPropertyDescriptor(electron, key)
164
+
165
+ if (key === 'BrowserWindow') continue
166
+
167
+ Object.defineProperty(moduleExports, key, descriptor)
168
+ }
169
+
170
+ return moduleExports
171
+ }
172
+
173
+ function wrapWebContents (proto) {
174
+ const descriptor = Object.getOwnPropertyDescriptor(proto, 'webContents')
175
+ const wrapped = new WeakSet()
176
+ const wrapSend = createWrapSend(mainSendCh)
177
+
178
+ Object.defineProperty(proto, 'webContents', {
179
+ get () {
180
+ const webContents = descriptor.get.apply(this)
181
+
182
+ if (!wrapped.has(webContents)) {
183
+ // wrap(webContents, 'postMessage', wrapSend)
184
+ wrap(webContents, 'send', wrapSend)
185
+ wrap(webContents, 'sendToFrame', wrapSendToFrame)
186
+
187
+ wrapped.add(webContents)
188
+ }
189
+
190
+ return webContents
191
+ },
192
+ })
193
+ }
194
+
195
+ addHook({ name: 'electron', versions: ['>=37.0.0'] }, electron => {
196
+ // Electron exports a string in Node and an object in Electron.
197
+ if (typeof electron === 'string') return electron
198
+
199
+ const { BrowserWindow, ipcMain, ipcRenderer, net } = electron
200
+
201
+ if (net) {
202
+ // This also covers `fetch` as it uses `request` under the hood.
203
+ wrap(net, 'request', createWrapRequest(requestCh))
204
+ }
205
+
206
+ if (ipcRenderer) {
207
+ wrap(ipcRenderer, 'invoke', createWrapSend(rendererSendCh, true))
208
+ // wrap(ipcRenderer, 'postMessage', createWrapSend(rendererSendCh))
209
+ wrap(ipcRenderer, 'send', createWrapSend(rendererSendCh))
210
+ wrap(ipcRenderer, 'sendSync', createWrapSend(rendererSendCh))
211
+ wrap(ipcRenderer, 'sendToHost', createWrapSend(rendererSendCh))
212
+
213
+ wrap(ipcRenderer, 'addListener', createWrapAddListener(rendererReceiveCh, listeners))
214
+ wrap(ipcRenderer, 'off', createWrapRemoveListener(listeners))
215
+ wrap(ipcRenderer, 'on', createWrapAddListener(rendererReceiveCh, listeners))
216
+ wrap(ipcRenderer, 'once', createWrapAddListener(rendererReceiveCh, listeners))
217
+ wrap(ipcRenderer, 'removeListener', createWrapRemoveListener(listeners))
218
+ wrap(ipcRenderer, 'removeAllListeners', createWrapRemoveAllListeners(listeners))
219
+
220
+ ipcRenderer.send('datadog:apm:renderer:patched')
221
+ } else if (ipcMain) {
222
+ wrap(ipcMain, 'addListener', createWrapAddListener(mainReceiveCh, listeners))
223
+ wrap(ipcMain, 'handle', createWrapAddListener(mainHandleCh, handlers))
224
+ wrap(ipcMain, 'handleOnce', createWrapAddListener(mainHandleCh, handlers))
225
+ wrap(ipcMain, 'off', createWrapRemoveListener(listeners))
226
+ wrap(ipcMain, 'on', createWrapAddListener(mainReceiveCh, listeners))
227
+ wrap(ipcMain, 'once', createWrapAddListener(mainReceiveCh, listeners))
228
+ wrap(ipcMain, 'removeAllListeners', createWrapRemoveAllListeners(listeners))
229
+ wrap(ipcMain, 'removeHandler', createWrapRemoveAllListeners(handlers))
230
+ wrap(ipcMain, 'removeListener', createWrapRemoveListener(listeners))
231
+
232
+ ipcMain.once('datadog:apm:renderer:patched', event => rendererPatchedCh.publish(event))
233
+
234
+ wrapWebContents(BrowserWindow.prototype)
235
+
236
+ electron = wrapBrowserWindow(electron)
237
+ }
238
+
239
+ return electron
240
+ })
@@ -12,8 +12,8 @@ const sanitizeMiddlewareFinished = channel('datadog:express-mongo-sanitize:filte
12
12
  const propertiesToSanitize = ['body', 'params', 'headers', 'query']
13
13
 
14
14
  addHook({ name: 'express-mongo-sanitize', versions: ['>=1.0.0'] }, expressMongoSanitize => {
15
- shimmer.wrap(expressMongoSanitize, 'sanitize', sanitize => function () {
16
- const sanitizedObject = sanitize.apply(this, arguments)
15
+ shimmer.wrap(expressMongoSanitize, 'sanitize', sanitize => function (...args) {
16
+ const sanitizedObject = sanitize.apply(this, args)
17
17
 
18
18
  if (sanitizeMethodFinished.hasSubscribers) {
19
19
  sanitizeMethodFinished.publish({ sanitizedObject })
@@ -22,24 +22,26 @@ addHook({ name: 'express-mongo-sanitize', versions: ['>=1.0.0'] }, expressMongoS
22
22
  return sanitizedObject
23
23
  })
24
24
 
25
- return shimmer.wrapFunction(expressMongoSanitize, expressMongoSanitize => function () {
26
- const middleware = expressMongoSanitize.apply(this, arguments)
25
+ return shimmer.wrapFunction(expressMongoSanitize, expressMongoSanitize => function (...args) {
26
+ const middleware = expressMongoSanitize.apply(this, args)
27
27
 
28
- return shimmer.wrapFunction(middleware, middleware => function (req, res, next) {
28
+ return shimmer.wrapFunction(middleware, middleware => function (...args) {
29
29
  if (!sanitizeMiddlewareFinished.hasSubscribers) {
30
- return middleware.apply(this, arguments)
30
+ return Reflect.apply(middleware, this, args)
31
31
  }
32
32
 
33
- const wrappedNext = shimmer.wrapFunction(next, next => function () {
33
+ const req = args[0]
34
+ // Mirror next's name/arity so wrapCallback skips its per-call identity rewrite.
35
+ const wrappedNext = shimmer.wrapCallback(args[2], original => function next (_error) {
34
36
  sanitizeMiddlewareFinished.publish({
35
37
  sanitizedProperties: propertiesToSanitize,
36
38
  req,
37
39
  })
38
40
 
39
- return next.apply(this, arguments)
41
+ return original.apply(this, arguments)
40
42
  })
41
43
 
42
- return middleware.call(this, req, res, wrappedNext)
44
+ return middleware.call(this, req, args[1], wrappedNext)
43
45
  })
44
46
  })
45
47
  })
@@ -6,28 +6,29 @@ const { channel, addHook } = require('./helpers/instrument')
6
6
  const sessionMiddlewareFinishCh = channel('datadog:express-session:middleware:finish')
7
7
 
8
8
  function wrapSessionMiddleware (sessionMiddleware) {
9
- return function wrappedSessionMiddleware (req, res, next) {
10
- shimmer.wrap(arguments, 2, function wrapNext (next) {
11
- return function wrappedNext () {
12
- if (sessionMiddlewareFinishCh.hasSubscribers) {
13
- const abortController = new AbortController()
9
+ return function wrappedSessionMiddleware (...args) {
10
+ const req = args[0]
11
+ const res = args[1]
12
+ // Mirror next's name/arity so wrapCallback skips its per-call identity rewrite.
13
+ args[2] = shimmer.wrapCallback(args[2], original => function next (_error) {
14
+ if (sessionMiddlewareFinishCh.hasSubscribers) {
15
+ const abortController = new AbortController()
14
16
 
15
- sessionMiddlewareFinishCh.publish({ req, res, sessionId: req.sessionID, abortController })
17
+ sessionMiddlewareFinishCh.publish({ req, res, sessionId: req.sessionID, abortController })
16
18
 
17
- if (abortController.signal.aborted) return
18
- }
19
-
20
- return next.apply(this, arguments)
19
+ if (abortController.signal.aborted) return
21
20
  }
21
+
22
+ return original.apply(this, arguments)
22
23
  })
23
24
 
24
- return sessionMiddleware.apply(this, arguments)
25
+ return Reflect.apply(sessionMiddleware, this, args)
25
26
  }
26
27
  }
27
28
 
28
29
  function wrapSession (session) {
29
- return function wrappedSession () {
30
- const sessionMiddleware = session.apply(this, arguments)
30
+ return function wrappedSession (...args) {
31
+ const sessionMiddleware = session.apply(this, args)
31
32
 
32
33
  return shimmer.wrapFunction(sessionMiddleware, wrapSessionMiddleware)
33
34
  }
@@ -1,8 +1,9 @@
1
1
  'use strict'
2
2
 
3
3
  const shimmer = require('../../datadog-shimmer')
4
- const { createWrapRouterMethod } = require('./router')
4
+ const { createWrapRouterMethod, createLayerDispatchWrappers } = require('./router')
5
5
  const { addHook, channel, tracingChannel } = require('./helpers/instrument')
6
+ const { getCompileToRegexp } = require('./path-to-regexp')
6
7
  const {
7
8
  setRouterMountPath,
8
9
  markAppMounted,
@@ -17,60 +18,60 @@ const handleChannel = channel('apm:express:request:handle')
17
18
  const routeAddedChannel = channel('apm:express:route:added')
18
19
 
19
20
  function wrapHandle (handle) {
20
- return function handleWithTrace (req, res) {
21
+ return function handleWithTrace (...args) {
21
22
  if (handleChannel.hasSubscribers) {
22
- handleChannel.publish({ req })
23
+ handleChannel.publish({ req: args[0] })
23
24
  }
24
25
 
25
- return handle.apply(this, arguments)
26
+ return Reflect.apply(handle, this, args)
26
27
  }
27
28
  }
28
29
 
29
- const wrapRouterMethod = createWrapRouterMethod('express')
30
-
31
30
  const responseJsonChannel = channel('datadog:express:response:json:start')
32
31
 
33
32
  function wrapResponseJson (json) {
34
- return function wrappedJson (obj) {
33
+ return function wrappedJson (...args) {
35
34
  if (responseJsonChannel.hasSubscribers) {
36
- // backward compat as express 4.x supports deprecated 3.x signature
37
- if (arguments.length === 2 && typeof arguments[1] !== 'number') {
38
- obj = arguments[1]
35
+ let obj = args[0]
36
+ // Deprecated express 3.x res.json(status, body) form, still honored by 4.x but not
37
+ // exercised by any suite (the unit harness can't drive res.json's freshness path).
38
+ /* istanbul ignore if */
39
+ if (args.length === 2 && typeof args[1] !== 'number') {
40
+ obj = args[1]
39
41
  }
40
42
 
41
43
  responseJsonChannel.publish({ req: this.req, res: this, body: obj })
42
44
  }
43
45
 
44
- return json.apply(this, arguments)
46
+ return Reflect.apply(json, this, args)
45
47
  }
46
48
  }
47
49
 
48
50
  const responseRenderChannel = tracingChannel('datadog:express:response:render')
49
51
 
50
52
  function wrapResponseRender (render) {
51
- return function wrappedRender (view, options, callback) {
53
+ return function wrappedRender (...args) {
52
54
  if (!responseRenderChannel.start.hasSubscribers) {
53
- return render.apply(this, arguments)
55
+ return Reflect.apply(render, this, args)
54
56
  }
55
57
 
56
58
  const abortController = new AbortController()
57
59
  return responseRenderChannel.traceSync(
58
- function () {
60
+ function (...renderArgs) {
59
61
  if (abortController.signal.aborted) {
60
- const error = abortController.signal.reason || new Error('Aborted')
61
- throw error
62
+ throw abortController.signal.reason || new Error('Aborted')
62
63
  }
63
64
 
64
- return render.apply(this, arguments)
65
+ return Reflect.apply(render, this, renderArgs)
65
66
  },
66
67
  {
67
68
  req: this.req,
68
- view,
69
- options,
69
+ view: args[0],
70
+ options: args[1],
70
71
  abortController,
71
72
  },
72
73
  this,
73
- ...arguments
74
+ ...args
74
75
  )
75
76
  }
76
77
  }
@@ -146,7 +147,7 @@ function wrapAppUse (use) {
146
147
  }
147
148
  }
148
149
 
149
- addHook({ name: 'express', versions: ['>=4'], file: ['lib/express.js'] }, express => {
150
+ addHook({ name: 'express', versions: ['>=4'], file: 'lib/express.js' }, express => {
150
151
  shimmer.wrap(express.application, 'handle', wrapHandle)
151
152
  shimmer.wrap(express.application, 'all', wrapAppAll)
152
153
  shimmer.wrap(express.application, 'route', wrapAppRoute)
@@ -163,16 +164,37 @@ addHook({ name: 'express', versions: ['>=4'], file: ['lib/express.js'] }, expres
163
164
  // It would otherwise produce spans for router and express, and so duplicating them.
164
165
  // We now fall back to router instrumentation
165
166
  addHook({ name: 'express', versions: ['4'], file: 'lib/express.js' }, express => {
167
+ // `wrapLegacyHandle` only fires for express <4.6.0 layers, which have no
168
+ // prototype dispatch; 4.6.0+ keeps `handle` pristine (wrapped below).
169
+ const { wrapLegacyHandle } = createLayerDispatchWrappers('express')
170
+ const wrapRouterMethod = createWrapRouterMethod('express', getCompileToRegexp(), wrapLegacyHandle)
171
+
166
172
  shimmer.wrap(express.Router, 'use', wrapRouterMethod)
167
173
  shimmer.wrap(express.Router, 'route', wrapRouterMethod)
168
174
 
169
175
  return express
170
176
  })
171
177
 
178
+ // Express 4 bundles its own Layer; express 5 delegates to the `router` package
179
+ // (wrapped in router.js). Both keep `layer.handle` the user's function and trace
180
+ // via the prototype dispatch. express <4.6.0 has no such dispatch and is traced
181
+ // by the legacy handle wrap instead.
182
+ addHook({ name: 'express', file: 'lib/router/layer.js', versions: ['4'] }, Layer => {
183
+ if (typeof Layer.prototype.handle_request !== 'function') return Layer
184
+
185
+ const { wrapLayerRequest, wrapLayerError } = createLayerDispatchWrappers('express')
186
+
187
+ shimmer.wrap(Layer.prototype, 'handle_request', wrapLayerRequest)
188
+ shimmer.wrap(Layer.prototype, 'handle_error', wrapLayerError)
189
+
190
+ return Layer
191
+ })
192
+
172
193
  const queryParserReadCh = channel('datadog:query:read:finish')
173
194
 
174
195
  function publishQueryParsedAndNext (req, res, next) {
175
- return shimmer.wrapFunction(next, next => function () {
196
+ // Mirror next's name/arity so wrapCallback skips its per-call identity rewrite.
197
+ return shimmer.wrapCallback(next, original => function next (_error) {
176
198
  if (queryParserReadCh.hasSubscribers && req) {
177
199
  const abortController = new AbortController()
178
200
  const query = req.query
@@ -182,7 +204,7 @@ function publishQueryParsedAndNext (req, res, next) {
182
204
  if (abortController.signal.aborted) return
183
205
  }
184
206
 
185
- return next.apply(this, arguments)
207
+ return original.apply(this, arguments)
186
208
  })
187
209
  }
188
210
 
@@ -191,12 +213,12 @@ addHook({
191
213
  versions: ['4'],
192
214
  file: 'lib/middleware/query.js',
193
215
  }, query => {
194
- return shimmer.wrapFunction(query, query => function () {
195
- const queryMiddleware = query.apply(this, arguments)
216
+ return shimmer.wrapFunction(query, query => function (...args) {
217
+ const queryMiddleware = query.apply(this, args)
196
218
 
197
- return shimmer.wrapFunction(queryMiddleware, queryMiddleware => function (req, res, next) {
198
- arguments[2] = publishQueryParsedAndNext(req, res, next)
199
- return queryMiddleware.apply(this, arguments)
219
+ return shimmer.wrapFunction(queryMiddleware, queryMiddleware => function (...args) {
220
+ args[2] = publishQueryParsedAndNext(args[0], args[1], args[2])
221
+ return Reflect.apply(queryMiddleware, this, args)
200
222
  })
201
223
  })
202
224
  })
@@ -204,9 +226,9 @@ addHook({
204
226
  const processParamsStartCh = channel('datadog:express:process_params:start')
205
227
  function wrapProcessParamsMethod (requestPositionInArguments) {
206
228
  return function wrapProcessParams (original) {
207
- return function wrappedProcessParams () {
229
+ return function wrappedProcessParams (...args) {
208
230
  if (processParamsStartCh.hasSubscribers) {
209
- const req = arguments[requestPositionInArguments]
231
+ const req = args[requestPositionInArguments]
210
232
  const abortController = new AbortController()
211
233
 
212
234
  processParamsStartCh.publish({
@@ -219,24 +241,24 @@ function wrapProcessParamsMethod (requestPositionInArguments) {
219
241
  if (abortController.signal.aborted) return
220
242
  }
221
243
 
222
- return original.apply(this, arguments)
244
+ return original.apply(this, args)
223
245
  }
224
246
  }
225
247
  }
226
248
 
227
- addHook({ name: 'express', versions: ['>=4.0.0 <4.3.0'], file: ['lib/express.js'] }, express => {
249
+ addHook({ name: 'express', versions: ['>=4.0.0 <4.3.0'], file: 'lib/express.js' }, express => {
228
250
  shimmer.wrap(express.Router, 'process_params', wrapProcessParamsMethod(1))
229
251
  return express
230
252
  })
231
253
 
232
- addHook({ name: 'express', versions: ['>=4.3.0 <5.0.0'], file: ['lib/express.js'] }, express => {
254
+ addHook({ name: 'express', versions: ['>=4.3.0 <5.0.0'], file: 'lib/express.js' }, express => {
233
255
  shimmer.wrap(express.Router, 'process_params', wrapProcessParamsMethod(2))
234
256
  return express
235
257
  })
236
258
 
237
259
  const queryReadCh = channel('datadog:express:query:finish')
238
260
 
239
- addHook({ name: 'express', file: ['lib/request.js'], versions: ['>=5.0.0'] }, request => {
261
+ addHook({ name: 'express', file: 'lib/request.js', versions: ['>=5.0.0'] }, request => {
240
262
  shimmer.wrap(request, 'query', function (originalGet) {
241
263
  return function wrappedGet () {
242
264
  const query = originalGet.call(this)