@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.
- package/LICENSE-3rdparty.csv +89 -104
- package/README.md +9 -3
- package/changes.json +8 -3
- package/ci/init.js +25 -5
- package/ci/vitest-no-worker-init-setup.mjs +430 -0
- package/ext/exporters.js +1 -0
- package/ext/tags.js +3 -0
- package/index.d.ts +349 -244
- package/index.electron.js +3 -0
- package/initialize.mjs +9 -8
- package/loader-hook.mjs +154 -47
- package/package.json +121 -79
- package/packages/datadog-core/src/storage.js +47 -48
- package/packages/datadog-esbuild/index.js +52 -10
- package/packages/datadog-esbuild/src/utils.js +46 -3
- package/packages/datadog-instrumentations/src/aerospike.js +3 -3
- package/packages/datadog-instrumentations/src/ai.js +131 -76
- package/packages/datadog-instrumentations/src/amqplib.js +6 -7
- package/packages/datadog-instrumentations/src/anthropic.js +10 -10
- package/packages/datadog-instrumentations/src/apollo-server-core.js +3 -3
- package/packages/datadog-instrumentations/src/apollo-server.js +10 -18
- package/packages/datadog-instrumentations/src/avsc.js +6 -6
- package/packages/datadog-instrumentations/src/aws-durable-execution-sdk-js-context-methods.js +18 -0
- package/packages/datadog-instrumentations/src/aws-durable-execution-sdk-js.js +111 -0
- package/packages/datadog-instrumentations/src/aws-sdk.js +172 -72
- package/packages/datadog-instrumentations/src/azure-cosmos.js +7 -0
- package/packages/datadog-instrumentations/src/azure-durable-functions.js +8 -8
- package/packages/datadog-instrumentations/src/azure-functions.js +3 -0
- package/packages/datadog-instrumentations/src/bluebird.js +2 -2
- package/packages/datadog-instrumentations/src/body-parser.js +5 -2
- package/packages/datadog-instrumentations/src/cassandra-driver.js +12 -9
- package/packages/datadog-instrumentations/src/child_process.js +22 -32
- package/packages/datadog-instrumentations/src/claude-agent-sdk.js +587 -0
- package/packages/datadog-instrumentations/src/confluentinc-kafka-javascript.js +41 -24
- package/packages/datadog-instrumentations/src/connect.js +14 -12
- package/packages/datadog-instrumentations/src/cookie-parser.js +5 -4
- package/packages/datadog-instrumentations/src/cookie.js +9 -3
- package/packages/datadog-instrumentations/src/couchbase.js +73 -238
- package/packages/datadog-instrumentations/src/crypto.js +50 -6
- package/packages/datadog-instrumentations/src/cucumber-worker-threads.js +19 -0
- package/packages/datadog-instrumentations/src/cucumber.js +751 -188
- package/packages/datadog-instrumentations/src/cypress-config.js +432 -0
- package/packages/datadog-instrumentations/src/cypress.js +88 -4
- package/packages/datadog-instrumentations/src/dns.js +61 -61
- package/packages/datadog-instrumentations/src/elasticsearch.js +9 -12
- package/packages/datadog-instrumentations/src/electron/preload.js +42 -0
- package/packages/datadog-instrumentations/src/electron.js +240 -0
- package/packages/datadog-instrumentations/src/express-mongo-sanitize.js +11 -9
- package/packages/datadog-instrumentations/src/express-session.js +14 -13
- package/packages/datadog-instrumentations/src/express.js +56 -34
- package/packages/datadog-instrumentations/src/fastify.js +169 -86
- package/packages/datadog-instrumentations/src/fetch.js +5 -5
- package/packages/datadog-instrumentations/src/fs.js +47 -47
- package/packages/datadog-instrumentations/src/google-cloud-pubsub.js +5 -7
- package/packages/datadog-instrumentations/src/google-genai.js +4 -4
- package/packages/datadog-instrumentations/src/graphql.js +26 -362
- package/packages/datadog-instrumentations/src/grpc/client.js +48 -32
- package/packages/datadog-instrumentations/src/grpc/server.js +20 -2
- package/packages/datadog-instrumentations/src/hapi.js +2 -2
- package/packages/datadog-instrumentations/src/helpers/bundler-register.js +41 -13
- package/packages/datadog-instrumentations/src/helpers/callback-instrumentor.js +74 -0
- package/packages/datadog-instrumentations/src/helpers/check-require-cache.js +85 -9
- package/packages/datadog-instrumentations/src/helpers/hook.js +34 -6
- package/packages/datadog-instrumentations/src/helpers/hooks.js +24 -19
- package/packages/datadog-instrumentations/src/helpers/instrument.js +61 -14
- package/packages/datadog-instrumentations/src/helpers/kafka.js +58 -0
- package/packages/datadog-instrumentations/src/helpers/optional-peer-bundler.js +65 -0
- package/packages/datadog-instrumentations/src/helpers/promise-instrumentor.js +42 -0
- package/packages/datadog-instrumentations/src/helpers/promise.js +2 -2
- package/packages/datadog-instrumentations/src/helpers/register.js +109 -146
- package/packages/datadog-instrumentations/src/helpers/require-optional-peer.js +17 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/compiler.js +13 -5
- package/packages/datadog-instrumentations/src/helpers/rewriter/index.js +24 -7
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/ai.js +6 -6
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/aws-durable-execution-sdk-js.js +31 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/azure-cosmos.js +50 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/claude-agent-sdk.js +17 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/graphql.js +201 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/index.js +7 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/langgraph.js +4 -2
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/mercurius.js +31 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/modelcontextprotocol-sdk.js +35 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/playwright.js +85 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/loader.mjs +18 -2
- package/packages/datadog-instrumentations/src/helpers/rewriter/transforms.js +49 -224
- package/packages/datadog-instrumentations/src/helpers/router-helper.js +8 -8
- package/packages/datadog-instrumentations/src/hono.js +71 -9
- package/packages/datadog-instrumentations/src/http/client.js +50 -27
- package/packages/datadog-instrumentations/src/http/server.js +77 -34
- package/packages/datadog-instrumentations/src/http2/client.js +16 -15
- package/packages/datadog-instrumentations/src/http2/server.js +156 -25
- package/packages/datadog-instrumentations/src/ioredis.js +17 -14
- package/packages/datadog-instrumentations/src/iovalkey.js +1 -2
- package/packages/datadog-instrumentations/src/jest/bail-reporter.js +42 -0
- package/packages/datadog-instrumentations/src/jest/coverage-backfill.js +163 -0
- package/packages/datadog-instrumentations/src/jest.js +1795 -404
- package/packages/datadog-instrumentations/src/kafkajs.js +284 -170
- package/packages/datadog-instrumentations/src/knex.js +17 -17
- package/packages/datadog-instrumentations/src/koa.js +15 -14
- package/packages/datadog-instrumentations/src/ldapjs.js +5 -5
- package/packages/datadog-instrumentations/src/light-my-request.js +2 -2
- package/packages/datadog-instrumentations/src/limitd-client.js +5 -5
- package/packages/datadog-instrumentations/src/lodash.js +4 -4
- package/packages/datadog-instrumentations/src/mariadb.js +18 -16
- package/packages/datadog-instrumentations/src/memcached.js +4 -3
- package/packages/datadog-instrumentations/src/mercurius.js +11 -0
- package/packages/datadog-instrumentations/src/microgateway-core.js +2 -2
- package/packages/datadog-instrumentations/src/mocha/common.js +7 -4
- package/packages/datadog-instrumentations/src/mocha/main.js +557 -118
- package/packages/datadog-instrumentations/src/mocha/utils.js +531 -128
- package/packages/datadog-instrumentations/src/mocha/worker.js +27 -9
- package/packages/datadog-instrumentations/src/modelcontextprotocol-sdk.js +254 -0
- package/packages/datadog-instrumentations/src/mongodb-core.js +43 -31
- package/packages/datadog-instrumentations/src/mongodb.js +79 -5
- package/packages/datadog-instrumentations/src/mongoose.js +43 -34
- package/packages/datadog-instrumentations/src/mquery.js +5 -5
- package/packages/datadog-instrumentations/src/multer.js +5 -4
- package/packages/datadog-instrumentations/src/mysql.js +17 -17
- package/packages/datadog-instrumentations/src/mysql2.js +39 -5
- package/packages/datadog-instrumentations/src/nats.js +182 -0
- package/packages/datadog-instrumentations/src/net.js +21 -19
- package/packages/datadog-instrumentations/src/next.js +44 -10
- package/packages/datadog-instrumentations/src/nyc.js +43 -6
- package/packages/datadog-instrumentations/src/openai.js +124 -38
- package/packages/datadog-instrumentations/src/oracledb.js +12 -7
- package/packages/datadog-instrumentations/src/otel-sdk-trace.js +27 -6
- package/packages/datadog-instrumentations/src/passport-utils.js +5 -5
- package/packages/datadog-instrumentations/src/path-to-regexp.js +44 -0
- package/packages/datadog-instrumentations/src/pg.js +58 -25
- package/packages/datadog-instrumentations/src/pino.js +26 -42
- package/packages/datadog-instrumentations/src/playwright-browser-scripts.js +27 -0
- package/packages/datadog-instrumentations/src/playwright.js +1090 -351
- package/packages/datadog-instrumentations/src/prisma.js +1 -2
- package/packages/datadog-instrumentations/src/protobufjs.js +16 -16
- package/packages/datadog-instrumentations/src/redis.js +28 -15
- package/packages/datadog-instrumentations/src/restify.js +6 -5
- package/packages/datadog-instrumentations/src/router.js +243 -87
- package/packages/datadog-instrumentations/src/selenium.js +5 -3
- package/packages/datadog-instrumentations/src/sequelize.js +1 -1
- package/packages/datadog-instrumentations/src/stripe.js +47 -33
- package/packages/datadog-instrumentations/src/tedious.js +28 -0
- package/packages/datadog-instrumentations/src/url.js +1 -3
- package/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js +1297 -0
- package/packages/datadog-instrumentations/src/vitest-main.js +1592 -0
- package/packages/datadog-instrumentations/src/vitest-util.js +251 -0
- package/packages/datadog-instrumentations/src/vitest-worker.js +822 -0
- package/packages/datadog-instrumentations/src/vitest.js +11 -1258
- package/packages/datadog-instrumentations/src/vm.js +1 -3
- package/packages/datadog-instrumentations/src/winston.js +4 -4
- package/packages/datadog-instrumentations/src/ws.js +7 -7
- package/packages/datadog-instrumentations/src/zlib.js +29 -0
- package/packages/datadog-plugin-ai/src/index.js +1 -1
- package/packages/datadog-plugin-ai/src/tracing.js +66 -3
- package/packages/datadog-plugin-ai/src/utils.js +17 -4
- package/packages/datadog-plugin-apollo/src/gateway/request.js +1 -21
- package/packages/datadog-plugin-avsc/src/schema_iterator.js +3 -3
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/checkpoint.js +31 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/client.js +55 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/context.js +123 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/handler.js +129 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/index.js +19 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/trace-checkpoint.js +224 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/util.js +79 -0
- package/packages/datadog-plugin-aws-sdk/src/base.js +90 -53
- package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/tracing.js +1 -1
- package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/utils.js +218 -4
- package/packages/datadog-plugin-aws-sdk/src/services/cloudwatchlogs.js +1 -1
- package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js +2 -1
- package/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js +59 -14
- package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js +174 -75
- package/packages/datadog-plugin-aws-sdk/src/services/lambda.js +34 -23
- package/packages/datadog-plugin-aws-sdk/src/services/redshift.js +2 -1
- package/packages/datadog-plugin-aws-sdk/src/services/s3.js +1 -1
- package/packages/datadog-plugin-aws-sdk/src/services/sns.js +26 -26
- package/packages/datadog-plugin-aws-sdk/src/services/sqs.js +187 -101
- package/packages/datadog-plugin-aws-sdk/src/services/stepfunctions.js +20 -18
- package/packages/datadog-plugin-azure-cosmos/src/index.js +144 -0
- package/packages/datadog-plugin-azure-event-hubs/src/producer.js +8 -15
- package/packages/datadog-plugin-azure-functions/src/index.js +7 -3
- package/packages/datadog-plugin-azure-service-bus/src/producer.js +5 -10
- package/packages/datadog-plugin-bullmq/src/consumer.js +5 -4
- package/packages/datadog-plugin-bullmq/src/filter.js +35 -0
- package/packages/datadog-plugin-bullmq/src/producer.js +121 -33
- package/packages/datadog-plugin-bunyan/src/index.js +28 -0
- package/packages/datadog-plugin-child_process/src/index.js +13 -2
- package/packages/datadog-plugin-child_process/src/scrub-cmd-params.js +6 -6
- package/packages/datadog-plugin-claude-agent-sdk/src/index.js +31 -0
- package/packages/datadog-plugin-claude-agent-sdk/src/tracing.js +107 -0
- package/packages/datadog-plugin-claude-agent-sdk/src/util.js +15 -0
- package/packages/datadog-plugin-couchbase/src/index.js +58 -52
- package/packages/datadog-plugin-cucumber/src/index.js +46 -24
- package/packages/datadog-plugin-cypress/src/cypress-plugin.js +1018 -97
- package/packages/datadog-plugin-cypress/src/index.js +104 -2
- package/packages/datadog-plugin-cypress/src/plugin.js +6 -14
- package/packages/datadog-plugin-cypress/src/source-map-utils.js +48 -1
- package/packages/datadog-plugin-cypress/src/support.js +180 -25
- package/packages/datadog-plugin-dd-trace-api/src/index.js +1 -1
- package/packages/datadog-plugin-dns/src/lookup.js +8 -6
- package/packages/datadog-plugin-elasticsearch/src/index.js +28 -8
- package/packages/datadog-plugin-electron/src/index.js +17 -0
- package/packages/datadog-plugin-electron/src/ipc.js +143 -0
- package/packages/datadog-plugin-electron/src/net.js +82 -0
- package/packages/datadog-plugin-express/src/code_origin.js +1 -1
- package/packages/datadog-plugin-fastify/src/code_origin.js +1 -1
- package/packages/datadog-plugin-fs/src/index.js +2 -1
- package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js +2 -5
- package/packages/datadog-plugin-google-cloud-pubsub/src/producer.js +27 -18
- package/packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js +5 -8
- package/packages/datadog-plugin-graphql/src/execute.js +706 -34
- package/packages/datadog-plugin-graphql/src/index.js +43 -9
- package/packages/datadog-plugin-graphql/src/parse.js +45 -4
- package/packages/datadog-plugin-graphql/src/request.js +135 -0
- package/packages/datadog-plugin-graphql/src/tools/signature.js +32 -7
- package/packages/datadog-plugin-graphql/src/tools/transforms.js +118 -100
- package/packages/datadog-plugin-graphql/src/utils.js +261 -3
- package/packages/datadog-plugin-graphql/src/validate.js +53 -7
- package/packages/datadog-plugin-grpc/src/client.js +7 -8
- package/packages/datadog-plugin-grpc/src/server.js +1 -1
- package/packages/datadog-plugin-grpc/src/util.js +57 -22
- package/packages/datadog-plugin-http/src/client.js +12 -14
- package/packages/datadog-plugin-http/src/index.js +6 -8
- package/packages/datadog-plugin-http/src/server.js +63 -20
- package/packages/datadog-plugin-http2/src/client.js +6 -3
- package/packages/datadog-plugin-http2/src/server.js +48 -8
- package/packages/datadog-plugin-jest/src/index.js +136 -68
- package/packages/datadog-plugin-jest/src/util.js +37 -16
- package/packages/datadog-plugin-kafkajs/src/batch-consumer.js +31 -4
- package/packages/datadog-plugin-kafkajs/src/consumer.js +2 -9
- package/packages/datadog-plugin-kafkajs/src/producer.js +37 -8
- package/packages/datadog-plugin-langgraph/src/stream.js +1 -1
- package/packages/datadog-plugin-memcached/src/index.js +1 -1
- package/packages/datadog-plugin-mocha/src/index.js +66 -17
- package/packages/datadog-plugin-modelcontextprotocol-sdk/src/index.js +24 -0
- package/packages/datadog-plugin-modelcontextprotocol-sdk/src/tracing.js +173 -0
- package/packages/datadog-plugin-modelcontextprotocol-sdk/src/utils.js +30 -0
- package/packages/datadog-plugin-mongodb-core/src/bulk-write.js +43 -0
- package/packages/datadog-plugin-mongodb-core/src/index.js +8 -206
- package/packages/datadog-plugin-mongodb-core/src/query.js +452 -0
- package/packages/datadog-plugin-mysql/src/index.js +9 -4
- package/packages/datadog-plugin-nats/src/consumer.js +43 -0
- package/packages/datadog-plugin-nats/src/index.js +20 -0
- package/packages/datadog-plugin-nats/src/producer.js +62 -0
- package/packages/datadog-plugin-nats/src/util.js +33 -0
- package/packages/datadog-plugin-next/src/index.js +14 -18
- package/packages/datadog-plugin-openai/src/services.js +5 -3
- package/packages/datadog-plugin-openai/src/tracing.js +27 -25
- package/packages/datadog-plugin-oracledb/src/index.js +13 -2
- package/packages/datadog-plugin-pg/src/index.js +13 -3
- package/packages/datadog-plugin-pino/src/index.js +42 -0
- package/packages/datadog-plugin-playwright/src/index.js +21 -11
- package/packages/datadog-plugin-protobufjs/src/schema_iterator.js +3 -3
- package/packages/datadog-plugin-redis/src/index.js +54 -25
- package/packages/datadog-plugin-rhea/src/producer.js +1 -1
- package/packages/datadog-plugin-router/src/index.js +46 -44
- package/packages/datadog-plugin-selenium/src/index.js +1 -1
- package/packages/datadog-plugin-tedious/src/index.js +1 -1
- package/packages/datadog-plugin-undici/src/index.js +24 -2
- package/packages/datadog-plugin-vitest/src/index.js +160 -90
- package/packages/datadog-plugin-winston/src/index.js +30 -0
- package/packages/datadog-plugin-ws/src/close.js +3 -1
- package/packages/datadog-plugin-ws/src/producer.js +2 -0
- package/packages/datadog-plugin-ws/src/receiver.js +2 -1
- package/packages/datadog-shimmer/src/shimmer.js +101 -39
- package/packages/datadog-webpack/index.js +20 -4
- package/packages/datadog-webpack/src/optional-peer-loader.js +17 -0
- package/packages/dd-trace/index.electron.js +3 -0
- package/packages/dd-trace/index.js +2 -34
- package/packages/dd-trace/src/aiguard/channels.js +7 -0
- package/packages/dd-trace/src/aiguard/index.js +16 -34
- package/packages/dd-trace/src/aiguard/integrations/evaluate.js +46 -0
- package/packages/dd-trace/src/aiguard/integrations/index.js +34 -0
- package/packages/dd-trace/src/aiguard/integrations/openai.js +80 -0
- package/packages/dd-trace/src/aiguard/integrations/vercel-ai.js +92 -0
- package/packages/dd-trace/src/aiguard/messages/openai.js +382 -0
- package/packages/{datadog-instrumentations/src/helpers/ai-messages.js → dd-trace/src/aiguard/messages/vercel-ai.js} +30 -27
- package/packages/dd-trace/src/aiguard/sdk.js +151 -54
- package/packages/dd-trace/src/aiguard/tags.js +26 -10
- package/packages/dd-trace/src/appsec/api_security/index.js +55 -0
- package/packages/dd-trace/src/appsec/api_security/sampler.js +147 -0
- package/packages/dd-trace/src/appsec/blocked_templates.js +4 -3
- package/packages/dd-trace/src/appsec/blocking.js +84 -41
- package/packages/dd-trace/src/appsec/channels.js +5 -1
- package/packages/dd-trace/src/appsec/downstream_requests.js +116 -62
- package/packages/dd-trace/src/appsec/graphql.js +20 -17
- package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-rules.js +1 -1
- package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-secret-rules.js +81 -81
- package/packages/dd-trace/src/appsec/iast/analyzers/nosql-injection-mongodb-analyzer.js +23 -23
- package/packages/dd-trace/src/appsec/iast/iast-plugin.js +1 -1
- package/packages/dd-trace/src/appsec/iast/index.js +3 -2
- package/packages/dd-trace/src/appsec/iast/security-controls/index.js +4 -4
- package/packages/dd-trace/src/appsec/iast/taint-tracking/plugins/kafka.js +2 -2
- package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js +4 -4
- package/packages/dd-trace/src/appsec/iast/taint-tracking/taint-tracking-impl.js +2 -2
- package/packages/dd-trace/src/appsec/iast/telemetry/index.js +2 -1
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/ldap-sensitive-analyzer.js +54 -12
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/url-sensitive-analyzer.js +5 -1
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-handler.js +32 -5
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/index.js +1 -3
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js +84 -49
- package/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js +1 -1
- package/packages/dd-trace/src/appsec/index.js +65 -47
- package/packages/dd-trace/src/appsec/lambda.js +135 -0
- package/packages/dd-trace/src/appsec/rasp/command_injection.js +4 -5
- package/packages/dd-trace/src/appsec/rasp/lfi.js +8 -4
- package/packages/dd-trace/src/appsec/rasp/sql_injection.js +5 -10
- package/packages/dd-trace/src/appsec/rasp/ssrf.js +26 -18
- package/packages/dd-trace/src/appsec/recommended.json +2438 -13
- package/packages/dd-trace/src/appsec/remote_config.js +1 -0
- package/packages/dd-trace/src/appsec/reporter.js +87 -28
- package/packages/dd-trace/src/appsec/rule_manager.js +4 -2
- package/packages/dd-trace/src/appsec/sdk/index.js +4 -0
- package/packages/dd-trace/src/appsec/sdk/set_user.js +1 -1
- package/packages/dd-trace/src/appsec/sdk/track_event.js +5 -5
- package/packages/dd-trace/src/appsec/sdk/user_blocking.js +7 -11
- package/packages/dd-trace/src/appsec/sdk/utils.js +5 -3
- package/packages/dd-trace/src/appsec/store.js +50 -0
- package/packages/dd-trace/src/appsec/telemetry/api_security.js +34 -0
- package/packages/dd-trace/src/appsec/telemetry/index.js +27 -1
- package/packages/dd-trace/src/appsec/user_tracking.js +5 -4
- package/packages/dd-trace/src/appsec/waf/index.js +19 -9
- package/packages/dd-trace/src/appsec/waf/waf_context_wrapper.js +35 -20
- package/packages/dd-trace/src/appsec/waf/waf_manager.js +1 -1
- package/packages/dd-trace/src/azure_metadata.js +17 -6
- package/packages/dd-trace/src/baggage.js +32 -13
- package/packages/dd-trace/src/bootstrap.js +39 -0
- package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/index.js +36 -6
- package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/worker/index.js +122 -24
- package/packages/dd-trace/src/ci-visibility/early-flake-detection/get-known-tests.js +22 -7
- package/packages/dd-trace/src/ci-visibility/exporters/agent-proxy/index.js +5 -2
- package/packages/dd-trace/src/ci-visibility/exporters/agentless/coverage-writer.js +2 -2
- package/packages/dd-trace/src/ci-visibility/exporters/agentless/di-logs-writer.js +2 -2
- package/packages/dd-trace/src/ci-visibility/exporters/agentless/index.js +6 -2
- package/packages/dd-trace/src/ci-visibility/exporters/agentless/writer.js +2 -2
- package/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js +148 -25
- package/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js +3 -4
- package/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js +28 -10
- package/packages/dd-trace/src/ci-visibility/exporters/test-worker/writer.js +22 -0
- package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites.js +105 -22
- package/packages/dd-trace/src/ci-visibility/lage.js +2 -1
- package/packages/dd-trace/src/ci-visibility/log-submission/log-submission-plugin.js +4 -5
- package/packages/dd-trace/src/ci-visibility/requests/fs-cache.js +4 -5
- package/packages/dd-trace/src/ci-visibility/requests/get-library-configuration.js +73 -55
- package/packages/dd-trace/src/ci-visibility/requests/request.js +14 -50
- package/packages/dd-trace/src/ci-visibility/requests/upload-coverage-report.js +4 -4
- package/packages/dd-trace/src/ci-visibility/requests/upload-test-screenshot.js +156 -0
- package/packages/dd-trace/src/ci-visibility/test-api-manual/test-api-manual-plugin.js +9 -3
- package/packages/dd-trace/src/ci-visibility/test-management/get-test-management-tests.js +24 -6
- package/packages/dd-trace/src/ci-visibility/test-optimization-cache.js +70 -6
- package/packages/dd-trace/src/ci-visibility/test-optimization-http-cache-schema.js +128 -0
- package/packages/dd-trace/src/ci-visibility/test-optimization-http-cache.js +291 -0
- package/packages/dd-trace/src/config/config-types.d.ts +8 -6
- package/packages/dd-trace/src/config/defaults.js +341 -144
- package/packages/dd-trace/src/config/generated-config-types.d.ts +679 -131
- package/packages/dd-trace/src/config/git_properties.js +2 -2
- package/packages/dd-trace/src/config/helper.js +183 -28
- package/packages/dd-trace/src/config/index.js +565 -1515
- package/packages/dd-trace/src/config/major-overrides.js +100 -0
- package/packages/dd-trace/src/config/normalize-service.js +31 -0
- package/packages/dd-trace/src/config/parsers.js +384 -0
- package/packages/dd-trace/src/config/remote_config.js +59 -2
- package/packages/dd-trace/src/config/supported-configurations.json +638 -530
- package/packages/dd-trace/src/constants.js +15 -0
- package/packages/dd-trace/src/crashtracking/crashtracker.js +25 -7
- package/packages/dd-trace/src/crashtracking/index.js +1 -7
- package/packages/dd-trace/src/datastreams/checkpointer.js +6 -12
- package/packages/dd-trace/src/datastreams/context.js +4 -2
- package/packages/dd-trace/src/datastreams/encoding.js +39 -28
- package/packages/dd-trace/src/datastreams/index.js +2 -1
- package/packages/dd-trace/src/datastreams/manager.js +1 -1
- package/packages/dd-trace/src/datastreams/pathway.js +35 -30
- package/packages/dd-trace/src/datastreams/processor.js +31 -22
- package/packages/dd-trace/src/datastreams/size.js +6 -2
- package/packages/dd-trace/src/datastreams/writer.js +15 -6
- package/packages/dd-trace/src/debugger/config.js +9 -4
- package/packages/dd-trace/src/debugger/devtools_client/breakpoints.js +49 -35
- package/packages/dd-trace/src/debugger/devtools_client/condition.js +5 -8
- package/packages/dd-trace/src/debugger/devtools_client/config.js +3 -2
- package/packages/dd-trace/src/debugger/devtools_client/index.js +33 -71
- package/packages/dd-trace/src/debugger/devtools_client/probe_sampler.js +83 -0
- package/packages/dd-trace/src/debugger/devtools_client/send.js +27 -6
- package/packages/dd-trace/src/debugger/devtools_client/snapshot/collector.js +2 -2
- package/packages/dd-trace/src/debugger/devtools_client/snapshot/processor.js +5 -2
- package/packages/dd-trace/src/debugger/devtools_client/snapshot-pruner.js +1 -0
- package/packages/dd-trace/src/debugger/devtools_client/source-maps.js +1 -1
- package/packages/dd-trace/src/debugger/devtools_client/state.js +3 -1
- package/packages/dd-trace/src/debugger/index.js +14 -10
- package/packages/dd-trace/src/debugger/probe_sampler.js +112 -0
- package/packages/dd-trace/src/debugger/probe_sampler_constants.js +19 -0
- package/packages/dd-trace/src/dogstatsd.js +45 -36
- package/packages/dd-trace/src/encode/0.4.js +830 -269
- package/packages/dd-trace/src/encode/0.5.js +158 -22
- package/packages/dd-trace/src/encode/agentless-ci-visibility.js +141 -65
- package/packages/dd-trace/src/encode/agentless-json.js +12 -6
- package/packages/dd-trace/src/encode/coverage-ci-visibility.js +52 -15
- package/packages/dd-trace/src/encode/span-stats.js +19 -16
- package/packages/dd-trace/src/encode/tags-processors.js +30 -25
- package/packages/dd-trace/src/exporter.js +3 -1
- package/packages/dd-trace/src/exporters/agent/index.js +4 -5
- package/packages/dd-trace/src/exporters/agent/writer.js +8 -3
- package/packages/dd-trace/src/exporters/agentless/index.js +12 -13
- package/packages/dd-trace/src/exporters/agentless/intake.js +43 -0
- package/packages/dd-trace/src/exporters/agentless/writer.js +12 -11
- package/packages/dd-trace/src/exporters/common/agents.js +3 -1
- package/packages/dd-trace/src/exporters/common/buffering-exporter.js +3 -3
- package/packages/dd-trace/src/exporters/common/request.js +55 -26
- package/packages/dd-trace/src/exporters/common/retry.js +104 -0
- package/packages/dd-trace/src/exporters/common/url.js +34 -0
- package/packages/dd-trace/src/exporters/common/util.js +2 -2
- package/packages/dd-trace/src/exporters/common/writer.js +29 -3
- package/packages/dd-trace/src/exporters/electron/index.js +49 -0
- package/packages/dd-trace/src/exporters/span-stats/index.js +1 -2
- package/packages/dd-trace/src/exporters/span-stats/writer.js +1 -3
- package/packages/dd-trace/src/external-logger/src/index.js +2 -1
- package/packages/dd-trace/src/feature-registry.js +22 -0
- package/packages/dd-trace/src/git_metadata.js +68 -0
- package/packages/dd-trace/src/git_metadata_tagger.js +13 -5
- package/packages/dd-trace/src/guardrails/index.js +11 -6
- package/packages/dd-trace/src/guardrails/telemetry.js +40 -3
- package/packages/dd-trace/src/heap_snapshots.js +7 -4
- package/packages/dd-trace/src/id.js +46 -27
- package/packages/dd-trace/src/index.js +6 -4
- package/packages/dd-trace/src/lambda/handler-paths.js +52 -0
- package/packages/dd-trace/src/lambda/handler.js +2 -6
- package/packages/dd-trace/src/lambda/index.js +62 -14
- package/packages/dd-trace/src/lambda/runtime/patch.js +21 -46
- package/packages/dd-trace/src/llmobs/constants/tags.js +13 -0
- package/packages/dd-trace/src/llmobs/index.js +41 -8
- package/packages/dd-trace/src/llmobs/plugins/ai/ddTelemetry.js +403 -0
- package/packages/dd-trace/src/llmobs/plugins/ai/index.js +8 -391
- package/packages/dd-trace/src/llmobs/plugins/ai/util.js +178 -18
- package/packages/dd-trace/src/llmobs/plugins/ai/vercelTelemetry.js +363 -0
- package/packages/dd-trace/src/llmobs/plugins/{anthropic.js → anthropic/index.js} +32 -79
- package/packages/dd-trace/src/llmobs/plugins/anthropic/util.js +109 -0
- package/packages/dd-trace/src/llmobs/plugins/base.js +4 -4
- package/packages/dd-trace/src/llmobs/plugins/bedrockruntime.js +92 -38
- package/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/index.js +270 -0
- package/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/utils.js +10 -0
- package/packages/dd-trace/src/llmobs/plugins/genai/index.js +5 -1
- package/packages/dd-trace/src/llmobs/plugins/genai/util.js +81 -16
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/chain.js +3 -2
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/chat_model.js +3 -2
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/embedding.js +2 -1
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/index.js +1 -50
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/vectorstore.js +2 -1
- package/packages/dd-trace/src/llmobs/plugins/langchain/index.js +14 -8
- package/packages/dd-trace/src/llmobs/plugins/langchain/messages.js +76 -0
- package/packages/dd-trace/src/llmobs/plugins/langgraph/index.js +3 -28
- package/packages/dd-trace/src/llmobs/plugins/modelcontextprotocol-sdk/index.js +68 -0
- package/packages/dd-trace/src/llmobs/plugins/modelcontextprotocol-sdk/utils.js +57 -0
- package/packages/dd-trace/src/llmobs/plugins/openai/index.js +21 -51
- package/packages/dd-trace/src/llmobs/sdk.js +66 -41
- package/packages/dd-trace/src/llmobs/span_processor.js +91 -12
- package/packages/dd-trace/src/llmobs/tagger.js +135 -7
- package/packages/dd-trace/src/llmobs/telemetry.js +31 -1
- package/packages/dd-trace/src/llmobs/util.js +202 -9
- package/packages/dd-trace/src/llmobs/writers/base.js +13 -5
- package/packages/dd-trace/src/llmobs/writers/spans.js +1 -1
- package/packages/dd-trace/src/llmobs/writers/util.js +4 -2
- package/packages/dd-trace/src/log/index.js +28 -69
- package/packages/dd-trace/src/log/writer.js +10 -20
- package/packages/dd-trace/src/msgpack/chunk.js +430 -11
- package/packages/dd-trace/src/msgpack/index.js +101 -2
- package/packages/dd-trace/src/noop/proxy.js +13 -4
- package/packages/dd-trace/src/noop/span.js +3 -1
- package/packages/dd-trace/src/openfeature/encoding.js +70 -0
- package/packages/dd-trace/src/openfeature/eval-metrics-hook.js +103 -0
- package/packages/dd-trace/src/openfeature/flagging_provider.js +26 -1
- package/packages/dd-trace/src/openfeature/noop.js +40 -36
- package/packages/dd-trace/src/openfeature/register.js +46 -0
- package/packages/dd-trace/src/openfeature/remote_config.js +6 -1
- package/packages/dd-trace/src/openfeature/span-enrichment-hook.js +143 -0
- package/packages/dd-trace/src/openfeature/span-enrichment.js +149 -0
- package/packages/dd-trace/src/openfeature/writers/base.js +3 -11
- package/packages/dd-trace/src/openfeature/writers/exposures.js +82 -70
- package/packages/dd-trace/src/openfeature/writers/util.js +1 -2
- package/packages/dd-trace/src/opentelemetry/active-span-proxy.js +42 -0
- package/packages/dd-trace/src/opentelemetry/bridge-span-base.js +107 -0
- package/packages/dd-trace/src/opentelemetry/context_manager.js +27 -13
- package/packages/dd-trace/src/opentelemetry/logs/index.js +7 -7
- package/packages/dd-trace/src/opentelemetry/logs/otlp_http_log_exporter.js +3 -2
- package/packages/dd-trace/src/opentelemetry/metrics/index.js +62 -13
- package/packages/dd-trace/src/opentelemetry/metrics/instruments.js +28 -14
- package/packages/dd-trace/src/opentelemetry/metrics/meter.js +7 -10
- package/packages/dd-trace/src/opentelemetry/metrics/otlp_http_metric_exporter.js +3 -2
- package/packages/dd-trace/src/opentelemetry/metrics/otlp_span_stats_exporter.js +40 -0
- package/packages/dd-trace/src/opentelemetry/metrics/otlp_span_stats_transformer.js +169 -0
- package/packages/dd-trace/src/opentelemetry/metrics/periodic_metric_reader.js +99 -5
- package/packages/dd-trace/src/opentelemetry/metrics/time.js +19 -0
- package/packages/dd-trace/src/opentelemetry/otlp/common.proto +2 -2
- package/packages/dd-trace/src/opentelemetry/otlp/logs.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/logs_service.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/metrics.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/metrics_service.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/otlp_http_exporter_base.js +56 -82
- package/packages/dd-trace/src/opentelemetry/otlp/otlp_transformer_base.js +1 -2
- package/packages/dd-trace/src/opentelemetry/otlp/protobuf_loader.js +14 -2
- package/packages/dd-trace/src/opentelemetry/otlp/trace.proto +358 -0
- package/packages/dd-trace/src/opentelemetry/otlp/trace_service.proto +78 -0
- package/packages/dd-trace/src/opentelemetry/span-helpers.js +325 -0
- package/packages/dd-trace/src/opentelemetry/span.js +59 -109
- package/packages/dd-trace/src/opentelemetry/span_context.js +1 -0
- package/packages/dd-trace/src/opentelemetry/span_processor.js +7 -5
- package/packages/dd-trace/src/opentelemetry/trace/index.js +75 -0
- package/packages/dd-trace/src/opentelemetry/trace/otlp_http_trace_exporter.js +75 -0
- package/packages/dd-trace/src/opentelemetry/trace/otlp_transformer.js +375 -0
- package/packages/dd-trace/src/opentelemetry/tracer.js +20 -69
- package/packages/dd-trace/src/opentelemetry/tracer_provider.js +33 -17
- package/packages/dd-trace/src/opentracing/propagation/log.js +28 -8
- package/packages/dd-trace/src/opentracing/propagation/text_map.js +280 -145
- package/packages/dd-trace/src/opentracing/propagation/text_map_dsm.js +11 -11
- package/packages/dd-trace/src/opentracing/propagation/tracestate.js +98 -32
- package/packages/dd-trace/src/opentracing/span.js +127 -73
- package/packages/dd-trace/src/opentracing/span_context.js +68 -3
- package/packages/dd-trace/src/opentracing/tracer.js +46 -19
- package/packages/dd-trace/src/payload-tagging/config/index.js +8 -7
- package/packages/dd-trace/src/plugin_manager.js +44 -20
- package/packages/dd-trace/src/plugins/apollo.js +3 -1
- package/packages/dd-trace/src/plugins/ci_plugin.js +391 -85
- package/packages/dd-trace/src/plugins/database.js +61 -18
- package/packages/dd-trace/src/plugins/index.js +14 -0
- package/packages/dd-trace/src/plugins/log_injection.js +56 -0
- package/packages/dd-trace/src/plugins/log_plugin.js +4 -44
- package/packages/dd-trace/src/plugins/outbound.js +1 -1
- package/packages/dd-trace/src/plugins/plugin.js +22 -28
- package/packages/dd-trace/src/plugins/storage.js +2 -2
- package/packages/dd-trace/src/plugins/tracing.js +70 -13
- package/packages/dd-trace/src/plugins/util/ci.js +127 -40
- package/packages/dd-trace/src/plugins/util/git-cache.js +23 -23
- package/packages/dd-trace/src/plugins/util/git.js +3 -1
- package/packages/dd-trace/src/plugins/util/http-otel-semantics.js +276 -0
- package/packages/dd-trace/src/plugins/util/llm.js +6 -1
- package/packages/dd-trace/src/plugins/util/stacktrace.js +2 -2
- package/packages/dd-trace/src/plugins/util/test.js +894 -65
- package/packages/dd-trace/src/plugins/util/url.js +71 -5
- package/packages/dd-trace/src/plugins/util/user-provided-git.js +18 -16
- package/packages/dd-trace/src/plugins/util/web.js +116 -180
- package/packages/dd-trace/src/priority_sampler.js +12 -21
- package/packages/dd-trace/src/process-tags/index.js +3 -0
- package/packages/dd-trace/src/profiler.js +27 -2
- package/packages/dd-trace/src/profiling/config.js +145 -393
- package/packages/dd-trace/src/profiling/constants.js +4 -7
- package/packages/dd-trace/src/profiling/exporter_cli.js +10 -13
- package/packages/dd-trace/src/profiling/exporters/agent.js +61 -28
- package/packages/dd-trace/src/profiling/exporters/event_serializer.js +50 -15
- package/packages/dd-trace/src/profiling/exporters/file.js +16 -5
- package/packages/dd-trace/src/profiling/oom.js +71 -0
- package/packages/dd-trace/src/profiling/profiler.js +123 -132
- package/packages/dd-trace/src/profiling/profilers/event_plugins/crypto.js +32 -0
- package/packages/dd-trace/src/profiling/profilers/event_plugins/zlib.js +19 -0
- package/packages/dd-trace/src/profiling/profilers/events.js +57 -14
- package/packages/dd-trace/src/profiling/profilers/space.js +27 -16
- package/packages/dd-trace/src/profiling/profilers/wall.js +136 -39
- package/packages/dd-trace/src/profiling/ssi-heuristics.js +7 -4
- package/packages/dd-trace/src/propagation-hash/index.js +3 -2
- package/packages/dd-trace/src/proxy.js +82 -39
- package/packages/dd-trace/src/rate_limiter.js +1 -1
- package/packages/dd-trace/src/remote_config/index.js +9 -5
- package/packages/dd-trace/src/remote_config/scheduler.js +1 -1
- package/packages/dd-trace/src/require-package-json.js +8 -4
- package/packages/dd-trace/src/ritm.js +63 -28
- package/packages/dd-trace/src/runtime_metrics/client.js +30 -0
- package/packages/dd-trace/src/runtime_metrics/index.js +17 -4
- package/packages/dd-trace/src/runtime_metrics/otlp_runtime_metrics.js +284 -0
- package/packages/dd-trace/src/runtime_metrics/runtime_metrics.js +45 -41
- package/packages/dd-trace/src/sampler.js +1 -1
- package/packages/dd-trace/src/sampling_rule.js +7 -7
- package/packages/dd-trace/src/scope.js +10 -15
- package/packages/dd-trace/src/serverless.js +6 -7
- package/packages/dd-trace/src/service-naming/extra-services.js +14 -0
- package/packages/dd-trace/src/service-naming/index.js +1 -1
- package/packages/dd-trace/src/service-naming/schemas/definition.js +4 -1
- package/packages/dd-trace/src/service-naming/schemas/util.js +48 -3
- package/packages/dd-trace/src/service-naming/schemas/v0/graphql.js +6 -0
- package/packages/dd-trace/src/service-naming/schemas/v0/messaging.js +61 -2
- package/packages/dd-trace/src/service-naming/schemas/v0/serverless.js +12 -0
- package/packages/dd-trace/src/service-naming/schemas/v0/storage.js +60 -0
- package/packages/dd-trace/src/service-naming/schemas/v0/web.js +25 -1
- package/packages/dd-trace/src/service-naming/schemas/v0/websocket.js +5 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/graphql.js +8 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/messaging.js +32 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/serverless.js +12 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/storage.js +17 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/web.js +23 -3
- package/packages/dd-trace/src/service-naming/schemas/v1/websocket.js +6 -0
- package/packages/dd-trace/src/service-naming/source-resolver.js +50 -0
- package/packages/dd-trace/src/span_format.js +269 -81
- package/packages/dd-trace/src/span_processor.js +13 -13
- package/packages/dd-trace/src/span_stats.js +101 -79
- package/packages/dd-trace/src/spanleak.js +1 -2
- package/packages/dd-trace/src/standalone/index.js +6 -25
- package/packages/dd-trace/src/startup-log.js +3 -3
- package/packages/dd-trace/src/tagger.js +2 -4
- package/packages/dd-trace/src/telemetry/dependencies.js +2 -2
- package/packages/dd-trace/src/telemetry/endpoints.js +7 -5
- package/packages/dd-trace/src/telemetry/index.js +2 -3
- package/packages/dd-trace/src/telemetry/logs/index.js +1 -1
- package/packages/dd-trace/src/telemetry/send-data.js +25 -39
- package/packages/dd-trace/src/telemetry/session-propagation.js +20 -45
- package/packages/dd-trace/src/telemetry/telemetry.js +42 -183
- package/packages/dd-trace/src/tracer.js +23 -9
- package/packages/dd-trace/src/tracer_metadata.js +1 -1
- package/packages/dd-trace/src/util.js +31 -9
- package/register.js +58 -1
- package/vendor/dist/@apm-js-collab/code-transformer/index.js +94 -42
- package/vendor/dist/@datadog/sketches-js/LICENSE +10 -36
- package/vendor/dist/@datadog/sketches-js/index.js +1 -1
- package/vendor/dist/pprof-format/index.js +1 -1
- package/vendor/dist/protobufjs/index.js +1 -1
- package/vendor/dist/protobufjs/minimal/index.js +1 -1
- package/vendor/dist/shell-quote/index.js +1 -1
- package/packages/datadog-plugin-graphql/src/resolve.js +0 -178
- package/packages/dd-trace/src/agent/url.js +0 -28
- package/packages/dd-trace/src/appsec/api_security_sampler.js +0 -117
- package/packages/dd-trace/src/lambda/runtime/ritm.js +0 -133
- package/packages/dd-trace/src/log/utils.js +0 -16
- package/packages/dd-trace/src/msgpack/encoder.js +0 -308
- package/packages/dd-trace/src/plugins/structured_log_plugin.js +0 -9
- package/scripts/preinstall.js +0 -34
- package/vendor/dist/ignore/LICENSE +0 -21
- package/vendor/dist/ignore/index.js +0 -1
- package/vendor/dist/opentracing/LICENSE +0 -201
- package/vendor/dist/opentracing/binary_carrier.d.ts +0 -11
- package/vendor/dist/opentracing/constants.d.ts +0 -61
- package/vendor/dist/opentracing/examples/demo/demo.d.ts +0 -2
- package/vendor/dist/opentracing/ext/tags.d.ts +0 -90
- package/vendor/dist/opentracing/functions.d.ts +0 -20
- package/vendor/dist/opentracing/global_tracer.d.ts +0 -14
- package/vendor/dist/opentracing/index.d.ts +0 -12
- package/vendor/dist/opentracing/index.js +0 -1
- package/vendor/dist/opentracing/mock_tracer/index.d.ts +0 -5
- package/vendor/dist/opentracing/mock_tracer/mock_context.d.ts +0 -13
- package/vendor/dist/opentracing/mock_tracer/mock_report.d.ts +0 -16
- package/vendor/dist/opentracing/mock_tracer/mock_span.d.ts +0 -50
- package/vendor/dist/opentracing/mock_tracer/mock_tracer.d.ts +0 -26
- package/vendor/dist/opentracing/noop.d.ts +0 -8
- package/vendor/dist/opentracing/reference.d.ts +0 -33
- package/vendor/dist/opentracing/span.d.ts +0 -147
- package/vendor/dist/opentracing/span_context.d.ts +0 -26
- package/vendor/dist/opentracing/test/api_compatibility.d.ts +0 -16
- package/vendor/dist/opentracing/test/mocktracer_implemenation.d.ts +0 -3
- package/vendor/dist/opentracing/test/noop_implementation.d.ts +0 -4
- package/vendor/dist/opentracing/test/opentracing_api.d.ts +0 -3
- package/vendor/dist/opentracing/test/unittest.d.ts +0 -2
- package/vendor/dist/opentracing/tracer.d.ts +0 -127
- package/vendor/dist/path-to-regexp/LICENSE +0 -21
- package/vendor/dist/path-to-regexp/index.js +0 -1
|
@@ -1,236 +1,61 @@
|
|
|
1
1
|
'use strict'
|
|
2
2
|
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const code = `
|
|
34
|
-
const ${channelVariable} = tr_ch_apm_tracingChannel("orchestrion:${name}:${channelName}")
|
|
35
|
-
`
|
|
36
|
-
|
|
37
|
-
node.body.splice(index + 1, 0, parse(code).body[0])
|
|
38
|
-
},
|
|
39
|
-
|
|
40
|
-
traceAsyncIterator: traceAny,
|
|
41
|
-
traceIterator: traceAny,
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
function traceAny (state, node, _parent, ancestry) {
|
|
45
|
-
const program = ancestry[ancestry.length - 1]
|
|
46
|
-
|
|
47
|
-
if (node.type === 'ClassDeclaration' || node.type === 'ClassExpression') {
|
|
48
|
-
traceInstanceMethod(state, node, program)
|
|
49
|
-
} else {
|
|
50
|
-
traceFunction(state, node, program)
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
function traceFunction (state, node, program) {
|
|
55
|
-
transforms.tracingChannelDeclaration(state, program)
|
|
56
|
-
|
|
57
|
-
node.body = wrap(state, {
|
|
58
|
-
type: 'FunctionExpression',
|
|
59
|
-
params: node.params,
|
|
60
|
-
body: node.body,
|
|
61
|
-
async: node.async,
|
|
62
|
-
expression: false,
|
|
63
|
-
generator: node.generator,
|
|
64
|
-
}, program)
|
|
65
|
-
|
|
66
|
-
// The original function no longer contains any calls to `await` or `yield` as
|
|
67
|
-
// the function body is copied to the internal wrapped function, so we set
|
|
68
|
-
// these to false to avoid altering the return value of the wrapper. The old
|
|
69
|
-
// values are instead copied to the new AST node above.
|
|
70
|
-
node.generator = false
|
|
71
|
-
node.async = false
|
|
72
|
-
|
|
73
|
-
wrapSuper(state, node)
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
function traceInstanceMethod (state, node, program) {
|
|
77
|
-
const { functionQuery, operator } = state
|
|
78
|
-
const { methodName } = functionQuery
|
|
79
|
-
|
|
80
|
-
const classBody = node.body
|
|
81
|
-
|
|
82
|
-
// If the method exists on the class, we return as it will be patched later
|
|
83
|
-
// while traversing child nodes later on.
|
|
84
|
-
if (classBody.body.some(({ key }) => key.name === methodName)) return
|
|
85
|
-
|
|
86
|
-
// Method doesn't exist on the class so we assume an instance method and
|
|
87
|
-
// wrap it in the constructor instead.
|
|
88
|
-
let ctor = classBody.body.find(({ kind }) => kind === 'constructor')
|
|
89
|
-
|
|
90
|
-
transforms.tracingChannelDeclaration(state, program)
|
|
91
|
-
|
|
92
|
-
if (!ctor) {
|
|
93
|
-
ctor = parse(
|
|
94
|
-
node.superClass
|
|
95
|
-
? 'class A { constructor (...args) { super(...args) } }'
|
|
96
|
-
: 'class A { constructor () {} }'
|
|
97
|
-
).body[0].body.body[0] // Extract constructor from dummy class body.
|
|
98
|
-
|
|
99
|
-
classBody.body.unshift(ctor)
|
|
3
|
+
// Custom transforms registered via InstrumentationMatcher.addTransform().
|
|
4
|
+
//
|
|
5
|
+
// Use this file for transforms that are not yet supported upstream in
|
|
6
|
+
// @apm-js-collab/code-transformer (Orchestrion) or that cannot land there
|
|
7
|
+
// for dd-trace-specific reasons. Once a transform is available natively in
|
|
8
|
+
// the library, replace the custom registration with the built-in option and
|
|
9
|
+
// remove the entry here.
|
|
10
|
+
|
|
11
|
+
const assert = require('node:assert')
|
|
12
|
+
|
|
13
|
+
const clone = require('../../../../../vendor/dist/rfdc')({ proto: false, circles: false })
|
|
14
|
+
|
|
15
|
+
const { parse, query } = require('./compiler')
|
|
16
|
+
|
|
17
|
+
module.exports = { waitForAsyncEnd }
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Injects a wait for `ctx.asyncEndPromise` into a generated `tracePromise`
|
|
21
|
+
* wrapper's native-Promise fulfillment handler.
|
|
22
|
+
*
|
|
23
|
+
* @param {object} _state
|
|
24
|
+
* @param {import('estree').CallExpression} node
|
|
25
|
+
* @returns {void}
|
|
26
|
+
*/
|
|
27
|
+
function waitForAsyncEnd (_state, node) {
|
|
28
|
+
const onFulfilled = node.arguments[0]
|
|
29
|
+
const statements = onFulfilled?.body?.body
|
|
30
|
+
|
|
31
|
+
if (!statements || query(onFulfilled.body, '[id.name=__apm$asyncEndPromise]').length > 0) {
|
|
32
|
+
return
|
|
100
33
|
}
|
|
101
34
|
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
this["${methodName}"] = function () {}
|
|
105
|
-
`).body
|
|
106
|
-
|
|
107
|
-
// Extract only right-hand side function of line 2.
|
|
108
|
-
const fn = ctorBody[1].expression.right
|
|
109
|
-
|
|
110
|
-
fn.async = operator === 'tracePromise'
|
|
111
|
-
fn.body = wrap(state, { type: 'Identifier', name: `__apm$${methodName}` }, program)
|
|
112
|
-
|
|
113
|
-
wrapSuper(state, fn)
|
|
114
|
-
|
|
115
|
-
ctor.value.body.body.push(...ctorBody)
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
function wrap (state, node, program) {
|
|
119
|
-
const { operator } = state
|
|
120
|
-
|
|
121
|
-
if (operator === 'traceAsyncIterator') return wrapIterator(state, node, program)
|
|
122
|
-
if (operator === 'traceIterator') return wrapIterator(state, node, program)
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
function wrapSuper (_state, node) {
|
|
126
|
-
const members = new Set()
|
|
127
|
-
|
|
128
|
-
traverse(
|
|
129
|
-
node.body,
|
|
130
|
-
'[object.type=Super]',
|
|
131
|
-
(node, parent) => {
|
|
132
|
-
const { name } = node.property
|
|
133
|
-
|
|
134
|
-
let child
|
|
135
|
-
|
|
136
|
-
if (parent.callee) {
|
|
137
|
-
// This is needed because for generator functions we have to move the
|
|
138
|
-
// original function to a nested wrapped function, but we can't use an
|
|
139
|
-
// arrow function because arrow function cannot be generator functions,
|
|
140
|
-
// and `super` cannot be called from a nested function, so we have to
|
|
141
|
-
// rewrite any `super` call to not use the keyword.
|
|
142
|
-
const { expression } = parse(`__apm$super['${name}'].call(this)`).body[0]
|
|
143
|
-
|
|
144
|
-
parent.callee = child = expression.callee
|
|
145
|
-
parent.arguments.unshift(...expression.arguments)
|
|
146
|
-
} else {
|
|
147
|
-
parent.expression = child = parse(`__apm$super['${name}']`).body[0]
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
child.computed = parent.callee.computed
|
|
151
|
-
child.optional = parent.callee.optional
|
|
152
|
-
|
|
153
|
-
members.add(name)
|
|
154
|
-
}
|
|
35
|
+
const returnIndex = statements.findIndex(statement =>
|
|
36
|
+
statement.type === 'ReturnStatement' && statement.argument
|
|
155
37
|
)
|
|
156
38
|
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
__apm$super['${name}'] = super['${name}']
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
`).body[0].body.body[0].value.body.body[0]
|
|
165
|
-
|
|
166
|
-
node.body.body.unshift(member)
|
|
167
|
-
}
|
|
168
|
-
|
|
169
|
-
if (members.size > 0) {
|
|
170
|
-
node.body.body.unshift(parse('const __apm$super = {}').body[0])
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
function wrapIterator (state, node, program) {
|
|
175
|
-
const { channelName, operator } = state
|
|
176
|
-
const baseChannel = channelName.replaceAll(':', '_')
|
|
177
|
-
const channelVariable = 'tr_ch_apm$' + baseChannel
|
|
178
|
-
const nextChannel = baseChannel + '_next'
|
|
179
|
-
const traceMethod = operator === 'traceAsyncIterator' ? 'tracePromise' : 'traceSync'
|
|
180
|
-
const traceNext = `tr_ch_apm$${nextChannel}.${traceMethod}`
|
|
39
|
+
// The generated fulfillment handler always ends in a return; a miss means the
|
|
40
|
+
// upstream template changed and the caller's try/catch falls back to the
|
|
41
|
+
// unwrapped source.
|
|
42
|
+
assert(returnIndex !== -1, 'waitForAsyncEnd: no return statement to wait on')
|
|
181
43
|
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
const wrapper = parse(`
|
|
44
|
+
const waitStatements = parse(`
|
|
185
45
|
function wrapper () {
|
|
186
|
-
const __apm$
|
|
187
|
-
|
|
188
|
-
return __apm$
|
|
189
|
-
}
|
|
190
|
-
|
|
191
|
-
if (!${channelVariable}.start.hasSubscribers) return __apm$traced();
|
|
192
|
-
|
|
193
|
-
{
|
|
194
|
-
const wrap = iter => {
|
|
195
|
-
const { next: iterNext, return: iterReturn, throw: iterThrow } = iter;
|
|
196
|
-
|
|
197
|
-
iter.next = (...args) => ${traceNext}(iterNext, ctx, iter, ...args);
|
|
198
|
-
iter.return = (...args) => ${traceNext}(iterReturn, ctx, iter, ...args);
|
|
199
|
-
iter.throw = (...args) => ${traceNext}(iterThrow, ctx, iter, ...args);
|
|
200
|
-
|
|
201
|
-
return iter;
|
|
202
|
-
};
|
|
203
|
-
const ctx = {
|
|
204
|
-
arguments,
|
|
205
|
-
self: this,
|
|
206
|
-
moduleVersion: "1.0.0"
|
|
207
|
-
};
|
|
208
|
-
const iter = ${channelVariable}.traceSync(__apm$traced, ctx);
|
|
209
|
-
|
|
210
|
-
if (typeof iter.then !== 'function') return wrap(iter);
|
|
211
|
-
|
|
212
|
-
return iter.then(result => {
|
|
213
|
-
ctx.result = result;
|
|
214
|
-
|
|
215
|
-
${channelVariable}.asyncStart.publish(ctx);
|
|
216
|
-
${channelVariable}.asyncEnd.publish(ctx);
|
|
217
|
-
|
|
218
|
-
return wrap(result);
|
|
219
|
-
}, err => {
|
|
220
|
-
ctx.error = err;
|
|
221
|
-
|
|
222
|
-
${channelVariable}.error.publish(ctx);
|
|
223
|
-
${channelVariable}.asyncStart.publish(ctx);
|
|
224
|
-
${channelVariable}.asyncEnd.publish(ctx);
|
|
225
|
-
|
|
226
|
-
return Promise.reject(err);
|
|
227
|
-
});
|
|
228
|
-
};
|
|
46
|
+
const __apm$asyncEndPromise = __apm$ctx.asyncEndPromise;
|
|
47
|
+
if (__apm$asyncEndPromise && typeof __apm$asyncEndPromise.then === 'function') {
|
|
48
|
+
return __apm$asyncEndPromise.then(() => __apm$result, () => __apm$result);
|
|
49
|
+
}
|
|
229
50
|
}
|
|
230
|
-
`).body[0].body
|
|
51
|
+
`).body[0].body.body
|
|
231
52
|
|
|
232
|
-
//
|
|
233
|
-
|
|
53
|
+
// Resolve to whatever the fulfillment handler returns (its return argument),
|
|
54
|
+
// so a subscriber that reassigned `__apm$ctx.result` in `asyncEnd` still wins.
|
|
55
|
+
const returnArgument = statements[returnIndex].argument
|
|
56
|
+
const { arguments: onSettled } = waitStatements[1].consequent.body[0].argument
|
|
57
|
+
onSettled[0].body = clone(returnArgument)
|
|
58
|
+
onSettled[1].body = clone(returnArgument)
|
|
234
59
|
|
|
235
|
-
|
|
60
|
+
statements.splice(returnIndex, 0, ...waitStatements)
|
|
236
61
|
}
|
|
@@ -4,7 +4,7 @@ const shimmer = require('../../../datadog-shimmer')
|
|
|
4
4
|
const { channel } = require('./instrument')
|
|
5
5
|
|
|
6
6
|
const routerMountPaths = new WeakMap() // to track mount paths for router instances
|
|
7
|
-
const
|
|
7
|
+
const layerMeta = new WeakMap() // per-layer middleware dispatch metadata (resolved name + route matchers)
|
|
8
8
|
const appMountedRouters = new WeakSet() // to track routers mounted via app.use()
|
|
9
9
|
|
|
10
10
|
const METHODS = [...require('http').METHODS.map(v => v.toLowerCase()), 'all']
|
|
@@ -70,7 +70,7 @@ function collectRoutesFromRouter (router, prefix) {
|
|
|
70
70
|
// Extract mount path from layer
|
|
71
71
|
const mountPath = typeof layer.path === 'string'
|
|
72
72
|
? layer.path
|
|
73
|
-
:
|
|
73
|
+
: getLayerMeta(layer)?.matchers?.[0]?.path || ''
|
|
74
74
|
|
|
75
75
|
const nestedPrefix = joinPath(prefix, mountPath)
|
|
76
76
|
if (nestedPrefix === null) continue
|
|
@@ -121,12 +121,12 @@ function getRouterMountPaths (router) {
|
|
|
121
121
|
return [...paths]
|
|
122
122
|
}
|
|
123
123
|
|
|
124
|
-
function
|
|
125
|
-
|
|
124
|
+
function setLayerMeta (layer, meta) {
|
|
125
|
+
layerMeta.set(layer, meta)
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
-
function
|
|
129
|
-
return
|
|
128
|
+
function getLayerMeta (layer) {
|
|
129
|
+
return layerMeta.get(layer)
|
|
130
130
|
}
|
|
131
131
|
|
|
132
132
|
function normalizeMethodName (method) {
|
|
@@ -224,8 +224,8 @@ module.exports = {
|
|
|
224
224
|
setRouterMountPath,
|
|
225
225
|
getRouterMountPaths,
|
|
226
226
|
joinPath,
|
|
227
|
-
|
|
228
|
-
|
|
227
|
+
setLayerMeta,
|
|
228
|
+
getLayerMeta,
|
|
229
229
|
markAppMounted,
|
|
230
230
|
isAppMounted,
|
|
231
231
|
normalizeRoutePath,
|
|
@@ -14,13 +14,71 @@ const enterChannel = channel('apm:hono:middleware:enter')
|
|
|
14
14
|
const exitChannel = channel('apm:hono:middleware:exit')
|
|
15
15
|
const finishChannel = channel('apm:hono:middleware:finish')
|
|
16
16
|
|
|
17
|
+
// Tracks handlers registered via `app.use()` so route-publishing wrappers
|
|
18
|
+
// installed by `wrapRouterAdd` can skip middleware-only matches (a request
|
|
19
|
+
// matching only middleware should keep the bare HTTP-method resource name).
|
|
20
|
+
const middlewareHandlers = new WeakSet()
|
|
21
|
+
|
|
22
|
+
// `app.request()` and non-node adapters call `app.fetch` without an `incoming`
|
|
23
|
+
// IncomingMessage; the APM `web` helpers depend on one, so the wrappers below
|
|
24
|
+
// skip publishing whenever it is missing.
|
|
17
25
|
function wrapFetch (fetch) {
|
|
18
26
|
return function (request, env, executionCtx) {
|
|
19
|
-
|
|
27
|
+
const req = env?.incoming
|
|
28
|
+
if (req) {
|
|
29
|
+
handleChannel.publish({ req })
|
|
30
|
+
}
|
|
20
31
|
return fetch.apply(this, arguments)
|
|
21
32
|
}
|
|
22
33
|
}
|
|
23
34
|
|
|
35
|
+
function wrapUse (originalUse) {
|
|
36
|
+
return function (arg1, ...handlers) {
|
|
37
|
+
if (typeof arg1 === 'function') middlewareHandlers.add(arg1)
|
|
38
|
+
for (const h of handlers) middlewareHandlers.add(h)
|
|
39
|
+
return originalUse.call(this, arg1, ...handlers)
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
// `app.basePath()` returns a clone Hono instance built via the library's
|
|
44
|
+
// internal class binding, so it never hits our instrumented constructor. The
|
|
45
|
+
// clone shares the parent router (so `router.add` stays wrapped), but its
|
|
46
|
+
// `use` is a fresh per-instance method that must be wrapped too, otherwise
|
|
47
|
+
// middleware registered on the sub-app never lands in `middlewareHandlers`.
|
|
48
|
+
function wrapBasePath (originalBasePath) {
|
|
49
|
+
return function (path) {
|
|
50
|
+
const clone = originalBasePath.apply(this, arguments)
|
|
51
|
+
shimmer.wrap(clone, 'use', wrapUse)
|
|
52
|
+
shimmer.wrap(clone, 'basePath', wrapBasePath)
|
|
53
|
+
return clone
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
function wrapRouterAdd (originalAdd) {
|
|
58
|
+
return function (method, path, handlerData) {
|
|
59
|
+
const handler = handlerData?.[0]
|
|
60
|
+
if (typeof handler === 'function' && !middlewareHandlers.has(handler)) {
|
|
61
|
+
const meta = handlerData[1]
|
|
62
|
+
const wrappedHandler = function (context, next) {
|
|
63
|
+
const req = context.env?.incoming
|
|
64
|
+
if (req && routeChannel.hasSubscribers) {
|
|
65
|
+
routeChannel.publish({ req, route: meta?.path })
|
|
66
|
+
}
|
|
67
|
+
return handler.apply(this, arguments)
|
|
68
|
+
}
|
|
69
|
+
handlerData = [wrappedHandler, meta]
|
|
70
|
+
}
|
|
71
|
+
return originalAdd.call(this, method, path, handlerData)
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
function instrumentHonoInstance (instance) {
|
|
76
|
+
shimmer.wrap(instance, 'fetch', wrapFetch)
|
|
77
|
+
shimmer.wrap(instance, 'use', wrapUse)
|
|
78
|
+
shimmer.wrap(instance, 'basePath', wrapBasePath)
|
|
79
|
+
shimmer.wrap(instance.router, 'add', wrapRouterAdd)
|
|
80
|
+
}
|
|
81
|
+
|
|
24
82
|
function onErrorFn (error, _context_) {
|
|
25
83
|
throw error
|
|
26
84
|
}
|
|
@@ -31,8 +89,10 @@ function wrapCompose (compose) {
|
|
|
31
89
|
|
|
32
90
|
const instrumentedOnError = (...args) => {
|
|
33
91
|
const [error, context] = args
|
|
34
|
-
const req = context.env
|
|
35
|
-
|
|
92
|
+
const req = context.env?.incoming
|
|
93
|
+
if (req) {
|
|
94
|
+
errorChannel.publish({ req, error })
|
|
95
|
+
}
|
|
36
96
|
return onError(...args)
|
|
37
97
|
}
|
|
38
98
|
|
|
@@ -48,10 +108,10 @@ function wrapNext (req, route, next) {
|
|
|
48
108
|
return shimmer.wrapFunction(
|
|
49
109
|
next,
|
|
50
110
|
(next) =>
|
|
51
|
-
function () {
|
|
111
|
+
function (...args) {
|
|
52
112
|
nextChannel.publish({ req, route })
|
|
53
113
|
|
|
54
|
-
return next.apply(this,
|
|
114
|
+
return next.apply(this, args)
|
|
55
115
|
}
|
|
56
116
|
)
|
|
57
117
|
}
|
|
@@ -62,8 +122,10 @@ function wrapMiddleware (middleware, route) {
|
|
|
62
122
|
middleware,
|
|
63
123
|
(middleware) =>
|
|
64
124
|
function (context, next) {
|
|
65
|
-
const req = context.env
|
|
66
|
-
|
|
125
|
+
const req = context.env?.incoming
|
|
126
|
+
if (!req) {
|
|
127
|
+
return middleware.apply(this, arguments)
|
|
128
|
+
}
|
|
67
129
|
enterChannel.publish({ req, name, route })
|
|
68
130
|
if (typeof next === 'function') {
|
|
69
131
|
arguments[1] = wrapNext(req, route, next)
|
|
@@ -102,7 +164,7 @@ addHook({
|
|
|
102
164
|
class Hono extends hono.Hono {
|
|
103
165
|
constructor (...args) {
|
|
104
166
|
super(...args)
|
|
105
|
-
|
|
167
|
+
instrumentHonoInstance(this)
|
|
106
168
|
}
|
|
107
169
|
}
|
|
108
170
|
|
|
@@ -119,7 +181,7 @@ addHook({
|
|
|
119
181
|
class Hono extends hono.Hono {
|
|
120
182
|
constructor (...args) {
|
|
121
183
|
super(...args)
|
|
122
|
-
|
|
184
|
+
instrumentHonoInstance(this)
|
|
123
185
|
}
|
|
124
186
|
}
|
|
125
187
|
|
|
@@ -14,11 +14,11 @@ const finishChannel = channel('apm:http:client:request:finish')
|
|
|
14
14
|
const endChannel = channel('apm:http:client:request:end')
|
|
15
15
|
const asyncStartChannel = channel('apm:http:client:request:asyncStart')
|
|
16
16
|
const errorChannel = channel('apm:http:client:request:error')
|
|
17
|
+
const responseStartChannel = channel('apm:http:client:response:start')
|
|
17
18
|
const responseFinishChannel = channel('apm:http:client:response:finish')
|
|
18
19
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
addHook({ name: names }, hookFn)
|
|
20
|
+
addHook({ name: 'http' }, hookFn)
|
|
21
|
+
addHook({ name: 'https' }, hookFn)
|
|
22
22
|
|
|
23
23
|
function hookFn (http) {
|
|
24
24
|
patch(http, 'request')
|
|
@@ -27,10 +27,27 @@ function hookFn (http) {
|
|
|
27
27
|
return http
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
+
// `inputURL` may be the user's options object (for the `http.request(options)`
|
|
31
|
+
// shape); never write directly into it. The result is later mutated by
|
|
32
|
+
// `normalizeHeaders` and read by `url.format`, so the merged object must be
|
|
33
|
+
// owned by the tracer. `undefined` means "no URL supplied" — Node merges
|
|
34
|
+
// with the options object or its defaults, so build a tracer-owned
|
|
35
|
+
// options-only shape and let tracing proceed. `null`/primitive first args
|
|
36
|
+
// are returned as-is so `normalizeHeaders` throws and the surrounding
|
|
37
|
+
// try/catch in `instrumentRequest` falls through to the native request;
|
|
38
|
+
// spreading a primitive yields `{}`, which would silently turn an invalid
|
|
39
|
+
// `http.request(123)` into a synthesized localhost request.
|
|
30
40
|
function combineOptions (inputURL, inputOptions) {
|
|
31
|
-
|
|
32
|
-
?
|
|
33
|
-
|
|
41
|
+
if (inputURL === undefined) {
|
|
42
|
+
return inputOptions !== null && typeof inputOptions === 'object' ? { ...inputOptions } : {}
|
|
43
|
+
}
|
|
44
|
+
if (inputURL === null || (typeof inputURL !== 'object' && typeof inputURL !== 'function')) {
|
|
45
|
+
return inputURL
|
|
46
|
+
}
|
|
47
|
+
if (inputOptions !== null && typeof inputOptions === 'object') {
|
|
48
|
+
return { ...inputURL, ...inputOptions }
|
|
49
|
+
}
|
|
50
|
+
return { ...inputURL }
|
|
34
51
|
}
|
|
35
52
|
function normalizeHeaders (options) {
|
|
36
53
|
options.headers ??= {}
|
|
@@ -62,10 +79,15 @@ function setupResponseInstrumentation (ctx, res) {
|
|
|
62
79
|
let dataReadStarted = false
|
|
63
80
|
|
|
64
81
|
const { shouldCollectBody } = ctx
|
|
65
|
-
|
|
82
|
+
|
|
83
|
+
let bodyChunks = null
|
|
84
|
+
|
|
85
|
+
if (shouldCollectBody) {
|
|
86
|
+
bodyChunks = []
|
|
87
|
+
}
|
|
66
88
|
|
|
67
89
|
const collectChunk = chunk => {
|
|
68
|
-
if (!
|
|
90
|
+
if (!bodyChunks || !chunk) return
|
|
69
91
|
|
|
70
92
|
if (typeof chunk === 'string') {
|
|
71
93
|
bodyChunks.push(chunk)
|
|
@@ -91,8 +113,8 @@ function setupResponseInstrumentation (ctx, res) {
|
|
|
91
113
|
// For 'readable' events, wrap the read() method
|
|
92
114
|
if (eventName === 'readable' && !originalRead && !dataListenerAdded && typeof res.read === 'function') {
|
|
93
115
|
originalRead = res.read
|
|
94
|
-
res.read = function () {
|
|
95
|
-
const chunk = originalRead.apply(this,
|
|
116
|
+
res.read = function (...args) {
|
|
117
|
+
const chunk = originalRead.apply(this, args)
|
|
96
118
|
if (!dataListenerAdded) {
|
|
97
119
|
dataReadStarted = true
|
|
98
120
|
collectChunk(chunk)
|
|
@@ -172,10 +194,10 @@ function patch (http, methodName) {
|
|
|
172
194
|
let finished = false
|
|
173
195
|
let callback = args.callback
|
|
174
196
|
|
|
175
|
-
if (callback) {
|
|
176
|
-
callback = shimmer.
|
|
197
|
+
if (typeof callback === 'function') {
|
|
198
|
+
callback = shimmer.wrapCallback(args.callback, cb => function (...args) {
|
|
177
199
|
return asyncStartChannel.runStores(ctx, () => {
|
|
178
|
-
return cb.apply(this,
|
|
200
|
+
return cb.apply(this, args)
|
|
179
201
|
})
|
|
180
202
|
})
|
|
181
203
|
}
|
|
@@ -198,12 +220,14 @@ function patch (http, methodName) {
|
|
|
198
220
|
|
|
199
221
|
// tracked to accurately discern custom request socket timeout
|
|
200
222
|
let customRequestTimeout = false
|
|
201
|
-
req.setTimeout = function () {
|
|
223
|
+
req.setTimeout = function (...args) {
|
|
202
224
|
customRequestTimeout = true
|
|
203
|
-
return setTimeout.apply(this,
|
|
225
|
+
return setTimeout.apply(this, args)
|
|
204
226
|
}
|
|
205
227
|
|
|
206
|
-
req.emit = function (
|
|
228
|
+
req.emit = function (...args) {
|
|
229
|
+
const eventName = args[0]
|
|
230
|
+
const arg = args[1]
|
|
207
231
|
switch (eventName) {
|
|
208
232
|
case 'response': {
|
|
209
233
|
const res = arg
|
|
@@ -211,13 +235,17 @@ function patch (http, methodName) {
|
|
|
211
235
|
res.once('end', finish)
|
|
212
236
|
res.once(errorMonitor, finish)
|
|
213
237
|
|
|
238
|
+
if (responseStartChannel.hasSubscribers) {
|
|
239
|
+
responseStartChannel.publish({ ctx, res })
|
|
240
|
+
}
|
|
241
|
+
|
|
214
242
|
const instrumentation = setupResponseInstrumentation(ctx, res)
|
|
215
243
|
|
|
216
244
|
if (!instrumentation) {
|
|
217
245
|
break
|
|
218
246
|
}
|
|
219
247
|
|
|
220
|
-
const result =
|
|
248
|
+
const result = Reflect.apply(emit, this, args)
|
|
221
249
|
|
|
222
250
|
instrumentation.finalizeIfNeeded()
|
|
223
251
|
|
|
@@ -238,7 +266,7 @@ function patch (http, methodName) {
|
|
|
238
266
|
finish()
|
|
239
267
|
}
|
|
240
268
|
|
|
241
|
-
return
|
|
269
|
+
return Reflect.apply(emit, this, args)
|
|
242
270
|
}
|
|
243
271
|
|
|
244
272
|
if (abortController.signal.aborted) {
|
|
@@ -276,17 +304,12 @@ function patch (http, methodName) {
|
|
|
276
304
|
|
|
277
305
|
function normalizeOptions (inputURL) {
|
|
278
306
|
if (typeof inputURL === 'string') {
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
// eslint-disable-next-line n/no-deprecated-api
|
|
283
|
-
return url.parse(inputURL)
|
|
284
|
-
}
|
|
285
|
-
} else if (inputURL instanceof url.URL) {
|
|
307
|
+
return urlToOptions(new url.URL(inputURL))
|
|
308
|
+
}
|
|
309
|
+
if (inputURL instanceof url.URL) {
|
|
286
310
|
return urlToOptions(inputURL)
|
|
287
|
-
} else {
|
|
288
|
-
return inputURL
|
|
289
311
|
}
|
|
312
|
+
return inputURL
|
|
290
313
|
}
|
|
291
314
|
|
|
292
315
|
function urlToOptions (url) {
|