@depup/dd-trace 5.97.0-depup.0 → 6.5.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.electron.md +7 -0
- package/README.md +2 -2
- package/changes.json +1 -1
- package/ci/diagnose.js +2100 -0
- package/ci/init.js +46 -5
- package/ci/runbook.md +198 -0
- package/ci/test-optimization-validation/approval-artifacts.js +143 -0
- package/ci/test-optimization-validation/approval.js +299 -0
- package/ci/test-optimization-validation/artifact-id.js +20 -0
- package/ci/test-optimization-validation/bounded-json.js +121 -0
- package/ci/test-optimization-validation/ci-command-candidate.js +83 -0
- package/ci/test-optimization-validation/ci-discovery.js +181 -0
- package/ci/test-optimization-validation/ci-remediation.js +210 -0
- package/ci/test-optimization-validation/cli.js +903 -0
- package/ci/test-optimization-validation/command-blocker.js +81 -0
- package/ci/test-optimization-validation/command-output-policy.js +206 -0
- package/ci/test-optimization-validation/command-runner.js +707 -0
- package/ci/test-optimization-validation/command-suitability.js +471 -0
- package/ci/test-optimization-validation/executable-approval.js +48 -0
- package/ci/test-optimization-validation/executable.js +480 -0
- package/ci/test-optimization-validation/generated-file-policy.js +63 -0
- package/ci/test-optimization-validation/generated-files.js +351 -0
- package/ci/test-optimization-validation/generated-verifier.js +196 -0
- package/ci/test-optimization-validation/init-probe-preload.js +163 -0
- package/ci/test-optimization-validation/init-probe.js +246 -0
- package/ci/test-optimization-validation/late-initialization.js +63 -0
- package/ci/test-optimization-validation/local-command.js +163 -0
- package/ci/test-optimization-validation/manifest-loader.js +133 -0
- package/ci/test-optimization-validation/manifest-scaffold.js +738 -0
- package/ci/test-optimization-validation/manifest-schema.js +862 -0
- package/ci/test-optimization-validation/offline-fixtures.js +327 -0
- package/ci/test-optimization-validation/offline-output.js +406 -0
- package/ci/test-optimization-validation/payload-normalizer.js +72 -0
- package/ci/test-optimization-validation/plan-writer.js +1120 -0
- package/ci/test-optimization-validation/preflight-runner.js +114 -0
- package/ci/test-optimization-validation/redaction.js +331 -0
- package/ci/test-optimization-validation/report-writer.js +1508 -0
- package/ci/test-optimization-validation/safe-files.js +203 -0
- package/ci/test-optimization-validation/scenarios/auto-test-retries.js +159 -0
- package/ci/test-optimization-validation/scenarios/basic-reporting.js +657 -0
- package/ci/test-optimization-validation/scenarios/ci-wiring.js +780 -0
- package/ci/test-optimization-validation/scenarios/early-flake-detection.js +141 -0
- package/ci/test-optimization-validation/scenarios/helpers.js +539 -0
- package/ci/test-optimization-validation/scenarios/test-management.js +218 -0
- package/ci/test-optimization-validation/setup-runner.js +97 -0
- package/ci/test-optimization-validation/static-diagnosis.js +159 -0
- package/ci/test-optimization-validation/test-output.js +129 -0
- package/ci/test-optimization-validation-manifest.schema.json +1 -0
- package/ci/validate-test-optimization.js +3 -0
- package/ci/vitest-no-worker-init-setup.mjs +430 -0
- package/ext/exporters.js +2 -0
- package/ext/tags.js +3 -0
- package/index.d.ts +436 -252
- package/index.electron.js +3 -0
- package/init.js +18 -0
- package/initialize.mjs +10 -9
- package/loader-hook.mjs +170 -53
- package/openfeature.d.ts +1 -0
- package/openfeature.js +4 -0
- package/package.json +118 -80
- package/packages/datadog-core/src/storage.js +47 -48
- package/packages/datadog-esbuild/index.js +32 -1
- 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 +137 -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 +16 -16
- 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 +49 -4
- package/packages/datadog-instrumentations/src/cucumber-worker-threads.js +25 -0
- package/packages/datadog-instrumentations/src/cucumber.js +762 -189
- package/packages/datadog-instrumentations/src/cypress-config.js +547 -93
- package/packages/datadog-instrumentations/src/cypress.js +5 -3
- package/packages/datadog-instrumentations/src/dns.js +60 -59
- 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 +52 -30
- package/packages/datadog-instrumentations/src/fastify.js +166 -87
- package/packages/datadog-instrumentations/src/fetch.js +5 -5
- package/packages/datadog-instrumentations/src/fs.js +22 -20
- 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/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 +31 -7
- package/packages/datadog-instrumentations/src/helpers/hooks.js +12 -0
- package/packages/datadog-instrumentations/src/helpers/instrument.js +36 -3
- 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 +7 -5
- 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 +111 -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 +48 -24
- package/packages/datadog-instrumentations/src/http/server.js +75 -29
- package/packages/datadog-instrumentations/src/http2/client.js +15 -12
- package/packages/datadog-instrumentations/src/http2/server.js +156 -23
- 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 +1809 -401
- 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 +4 -4
- 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 -120
- package/packages/datadog-instrumentations/src/mocha/utils.js +531 -135
- 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 +82 -8
- package/packages/datadog-instrumentations/src/mongoose.js +46 -37
- package/packages/datadog-instrumentations/src/mquery.js +7 -7
- 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 +19 -11
- package/packages/datadog-instrumentations/src/next.js +68 -10
- package/packages/datadog-instrumentations/src/nyc.js +43 -8
- 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 +25 -41
- package/packages/datadog-instrumentations/src/playwright-browser-scripts.js +27 -0
- package/packages/datadog-instrumentations/src/playwright.js +1229 -356
- package/packages/datadog-instrumentations/src/process.js +3 -0
- 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 +253 -87
- package/packages/datadog-instrumentations/src/selenium.js +53 -28
- package/packages/datadog-instrumentations/src/stripe.js +47 -33
- package/packages/datadog-instrumentations/src/tedious.js +28 -0
- package/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js +1297 -0
- package/packages/datadog-instrumentations/src/vitest-main.js +1590 -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 -1262
- package/packages/datadog-instrumentations/src/winston.js +4 -4
- package/packages/datadog-instrumentations/src/ws.js +9 -8
- 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 +80 -0
- package/packages/datadog-plugin-aws-sdk/src/base.js +86 -50
- 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-aws-sdk/src/util.js +2 -2
- 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 +47 -29
- package/packages/datadog-plugin-cypress/src/cypress-plugin.js +929 -98
- package/packages/datadog-plugin-cypress/src/index.js +109 -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 +272 -51
- 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 +748 -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 +54 -8
- 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 +7 -4
- package/packages/datadog-plugin-http2/src/server.js +48 -8
- package/packages/datadog-plugin-jest/src/index.js +133 -67
- package/packages/datadog-plugin-jest/src/util.js +37 -16
- package/packages/datadog-plugin-kafkajs/src/batch-consumer.js +1 -1
- package/packages/datadog-plugin-kafkajs/src/consumer.js +2 -9
- package/packages/datadog-plugin-kafkajs/src/producer.js +37 -8
- package/packages/datadog-plugin-langchain/src/handlers/embedding.js +2 -1
- package/packages/datadog-plugin-langchain/src/handlers/language_models.js +2 -1
- package/packages/datadog-plugin-langchain/src/tokens.js +2 -2
- 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 -20
- 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 +12 -4
- package/packages/datadog-plugin-openai/src/services.js +4 -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 +195 -72
- 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 +55 -44
- package/packages/datadog-plugin-selenium/src/index.js +5 -36
- 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 +5 -2
- package/packages/datadog-plugin-ws/src/producer.js +4 -1
- package/packages/datadog-plugin-ws/src/receiver.js +4 -2
- package/packages/datadog-plugin-ws/src/server.js +2 -1
- package/packages/datadog-shimmer/src/shimmer.js +101 -39
- package/packages/datadog-webpack/index.js +17 -1
- 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 -36
- 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 +148 -55
- 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 +82 -42
- 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/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/plugin.js +2 -2
- 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/telemetry/span-tags.js +3 -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 +31 -4
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/index.js +1 -3
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js +83 -48
- 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/reporter.js +87 -28
- package/packages/dd-trace/src/appsec/rule_manager.js +4 -2
- 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 +19 -7
- 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 +123 -33
- 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-validation/index.js +160 -0
- package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/msgpack-to-json.js +288 -0
- package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/payload-projection.js +84 -0
- package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/sink.js +369 -0
- package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/writer.js +60 -0
- package/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js +188 -27
- 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 +110 -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 +10 -6
- package/packages/dd-trace/src/ci-visibility/requests/upload-test-screenshot.js +156 -0
- package/packages/dd-trace/src/ci-visibility/rum.js +7 -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 +256 -0
- package/packages/dd-trace/src/ci-visibility/test-optimization-http-cache.js +451 -0
- package/packages/dd-trace/src/ci-visibility/test-screenshot.js +90 -0
- package/packages/dd-trace/src/config/config-types.d.ts +8 -6
- package/packages/dd-trace/src/config/defaults.js +71 -44
- package/packages/dd-trace/src/config/generated-config-types.d.ts +692 -131
- package/packages/dd-trace/src/config/git_properties.js +2 -2
- package/packages/dd-trace/src/config/helper.js +140 -33
- package/packages/dd-trace/src/config/index.js +127 -131
- 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 +138 -10
- package/packages/dd-trace/src/config/remote_config.js +1 -1
- package/packages/dd-trace/src/config/supported-configurations.json +460 -203
- package/packages/dd-trace/src/constants.js +15 -0
- package/packages/dd-trace/src/crashtracking/crashtracker.js +18 -6
- 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 +13 -9
- 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 +34 -28
- package/packages/dd-trace/src/encode/0.4.js +829 -268
- 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 +5 -1
- package/packages/dd-trace/src/exporters/agent/index.js +4 -5
- package/packages/dd-trace/src/exporters/agent/writer.js +1 -2
- 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/client-library-headers.js +21 -0
- package/packages/dd-trace/src/exporters/common/request.js +93 -44
- package/packages/dd-trace/src/exporters/common/retry.js +104 -0
- package/packages/dd-trace/src/exporters/common/url.js +48 -0
- package/packages/dd-trace/src/exporters/common/util.js +2 -2
- package/packages/dd-trace/src/exporters/common/writer.js +17 -1
- 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 +29 -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 +4 -4
- package/packages/dd-trace/src/id.js +46 -27
- package/packages/dd-trace/src/index.js +7 -8
- 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/experiments/client.js +113 -0
- package/packages/dd-trace/src/llmobs/experiments/dataset.js +154 -0
- package/packages/dd-trace/src/llmobs/experiments/experiment.js +283 -0
- package/packages/dd-trace/src/llmobs/experiments/index.js +152 -0
- package/packages/dd-trace/src/llmobs/experiments/noop.js +30 -0
- package/packages/dd-trace/src/llmobs/experiments/result.js +34 -0
- package/packages/dd-trace/src/llmobs/index.js +37 -7
- package/packages/dd-trace/src/llmobs/noop.js +6 -0
- package/packages/dd-trace/src/llmobs/plugins/ai/ddTelemetry.js +403 -0
- package/packages/dd-trace/src/llmobs/plugins/ai/index.js +8 -395
- package/packages/dd-trace/src/llmobs/plugins/ai/util.js +119 -7
- package/packages/dd-trace/src/llmobs/plugins/ai/vercelTelemetry.js +380 -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 +89 -37
- 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 +4 -29
- 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/constants.js +8 -0
- package/packages/dd-trace/src/llmobs/plugins/openai/index.js +68 -64
- package/packages/dd-trace/src/llmobs/plugins/openai/utils.js +43 -0
- package/packages/dd-trace/src/llmobs/sdk.js +73 -35
- package/packages/dd-trace/src/llmobs/span_processor.js +90 -11
- package/packages/dd-trace/src/llmobs/tagger.js +197 -4
- package/packages/dd-trace/src/llmobs/telemetry.js +33 -2
- package/packages/dd-trace/src/llmobs/util.js +234 -9
- package/packages/dd-trace/src/llmobs/writers/base.js +11 -5
- package/packages/dd-trace/src/llmobs/writers/spans.js +1 -1
- package/packages/dd-trace/src/llmobs/writers/util.js +1 -2
- package/packages/dd-trace/src/log/index.js +19 -31
- package/packages/dd-trace/src/log/writer.js +3 -1
- 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 +5 -4
- package/packages/dd-trace/src/noop/span.js +3 -1
- package/packages/dd-trace/src/openfeature/agentless_configuration_source.js +322 -0
- package/packages/dd-trace/src/openfeature/configuration_source.js +90 -0
- 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 +32 -16
- package/packages/dd-trace/src/openfeature/index.js +0 -2
- package/packages/dd-trace/src/openfeature/noop.js +41 -64
- package/packages/dd-trace/src/openfeature/register.js +35 -0
- package/packages/dd-trace/src/openfeature/remote_config.js +16 -14
- package/packages/dd-trace/src/openfeature/require-provider.js +18 -0
- 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 +6 -6
- package/packages/dd-trace/src/opentelemetry/logs/otlp_http_log_exporter.js +3 -2
- package/packages/dd-trace/src/opentelemetry/metrics/index.js +61 -12
- 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-ending-hook.js +10 -0
- package/packages/dd-trace/src/opentelemetry/span-helpers.js +325 -0
- package/packages/dd-trace/src/opentelemetry/span.js +64 -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 +278 -148
- 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 +2 -2
- package/packages/dd-trace/src/plugin_manager.js +36 -14
- package/packages/dd-trace/src/plugins/apollo.js +3 -1
- package/packages/dd-trace/src/plugins/ci_plugin.js +407 -91
- 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 +19 -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 +6 -3
- package/packages/dd-trace/src/plugins/util/http-otel-semantics.js +276 -0
- package/packages/dd-trace/src/plugins/util/inferred_proxy.js +29 -5
- 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 +950 -69
- 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/profiling/config.js +132 -212
- package/packages/dd-trace/src/profiling/constants.js +4 -7
- package/packages/dd-trace/src/profiling/exporter_cli.js +10 -10
- package/packages/dd-trace/src/profiling/exporters/agent.js +61 -28
- package/packages/dd-trace/src/profiling/exporters/event_serializer.js +45 -14
- 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 +84 -105
- 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 -13
- package/packages/dd-trace/src/profiling/profilers/space.js +27 -16
- package/packages/dd-trace/src/profiling/profilers/wall.js +49 -35
- package/packages/dd-trace/src/profiling/ssi-heuristics.js +3 -3
- package/packages/dd-trace/src/propagation-hash/index.js +1 -1
- package/packages/dd-trace/src/proxy.js +128 -37
- package/packages/dd-trace/src/rate_limiter.js +1 -1
- package/packages/dd-trace/src/remote_config/index.js +6 -5
- package/packages/dd-trace/src/remote_config/scheduler.js +1 -1
- package/packages/dd-trace/src/ritm.js +6 -3
- package/packages/dd-trace/src/runtime_metrics/client.js +30 -0
- package/packages/dd-trace/src/runtime_metrics/index.js +14 -4
- package/packages/dd-trace/src/runtime_metrics/otlp_runtime_metrics.js +284 -0
- package/packages/dd-trace/src/runtime_metrics/runtime_metrics.js +42 -41
- 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 +18 -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 +0 -36
- 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 -2
- package/packages/dd-trace/src/telemetry/logs/index.js +1 -1
- package/packages/dd-trace/src/telemetry/send-data.js +22 -22
- package/packages/dd-trace/src/telemetry/session-propagation.js +1 -1
- package/packages/dd-trace/src/telemetry/telemetry.js +16 -14
- 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 +57 -0
- 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,15 +1,15 @@
|
|
|
1
1
|
'use strict'
|
|
2
2
|
|
|
3
3
|
const METHODS = [...require('http').METHODS.map(v => v.toLowerCase()), 'all']
|
|
4
|
-
const pathToRegExp = require('../../../vendor/dist/path-to-regexp')
|
|
5
4
|
const shimmer = require('../../datadog-shimmer')
|
|
6
|
-
const { addHook, channel } = require('./helpers/instrument')
|
|
5
|
+
const { addHook, channel, createErrorPublisher } = require('./helpers/instrument')
|
|
6
|
+
const { getCompileToRegexp } = require('./path-to-regexp')
|
|
7
7
|
|
|
8
8
|
const {
|
|
9
9
|
getRouterMountPaths,
|
|
10
10
|
joinPath,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
setLayerMeta,
|
|
12
|
+
getLayerMeta,
|
|
13
13
|
isAppMounted,
|
|
14
14
|
setRouterMountPath,
|
|
15
15
|
extractMountPaths,
|
|
@@ -19,59 +19,179 @@ const {
|
|
|
19
19
|
} = require('./helpers/router-helper')
|
|
20
20
|
|
|
21
21
|
function isFastStar (layer, matchers) {
|
|
22
|
-
return layer.regexp?.fast_star ?? matchers.
|
|
22
|
+
return layer.regexp?.fast_star ?? matchers.hasStarPath
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
function isFastSlash (layer, matchers) {
|
|
26
|
-
return layer.regexp?.fast_slash ?? matchers.
|
|
26
|
+
return layer.regexp?.fast_slash ?? matchers.hasSlashPath
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
/**
|
|
30
|
+
* Cache the per-layer dispatch metadata in a side table instead of replacing
|
|
31
|
+
* `layer.handle`. Phase-sorting hosts (loopback's `_findLayerByHandler`) map a
|
|
32
|
+
* layer back to the user handler by scanning the handle, so the handle has to
|
|
33
|
+
* stay the user's function.
|
|
34
|
+
*
|
|
35
|
+
* @param {{ handle: Function, name?: string, path?: string,
|
|
36
|
+
* regexp?: { fast_star?: boolean, fast_slash?: boolean } }} layer
|
|
37
|
+
* @param {Array<{ path?: string, regex?: RegExp }> & { hasStarPath?: boolean, hasSlashPath?: boolean }} matchers
|
|
38
|
+
*/
|
|
39
|
+
function annotateLayer (layer, matchers) {
|
|
40
|
+
const handle = layer.handle
|
|
41
|
+
const name = handle._name || layer.name || handle.name
|
|
42
|
+
|
|
43
|
+
let captureRoute
|
|
44
|
+
let needMultiMatch = false
|
|
45
|
+
if (matchers.length !== 0 && !isFastStar(layer, matchers) && !isFastSlash(layer, matchers)) {
|
|
46
|
+
if (matchers.length === 1) {
|
|
47
|
+
captureRoute = matchers[0].path
|
|
48
|
+
} else {
|
|
49
|
+
needMultiMatch = true
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
setLayerMeta(layer, { name, captureRoute, needMultiMatch, matchers })
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* Resolve the route for a dispatched layer. Single-pattern layers carry a
|
|
58
|
+
* constant route; only multi-pattern stacks need the per-request `layer.path`
|
|
59
|
+
* match the host already computed.
|
|
60
|
+
*
|
|
61
|
+
* @param {{ captureRoute?: string, needMultiMatch: boolean,
|
|
62
|
+
* matchers: Array<{ path?: string, regex?: RegExp }> }} meta
|
|
63
|
+
* @param {{ path?: string }} layer
|
|
64
|
+
* @returns {string | undefined}
|
|
65
|
+
*/
|
|
66
|
+
function resolveLayerRoute (meta, layer) {
|
|
67
|
+
if (!meta.needMultiMatch) return meta.captureRoute
|
|
68
|
+
|
|
69
|
+
for (const matcher of meta.matchers) {
|
|
70
|
+
if (matcher.regex?.test(layer.path)) return matcher.path
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* Build the request/error dispatch wrappers for one host (`express` / `router`).
|
|
76
|
+
* They wrap the layer's prototype dispatch and read the side-table metadata, so
|
|
77
|
+
* `layer.handle` is never replaced. The arity guard mirrors the host's own
|
|
78
|
+
* (`handle_request` skips 4-arg handlers, `handle_error` skips the rest), so a
|
|
79
|
+
* span is published only for the layer the host actually runs.
|
|
80
|
+
*
|
|
81
|
+
* @param {string} name Channel namespace (`apm:<name>:middleware:*`).
|
|
82
|
+
*/
|
|
83
|
+
function createLayerDispatchWrappers (name) {
|
|
31
84
|
const enterChannel = channel(`apm:${name}:middleware:enter`)
|
|
32
85
|
const exitChannel = channel(`apm:${name}:middleware:exit`)
|
|
33
86
|
const finishChannel = channel(`apm:${name}:middleware:finish`)
|
|
34
87
|
const errorChannel = channel(`apm:${name}:middleware:error`)
|
|
35
88
|
const nextChannel = channel(`apm:${name}:middleware:next`)
|
|
36
|
-
const
|
|
89
|
+
const repeatChannel = channel(`apm:${name}:middleware:repeat`)
|
|
90
|
+
// Bound per name so express and a bare router keep independent guards.
|
|
91
|
+
const publishError = createErrorPublisher(errorChannel)
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* @param {import('node:http').IncomingMessage} req
|
|
95
|
+
* @param {string | undefined} layerName
|
|
96
|
+
* @param {(error?: unknown) => void} originalNext
|
|
97
|
+
*/
|
|
98
|
+
function wrapNext (req, layerName, originalNext) {
|
|
99
|
+
// Per layer dispatch, N per request. Named `next`/arity-1 mirrors the
|
|
100
|
+
// router continuation so wrapCallback skips its name/length rewrite.
|
|
101
|
+
let calls = 0
|
|
102
|
+
return shimmer.wrapCallback(originalNext, original => function next (error) {
|
|
103
|
+
// A handler that calls `next()` and then rejects (`next(); await bg()`)
|
|
104
|
+
// makes the host call this continuation twice. Publish once so the second
|
|
105
|
+
// pass cannot tag the already-finished span's parent with a late error.
|
|
106
|
+
calls++
|
|
107
|
+
if (calls === 1) {
|
|
108
|
+
if (error && error !== 'route' && error !== 'router') {
|
|
109
|
+
publishError({ req, error })
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
nextChannel.publish({ req })
|
|
113
|
+
finishChannel.publish({ req })
|
|
114
|
+
} else if (calls === 2) {
|
|
115
|
+
// Surface the repeat as a diagnostic on the still-live request span. The
|
|
116
|
+
// host cannot tell a legitimate `next(); await bg()` from a buggy double
|
|
117
|
+
// `next()`, so this only records that it happened, not that it is wrong.
|
|
118
|
+
repeatChannel.publish({ req, name: layerName, error })
|
|
119
|
+
}
|
|
37
120
|
|
|
38
|
-
|
|
121
|
+
original.apply(this, arguments)
|
|
122
|
+
})
|
|
123
|
+
}
|
|
39
124
|
|
|
40
|
-
|
|
41
|
-
|
|
125
|
+
// Every host dispatch turns a synchronous throw into `next(error)`, and the
|
|
126
|
+
// hosts that await the handler (router >=2, express 5, express 4 +
|
|
127
|
+
// express-async-errors) do the same for a rejected promise. Passing
|
|
128
|
+
// `wrappedNext` through captures both without a tracer-side try/catch; only
|
|
129
|
+
// `exit` needs the `finally`. express 4's native dispatch converts only the
|
|
130
|
+
// synchronous throw — exactly what the pre-refactor handle wrap caught.
|
|
131
|
+
function wrapLayerRequest (originalRequest) {
|
|
132
|
+
return function (req, res, next) {
|
|
133
|
+
if (!enterChannel.hasSubscribers) return originalRequest.call(this, req, res, next)
|
|
42
134
|
|
|
43
|
-
|
|
44
|
-
if (
|
|
135
|
+
const meta = getLayerMeta(this)
|
|
136
|
+
if (meta === undefined || this.handle.length > 3) return originalRequest.call(this, req, res, next)
|
|
45
137
|
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
const name = original._name || original.name
|
|
49
|
-
const req = arguments[arguments.length > 3 ? 1 : 0]
|
|
50
|
-
const next = arguments[lastIndex]
|
|
138
|
+
const wrappedNext = typeof next === 'function' ? wrapNext(req, meta.name, next) : next
|
|
139
|
+
enterChannel.publish({ name: meta.name, req, route: resolveLayerRoute(meta, this), layer: this })
|
|
51
140
|
|
|
52
|
-
|
|
53
|
-
|
|
141
|
+
try {
|
|
142
|
+
return originalRequest.call(this, req, res, wrappedNext)
|
|
143
|
+
} finally {
|
|
144
|
+
exitChannel.publish({ req })
|
|
54
145
|
}
|
|
146
|
+
}
|
|
147
|
+
}
|
|
55
148
|
|
|
56
|
-
|
|
149
|
+
function wrapLayerError (originalError) {
|
|
150
|
+
return function (error, req, res, next) {
|
|
151
|
+
if (!enterChannel.hasSubscribers) return originalError.call(this, error, req, res, next)
|
|
57
152
|
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
for (const matcher of matchers) {
|
|
61
|
-
if (matcher.test(layer)) {
|
|
62
|
-
route = matcher.path
|
|
153
|
+
const meta = getLayerMeta(this)
|
|
154
|
+
if (meta === undefined || this.handle.length !== 4) return originalError.call(this, error, req, res, next)
|
|
63
155
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
156
|
+
const wrappedNext = typeof next === 'function' ? wrapNext(req, meta.name, next) : next
|
|
157
|
+
enterChannel.publish({ name: meta.name, req, route: resolveLayerRoute(meta, this), layer: this })
|
|
158
|
+
|
|
159
|
+
try {
|
|
160
|
+
return originalError.call(this, error, req, res, wrappedNext)
|
|
161
|
+
} finally {
|
|
162
|
+
exitChannel.publish({ req })
|
|
67
163
|
}
|
|
164
|
+
}
|
|
165
|
+
}
|
|
68
166
|
|
|
69
|
-
|
|
167
|
+
// express <4.6.0 has no `Layer` prototype dispatch: the router invokes
|
|
168
|
+
// `layer.handle` directly and routes errors by its arity. There the handle is
|
|
169
|
+
// replaced in place, with the arity preserved so the host still routes
|
|
170
|
+
// correctly. Newer express, express 5, and the router package keep `handle`
|
|
171
|
+
// pristine and are traced through the prototype wraps above.
|
|
172
|
+
function wrapLegacyHandle (layer, original) {
|
|
173
|
+
// `annotateLayer` always runs first in `wrapStack`, so the captured meta is
|
|
174
|
+
// never undefined here (unlike the prototype wraps, where `this` can be any
|
|
175
|
+
// layer the host dispatches).
|
|
176
|
+
const meta = getLayerMeta(layer)
|
|
177
|
+
const wrapped = shimmer.wrapFunction(original, inner => function (...args) {
|
|
178
|
+
if (!enterChannel.hasSubscribers) return inner.apply(this, args)
|
|
179
|
+
|
|
180
|
+
const isErrorHandler = original.length === 4
|
|
181
|
+
const req = args[isErrorHandler ? 1 : 0]
|
|
182
|
+
const nextIndex = isErrorHandler ? 3 : 2
|
|
183
|
+
if (typeof args[nextIndex] === 'function') args[nextIndex] = wrapNext(req, meta.name, args[nextIndex])
|
|
184
|
+
|
|
185
|
+
enterChannel.publish({ name: meta.name, req, route: resolveLayerRoute(meta, layer), layer })
|
|
70
186
|
|
|
71
187
|
try {
|
|
72
|
-
return
|
|
188
|
+
return inner.apply(this, args)
|
|
73
189
|
} catch (error) {
|
|
74
|
-
|
|
190
|
+
// Unlike the prototype hosts, this router catches a synchronous throw
|
|
191
|
+
// outside the layer and calls its own `next(error)`, never `wrappedNext`.
|
|
192
|
+
// Mirror `wrapNext` here so the throwing layer still tags its error and
|
|
193
|
+
// finishes, rather than lingering on the stack until request finish.
|
|
194
|
+
publishError({ req, error })
|
|
75
195
|
nextChannel.publish({ req })
|
|
76
196
|
finishChannel.publish({ req })
|
|
77
197
|
|
|
@@ -80,17 +200,45 @@ function createWrapRouterMethod (name) {
|
|
|
80
200
|
exitChannel.publish({ req })
|
|
81
201
|
}
|
|
82
202
|
})
|
|
203
|
+
Object.defineProperty(wrapped, 'length', { value: original.length, configurable: true })
|
|
204
|
+
return wrapped
|
|
83
205
|
}
|
|
84
206
|
|
|
207
|
+
return { wrapLayerRequest, wrapLayerError, wrapLegacyHandle }
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
/**
|
|
211
|
+
* @param {{ handle_request?: unknown, handleRequest?: unknown }} layer
|
|
212
|
+
*/
|
|
213
|
+
function hasLayerDispatch (layer) {
|
|
214
|
+
return typeof layer.handle_request === 'function' || typeof layer.handleRequest === 'function'
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
// TODO: Move this function to a shared file between Express and Router
|
|
218
|
+
/**
|
|
219
|
+
* @param {string} name Channel namespace (`apm:<name>:middleware:*`).
|
|
220
|
+
* @param {((pattern: string | RegExp) => RegExp | undefined) | undefined} compile
|
|
221
|
+
* Host-resolved path-to-regexp compile adapter, or undefined when the host
|
|
222
|
+
* instance ships no path-to-regexp. Captured here so each express/router
|
|
223
|
+
* instance keeps the dialect it actually loaded.
|
|
224
|
+
* @param {((layer: object, original: Function) => Function) | undefined} [wrapLegacyHandle]
|
|
225
|
+
* Fallback that replaces `layer.handle` for hosts without a `Layer` prototype
|
|
226
|
+
* dispatch (express <4.6.0). Omitted for hosts that always ship one.
|
|
227
|
+
*/
|
|
228
|
+
function createWrapRouterMethod (name, compile, wrapLegacyHandle) {
|
|
229
|
+
const routeAddedChannel = channel(`apm:${name}:route:added`)
|
|
230
|
+
|
|
85
231
|
function wrapStack (layers, matchers) {
|
|
86
232
|
for (const layer of layers) {
|
|
87
|
-
|
|
88
|
-
layer.__handle = wrapLayerHandle(layer, layer.__handle)
|
|
89
|
-
} else {
|
|
90
|
-
layer.handle = wrapLayerHandle(layer, layer.handle)
|
|
91
|
-
}
|
|
233
|
+
annotateLayer(layer, matchers)
|
|
92
234
|
|
|
93
|
-
|
|
235
|
+
if (wrapLegacyHandle !== undefined && !hasLayerDispatch(layer)) {
|
|
236
|
+
if (layer.__handle) { // express-async-errors
|
|
237
|
+
layer.__handle = wrapLegacyHandle(layer, layer.__handle)
|
|
238
|
+
} else {
|
|
239
|
+
layer.handle = wrapLegacyHandle(layer, layer.handle)
|
|
240
|
+
}
|
|
241
|
+
}
|
|
94
242
|
|
|
95
243
|
if (layer.route) {
|
|
96
244
|
for (const method of METHODS) {
|
|
@@ -104,19 +252,6 @@ function createWrapRouterMethod (name) {
|
|
|
104
252
|
}
|
|
105
253
|
}
|
|
106
254
|
|
|
107
|
-
function wrapNext (req, next) {
|
|
108
|
-
return shimmer.wrapFunction(next, next => function (error) {
|
|
109
|
-
if (error && error !== 'route' && error !== 'router') {
|
|
110
|
-
errorChannel.publish({ req, error })
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
nextChannel.publish({ req })
|
|
114
|
-
finishChannel.publish({ req })
|
|
115
|
-
|
|
116
|
-
next.apply(this, arguments)
|
|
117
|
-
})
|
|
118
|
-
}
|
|
119
|
-
|
|
120
255
|
function extractMatchers (fn) {
|
|
121
256
|
const arg = Array.isArray(fn) ? fn.flat(Infinity) : [fn]
|
|
122
257
|
|
|
@@ -124,25 +259,35 @@ function createWrapRouterMethod (name) {
|
|
|
124
259
|
return []
|
|
125
260
|
}
|
|
126
261
|
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
},
|
|
135
|
-
}))
|
|
136
|
-
}
|
|
137
|
-
|
|
138
|
-
function cachedPathToRegExp (pattern) {
|
|
139
|
-
const maybeCached = regexpCache[pattern]
|
|
140
|
-
if (maybeCached) {
|
|
141
|
-
return maybeCached
|
|
262
|
+
if (arg.length === 1) {
|
|
263
|
+
const pattern = arg[0]
|
|
264
|
+
const path = pattern instanceof RegExp ? `(${pattern})` : pattern
|
|
265
|
+
const matchers = [{ path }]
|
|
266
|
+
matchers.hasStarPath = path === '*'
|
|
267
|
+
matchers.hasSlashPath = path === '/'
|
|
268
|
+
return matchers
|
|
142
269
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
270
|
+
|
|
271
|
+
// hasStarPath/hasSlashPath cache the lookups isFastStar/isFastSlash
|
|
272
|
+
// would otherwise re-run on every request.
|
|
273
|
+
let hasStarPath = false
|
|
274
|
+
let hasSlashPath = false
|
|
275
|
+
const matchers = arg.map(pattern => {
|
|
276
|
+
const isRegExp = pattern instanceof RegExp
|
|
277
|
+
const path = isRegExp ? `(${pattern})` : pattern
|
|
278
|
+
if (path === '*') {
|
|
279
|
+
hasStarPath = true
|
|
280
|
+
} else if (path === '/') {
|
|
281
|
+
hasSlashPath = true
|
|
282
|
+
}
|
|
283
|
+
return {
|
|
284
|
+
path,
|
|
285
|
+
regex: isRegExp ? pattern : compile?.(pattern),
|
|
286
|
+
}
|
|
287
|
+
})
|
|
288
|
+
matchers.hasStarPath = hasStarPath
|
|
289
|
+
matchers.hasSlashPath = hasSlashPath
|
|
290
|
+
return matchers
|
|
146
291
|
}
|
|
147
292
|
|
|
148
293
|
function wrapMethod (original) {
|
|
@@ -218,33 +363,44 @@ function createWrapRouterMethod (name) {
|
|
|
218
363
|
return wrapMethod
|
|
219
364
|
}
|
|
220
365
|
|
|
221
|
-
const wrapRouterMethod = createWrapRouterMethod('router')
|
|
222
|
-
|
|
223
366
|
addHook({ name: 'router', versions: ['>=1 <2'] }, Router => {
|
|
367
|
+
const wrapRouterMethod = createWrapRouterMethod('router', getCompileToRegexp())
|
|
368
|
+
|
|
224
369
|
shimmer.wrap(Router.prototype, 'use', wrapRouterMethod)
|
|
225
370
|
shimmer.wrap(Router.prototype, 'route', wrapRouterMethod)
|
|
226
371
|
|
|
227
372
|
return Router
|
|
228
373
|
})
|
|
229
374
|
|
|
375
|
+
addHook({ name: 'router', file: 'lib/layer.js', versions: ['>=1 <2'] }, Layer => {
|
|
376
|
+
const { wrapLayerRequest, wrapLayerError } = createLayerDispatchWrappers('router')
|
|
377
|
+
|
|
378
|
+
shimmer.wrap(Layer.prototype, 'handle_request', wrapLayerRequest)
|
|
379
|
+
shimmer.wrap(Layer.prototype, 'handle_error', wrapLayerError)
|
|
380
|
+
|
|
381
|
+
return Layer
|
|
382
|
+
})
|
|
383
|
+
|
|
230
384
|
const queryParserReadCh = channel('datadog:query:read:finish')
|
|
231
385
|
|
|
232
386
|
addHook({ name: 'router', versions: ['>=2'] }, Router => {
|
|
387
|
+
const wrapRouterMethod = createWrapRouterMethod('router', getCompileToRegexp())
|
|
388
|
+
|
|
233
389
|
const WrappedRouter = shimmer.wrapFunction(Router, function (originalRouter) {
|
|
234
|
-
return function wrappedMethod () {
|
|
235
|
-
const router = originalRouter.apply(this,
|
|
390
|
+
return function wrappedMethod (...args) {
|
|
391
|
+
const router = originalRouter.apply(this, args)
|
|
236
392
|
|
|
237
393
|
shimmer.wrap(router, 'handle', function wrapHandle (originalHandle) {
|
|
238
394
|
return function wrappedHandle (req, res, next) {
|
|
239
|
-
const abortController = new AbortController()
|
|
240
|
-
|
|
241
395
|
if (queryParserReadCh.hasSubscribers && req) {
|
|
396
|
+
const abortController = new AbortController()
|
|
397
|
+
|
|
242
398
|
queryParserReadCh.publish({ req, res, query: req.query, abortController })
|
|
243
399
|
|
|
244
400
|
if (abortController.signal.aborted) return
|
|
245
401
|
}
|
|
246
402
|
|
|
247
|
-
return originalHandle.
|
|
403
|
+
return originalHandle.call(this, req, res, next)
|
|
248
404
|
}
|
|
249
405
|
})
|
|
250
406
|
|
|
@@ -262,7 +418,8 @@ const routerParamStartCh = channel('datadog:router:param:start')
|
|
|
262
418
|
const visitedParams = new WeakSet()
|
|
263
419
|
|
|
264
420
|
function wrapHandleRequest (original) {
|
|
265
|
-
return function wrappedHandleRequest (
|
|
421
|
+
return function wrappedHandleRequest (...args) {
|
|
422
|
+
const req = args[0]
|
|
266
423
|
if (routerParamStartCh.hasSubscribers && !visitedParams.has(req.params) && Object.keys(req.params).length) {
|
|
267
424
|
visitedParams.add(req.params)
|
|
268
425
|
|
|
@@ -270,7 +427,7 @@ function wrapHandleRequest (original) {
|
|
|
270
427
|
|
|
271
428
|
routerParamStartCh.publish({
|
|
272
429
|
req,
|
|
273
|
-
res,
|
|
430
|
+
res: args[1],
|
|
274
431
|
params: req?.params,
|
|
275
432
|
abortController,
|
|
276
433
|
})
|
|
@@ -278,21 +435,30 @@ function wrapHandleRequest (original) {
|
|
|
278
435
|
if (abortController.signal.aborted) return
|
|
279
436
|
}
|
|
280
437
|
|
|
281
|
-
return
|
|
438
|
+
return Reflect.apply(original, this, args)
|
|
282
439
|
}
|
|
283
440
|
}
|
|
284
441
|
|
|
285
442
|
addHook({
|
|
286
443
|
name: 'router', file: 'lib/layer.js', versions: ['>=2'],
|
|
287
444
|
}, Layer => {
|
|
445
|
+
const { wrapLayerRequest, wrapLayerError } = createLayerDispatchWrappers('router')
|
|
446
|
+
|
|
447
|
+
// `handleRequest` carries two concerns: the middleware dispatch span and the
|
|
448
|
+
// param-start publish (`wrapHandleRequest`). Wrap the dispatch first so it
|
|
449
|
+
// sits inner and param-start still fires before `middleware:enter`, matching
|
|
450
|
+
// the order from when the handle itself was wrapped.
|
|
451
|
+
shimmer.wrap(Layer.prototype, 'handleRequest', wrapLayerRequest)
|
|
452
|
+
shimmer.wrap(Layer.prototype, 'handleError', wrapLayerError)
|
|
288
453
|
shimmer.wrap(Layer.prototype, 'handleRequest', wrapHandleRequest)
|
|
289
454
|
return Layer
|
|
290
455
|
})
|
|
291
456
|
|
|
292
457
|
function wrapParam (original) {
|
|
293
|
-
return function wrappedProcessParams () {
|
|
294
|
-
|
|
295
|
-
return function wrappedFn (
|
|
458
|
+
return function wrappedProcessParams (...args) {
|
|
459
|
+
args[1] = shimmer.wrapFunction(args[1], (originalFn) => {
|
|
460
|
+
return function wrappedFn (...fnArgs) {
|
|
461
|
+
const req = fnArgs[0]
|
|
296
462
|
if (routerParamStartCh.hasSubscribers && Object.keys(req.params).length && !visitedParams.has(req.params)) {
|
|
297
463
|
visitedParams.add(req.params)
|
|
298
464
|
|
|
@@ -300,7 +466,7 @@ function wrapParam (original) {
|
|
|
300
466
|
|
|
301
467
|
routerParamStartCh.publish({
|
|
302
468
|
req,
|
|
303
|
-
res,
|
|
469
|
+
res: fnArgs[1],
|
|
304
470
|
params: req?.params,
|
|
305
471
|
abortController,
|
|
306
472
|
})
|
|
@@ -308,11 +474,11 @@ function wrapParam (original) {
|
|
|
308
474
|
if (abortController.signal.aborted) return
|
|
309
475
|
}
|
|
310
476
|
|
|
311
|
-
return
|
|
477
|
+
return Reflect.apply(originalFn, this, fnArgs)
|
|
312
478
|
}
|
|
313
479
|
})
|
|
314
480
|
|
|
315
|
-
return original.apply(this,
|
|
481
|
+
return original.apply(this, args)
|
|
316
482
|
}
|
|
317
483
|
}
|
|
318
484
|
|
|
@@ -323,4 +489,4 @@ addHook({
|
|
|
323
489
|
return router
|
|
324
490
|
})
|
|
325
491
|
|
|
326
|
-
module.exports = { createWrapRouterMethod }
|
|
492
|
+
module.exports = { createWrapRouterMethod, createLayerDispatchWrappers }
|
|
@@ -5,6 +5,10 @@ const realSetTimeout = setTimeout
|
|
|
5
5
|
|
|
6
6
|
const shimmer = require('../../datadog-shimmer')
|
|
7
7
|
const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
|
|
8
|
+
const {
|
|
9
|
+
RUM_TEST_EXECUTION_ID_COOKIE_NAME: DD_CIVISIBILITY_TEST_EXECUTION_ID_COOKIE_NAME,
|
|
10
|
+
} = require('../../dd-trace/src/ci-visibility/rum')
|
|
11
|
+
const log = require('../../dd-trace/src/log')
|
|
8
12
|
const { addHook, channel } = require('./helpers/instrument')
|
|
9
13
|
|
|
10
14
|
const ciSeleniumDriverGetStartCh = channel('ci:selenium:driver:get')
|
|
@@ -19,9 +23,7 @@ if (window.DD_RUM && window.DD_RUM.stopSession) {
|
|
|
19
23
|
`
|
|
20
24
|
const IS_RUM_ACTIVE_SCRIPT = 'return !!window.DD_RUM'
|
|
21
25
|
|
|
22
|
-
const DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS =
|
|
23
|
-
Number(getValueFromEnvSources('DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS')) || 500
|
|
24
|
-
const DD_CIVISIBILITY_TEST_EXECUTION_ID_COOKIE_NAME = 'datadog-ci-visibility-test-execution-id'
|
|
26
|
+
const DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS = getValueFromEnvSources('DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS')
|
|
25
27
|
|
|
26
28
|
// TODO: can we increase the supported version range?
|
|
27
29
|
addHook({
|
|
@@ -33,28 +35,47 @@ addHook({
|
|
|
33
35
|
if (!ciSeleniumDriverGetStartCh.hasSubscribers) {
|
|
34
36
|
return get.apply(this, arguments)
|
|
35
37
|
}
|
|
36
|
-
let traceId
|
|
37
|
-
const setTraceId = (inputTraceId) => {
|
|
38
|
-
traceId = inputTraceId
|
|
39
|
-
}
|
|
40
38
|
const getResult = await get.apply(this, arguments)
|
|
41
39
|
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
let isRumActive
|
|
41
|
+
try {
|
|
42
|
+
isRumActive = await this.executeScript(IS_RUM_ACTIVE_SCRIPT)
|
|
43
|
+
} catch (error) {
|
|
44
|
+
log.error('Selenium RUM detection error', error)
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
let browserName
|
|
48
|
+
let browserVersion
|
|
49
|
+
try {
|
|
50
|
+
const capabilities = await this.getCapabilities()
|
|
51
|
+
browserName = capabilities.getBrowserName()
|
|
52
|
+
browserVersion = capabilities.getBrowserVersion()
|
|
53
|
+
} catch (error) {
|
|
54
|
+
log.error('Selenium browser metadata error', error)
|
|
55
|
+
}
|
|
44
56
|
|
|
45
|
-
|
|
46
|
-
setTraceId,
|
|
57
|
+
const context = {
|
|
47
58
|
seleniumVersion,
|
|
48
|
-
browserName
|
|
49
|
-
browserVersion
|
|
59
|
+
browserName,
|
|
60
|
+
browserVersion,
|
|
50
61
|
isRumActive,
|
|
51
|
-
|
|
62
|
+
testExecutionId: undefined,
|
|
63
|
+
}
|
|
64
|
+
try {
|
|
65
|
+
ciSeleniumDriverGetStartCh.publish(context)
|
|
66
|
+
} catch (error) {
|
|
67
|
+
log.error('Selenium RUM correlation channel error', error)
|
|
68
|
+
}
|
|
52
69
|
|
|
53
|
-
if (
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
70
|
+
if (context.testExecutionId && isRumActive) {
|
|
71
|
+
try {
|
|
72
|
+
await this.manage().addCookie({
|
|
73
|
+
name: DD_CIVISIBILITY_TEST_EXECUTION_ID_COOKIE_NAME,
|
|
74
|
+
value: context.testExecutionId,
|
|
75
|
+
})
|
|
76
|
+
} catch (error) {
|
|
77
|
+
log.error('Selenium RUM correlation cookie error', error)
|
|
78
|
+
}
|
|
58
79
|
}
|
|
59
80
|
|
|
60
81
|
return getResult
|
|
@@ -64,16 +85,20 @@ addHook({
|
|
|
64
85
|
if (!ciSeleniumDriverGetStartCh.hasSubscribers) {
|
|
65
86
|
return quit.apply(this, arguments)
|
|
66
87
|
}
|
|
67
|
-
|
|
88
|
+
try {
|
|
89
|
+
const isRumActive = await this.executeScript(RUM_STOP_SESSION_SCRIPT)
|
|
68
90
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
91
|
+
if (isRumActive) {
|
|
92
|
+
// We'll have time for RUM to flush the events (there's no callback to know when it's done)
|
|
93
|
+
await new Promise(resolve => {
|
|
94
|
+
realSetTimeout(() => {
|
|
95
|
+
resolve()
|
|
96
|
+
}, DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS)
|
|
97
|
+
})
|
|
98
|
+
await this.manage().deleteCookie(DD_CIVISIBILITY_TEST_EXECUTION_ID_COOKIE_NAME)
|
|
99
|
+
}
|
|
100
|
+
} catch (error) {
|
|
101
|
+
log.error('Selenium RUM cleanup error', error)
|
|
77
102
|
}
|
|
78
103
|
|
|
79
104
|
return quit.apply(this, arguments)
|