@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,14 +1,38 @@
|
|
|
1
1
|
'use strict'
|
|
2
2
|
|
|
3
|
+
const { LRUCache } = require('../../../../vendor/dist/lru-cache')
|
|
3
4
|
const log = require('../log')
|
|
5
|
+
const web = require('../plugins/util/web')
|
|
4
6
|
const blockedTemplates = require('./blocked_templates')
|
|
5
7
|
const { updateBlockFailureMetric } = require('./telemetry')
|
|
6
8
|
|
|
7
|
-
|
|
9
|
+
// Bounded by the LRU as defense-in-depth: getSpecificKey already keys on the
|
|
10
|
+
// resolved route (or the path with the query string stripped) so cardinality
|
|
11
|
+
// follows the routing table, not the URL space.
|
|
12
|
+
const SPECIFIC_ENDPOINT_CACHE_MAX = 16_384
|
|
13
|
+
const detectedSpecificEndpoints = new LRUCache({ max: SPECIFIC_ENDPOINT_CACHE_MAX })
|
|
14
|
+
|
|
15
|
+
const templateKeyword = '[security_response_id]'
|
|
16
|
+
|
|
17
|
+
const templates = {
|
|
18
|
+
html: {
|
|
19
|
+
body: null,
|
|
20
|
+
idIndex: -1,
|
|
21
|
+
type: 'text/html; charset=utf-8',
|
|
22
|
+
},
|
|
23
|
+
json: {
|
|
24
|
+
body: null,
|
|
25
|
+
idIndex: -1,
|
|
26
|
+
type: 'application/json',
|
|
27
|
+
},
|
|
28
|
+
graphqlJson: {
|
|
29
|
+
body: null,
|
|
30
|
+
idIndex: -1,
|
|
31
|
+
type: 'application/json',
|
|
32
|
+
},
|
|
33
|
+
}
|
|
8
34
|
|
|
9
|
-
|
|
10
|
-
let templateJson = blockedTemplates.json
|
|
11
|
-
let templateGraphqlJson = blockedTemplates.graphqlJson
|
|
35
|
+
setTemplates()
|
|
12
36
|
|
|
13
37
|
let defaultBlockingActionParameters
|
|
14
38
|
|
|
@@ -17,15 +41,21 @@ const responseBlockedSet = new WeakSet()
|
|
|
17
41
|
const blockDelegations = new WeakMap()
|
|
18
42
|
|
|
19
43
|
const specificBlockingTypes = {
|
|
20
|
-
GRAPHQL: '
|
|
44
|
+
GRAPHQL: 'graphqlJson',
|
|
21
45
|
}
|
|
22
46
|
|
|
23
|
-
function getSpecificKey (
|
|
24
|
-
|
|
47
|
+
function getSpecificKey (req) {
|
|
48
|
+
const route = web.getContext(req)?.paths?.join('')
|
|
49
|
+
if (route) return `${req.method}+${route}`
|
|
50
|
+
|
|
51
|
+
// Strip the query string so unique parameters do not balloon the cache.
|
|
52
|
+
const url = req.originalUrl || req.url || ''
|
|
53
|
+
const queryStart = url.indexOf('?')
|
|
54
|
+
return `${req.method}+${queryStart === -1 ? url : url.slice(0, queryStart)}`
|
|
25
55
|
}
|
|
26
56
|
|
|
27
|
-
function addSpecificEndpoint (
|
|
28
|
-
detectedSpecificEndpoints
|
|
57
|
+
function addSpecificEndpoint (req, type) {
|
|
58
|
+
detectedSpecificEndpoints.set(getSpecificKey(req), type)
|
|
29
59
|
}
|
|
30
60
|
|
|
31
61
|
function getBlockWithRedirectData (actionParameters) {
|
|
@@ -33,30 +63,23 @@ function getBlockWithRedirectData (actionParameters) {
|
|
|
33
63
|
if (!statusCode || statusCode < 300 || statusCode >= 400) {
|
|
34
64
|
statusCode = 303
|
|
35
65
|
}
|
|
36
|
-
const headers = {
|
|
37
|
-
Location: actionParameters.location,
|
|
38
|
-
}
|
|
39
66
|
|
|
40
|
-
|
|
41
|
-
}
|
|
67
|
+
const headers = { Location: actionParameters.location }
|
|
42
68
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
case specificBlockingTypes.GRAPHQL:
|
|
46
|
-
return {
|
|
47
|
-
type: 'application/json',
|
|
48
|
-
body: templateGraphqlJson,
|
|
49
|
-
}
|
|
69
|
+
if (headers.Location) {
|
|
70
|
+
headers.Location = headers.Location.replace(templateKeyword, actionParameters.security_response_id ?? '')
|
|
50
71
|
}
|
|
72
|
+
|
|
73
|
+
return { headers, statusCode }
|
|
51
74
|
}
|
|
52
75
|
|
|
53
76
|
function getBlockWithContentData (req, specificType, actionParameters) {
|
|
54
77
|
let type
|
|
55
78
|
let body
|
|
56
79
|
|
|
57
|
-
const specificBlockingType = specificType || detectedSpecificEndpoints
|
|
80
|
+
const specificBlockingType = specificType || detectedSpecificEndpoints.get(getSpecificKey(req))
|
|
58
81
|
if (specificBlockingType) {
|
|
59
|
-
const specificBlockingContent =
|
|
82
|
+
const specificBlockingContent = getTemplate(specificBlockingType, actionParameters)
|
|
60
83
|
type = specificBlockingContent?.type
|
|
61
84
|
body = specificBlockingContent?.body
|
|
62
85
|
}
|
|
@@ -65,30 +88,24 @@ function getBlockWithContentData (req, specificType, actionParameters) {
|
|
|
65
88
|
// parse the Accept header, ex: Accept: text/html, application/xhtml+xml, application/xml;q=0.9, */*;q=0.8
|
|
66
89
|
const accept = req.headers.accept?.split(',').map((str) => str.split(';', 1)[0].trim())
|
|
67
90
|
|
|
91
|
+
let templateName = 'json'
|
|
92
|
+
|
|
68
93
|
if (!actionParameters || actionParameters.type === 'auto') {
|
|
69
94
|
if (accept?.includes('text/html') && !accept.includes('application/json')) {
|
|
70
|
-
|
|
71
|
-
body = templateHtml
|
|
72
|
-
} else {
|
|
73
|
-
type = 'application/json'
|
|
74
|
-
body = templateJson
|
|
75
|
-
}
|
|
76
|
-
} else {
|
|
77
|
-
if (actionParameters.type === 'html') {
|
|
78
|
-
type = 'text/html; charset=utf-8'
|
|
79
|
-
body = templateHtml
|
|
80
|
-
} else {
|
|
81
|
-
type = 'application/json'
|
|
82
|
-
body = templateJson
|
|
95
|
+
templateName = 'html'
|
|
83
96
|
}
|
|
97
|
+
} else if (actionParameters.type === 'html') {
|
|
98
|
+
templateName = 'html'
|
|
84
99
|
}
|
|
100
|
+
|
|
101
|
+
({ type, body } = getTemplate(templateName, actionParameters))
|
|
85
102
|
}
|
|
86
103
|
|
|
87
104
|
const statusCode = actionParameters?.status_code || 403
|
|
88
105
|
|
|
89
106
|
const headers = {
|
|
90
|
-
'
|
|
91
|
-
'
|
|
107
|
+
'content-type': type,
|
|
108
|
+
'content-length': Buffer.byteLength(body),
|
|
92
109
|
}
|
|
93
110
|
|
|
94
111
|
return { body, statusCode, headers }
|
|
@@ -164,12 +181,38 @@ function getBlockingAction (actions) {
|
|
|
164
181
|
return actions?.redirect_request || actions?.block_request
|
|
165
182
|
}
|
|
166
183
|
|
|
184
|
+
/**
|
|
185
|
+
* @param {import('../config/config-base')} [config] - Tracer configuration
|
|
186
|
+
*/
|
|
167
187
|
function setTemplates (config) {
|
|
168
|
-
|
|
188
|
+
templates.html.body = config?.appsec?.blockedTemplateHtml
|
|
189
|
+
templates.json.body = config?.appsec?.blockedTemplateJson
|
|
190
|
+
templates.graphqlJson.body = config?.appsec?.blockedTemplateGraphql
|
|
191
|
+
|
|
192
|
+
for (const type of Object.keys(templates)) {
|
|
193
|
+
const template = templates[type]
|
|
194
|
+
|
|
195
|
+
// set default template if not set by config
|
|
196
|
+
if (!template.body) template.body = blockedTemplates[type]
|
|
197
|
+
|
|
198
|
+
template.idIndex = template.body.indexOf(templateKeyword)
|
|
199
|
+
|
|
200
|
+
if (template.idIndex !== -1) {
|
|
201
|
+
template.body = [
|
|
202
|
+
template.body.slice(0, template.idIndex),
|
|
203
|
+
template.body.slice(template.idIndex + templateKeyword.length),
|
|
204
|
+
]
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
function getTemplate (type, actionParameters) {
|
|
210
|
+
const template = templates[type]
|
|
211
|
+
if (template.idIndex === -1) return template
|
|
169
212
|
|
|
170
|
-
|
|
213
|
+
const body = template.body[0] + (actionParameters?.security_response_id ?? '') + template.body[1]
|
|
171
214
|
|
|
172
|
-
|
|
215
|
+
return { body, type: template.type }
|
|
173
216
|
}
|
|
174
217
|
|
|
175
218
|
function isBlocked (res) {
|
|
@@ -23,9 +23,13 @@ module.exports = {
|
|
|
23
23
|
fsOperationStart: dc.channel('apm:fs:operation:start'),
|
|
24
24
|
graphqlMiddlewareChannel: dc.tracingChannel('datadog:apollo:middleware'),
|
|
25
25
|
httpClientRequestStart: dc.channel('apm:http:client:request:start'),
|
|
26
|
+
httpClientResponseStart: dc.channel('apm:http:client:response:start'),
|
|
26
27
|
httpClientResponseFinish: dc.channel('apm:http:client:response:finish'),
|
|
28
|
+
informationalResponse: dc.channel('datadog:http:server:informational-response:start'),
|
|
27
29
|
incomingHttpRequestEnd: dc.channel('dd-trace:incomingHttpRequestEnd'),
|
|
28
30
|
incomingHttpRequestStart: dc.channel('dd-trace:incomingHttpRequestStart'),
|
|
31
|
+
lambdaStartInvocation: dc.channel('datadog:lambda:start-invocation'),
|
|
32
|
+
lambdaEndInvocation: dc.channel('datadog:lambda:end-invocation'),
|
|
29
33
|
multerParser: dc.channel('datadog:multer:read:finish'),
|
|
30
34
|
mysql2OuterQueryStart: dc.channel('datadog:mysql2:outerquery:start'),
|
|
31
35
|
nextBodyParsed: dc.channel('apm:next:body-parsed'),
|
|
@@ -42,7 +46,7 @@ module.exports = {
|
|
|
42
46
|
routerParam: dc.channel('datadog:router:param:start'),
|
|
43
47
|
setCookieChannel: dc.channel('datadog:iast:set-cookie'),
|
|
44
48
|
setUncaughtExceptionCaptureCallbackStart: dc.channel('datadog:process:setUncaughtExceptionCaptureCallback:start'),
|
|
45
|
-
|
|
49
|
+
startGraphqlResolver: dc.channel('datadog:graphql:resolver:start'),
|
|
46
50
|
stripeCheckoutSessionCreate: dc.channel('datadog:stripe:checkoutSession:create:finish'),
|
|
47
51
|
stripeConstructEvent: dc.channel('datadog:stripe:constructEvent:finish'),
|
|
48
52
|
stripePaymentIntentCreate: dc.channel('datadog:stripe:paymentIntent:create:finish'),
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
const web = require('../plugins/util/web')
|
|
4
4
|
const log = require('../log')
|
|
5
|
+
const { isEmpty } = require('../util')
|
|
5
6
|
const {
|
|
6
7
|
HTTP_OUTGOING_METHOD,
|
|
7
8
|
HTTP_OUTGOING_HEADERS,
|
|
@@ -13,21 +14,34 @@ const {
|
|
|
13
14
|
const KNUTH_FACTOR = 11400714819323199488n // eslint-disable-line unicorn/numeric-separators-style
|
|
14
15
|
const UINT64_MAX = (1n << 64n) - 1n
|
|
15
16
|
|
|
17
|
+
const SUPPORTED_RESPONSE_BODY_MIME_TYPES = new Set([
|
|
18
|
+
'application/json',
|
|
19
|
+
'text/json',
|
|
20
|
+
'application/x-www-form-urlencoded',
|
|
21
|
+
])
|
|
22
|
+
|
|
23
|
+
const RESPONSE_BODY_IGNORED_TAG_CONTENT_TYPE =
|
|
24
|
+
'_dd.appsec.downstream_request.response_body_ignored.content_type_invalid'
|
|
25
|
+
const RESPONSE_BODY_IGNORED_TAG_CONTENT_LENGTH_MISSING =
|
|
26
|
+
'_dd.appsec.downstream_request.response_body_ignored.content_length_missing'
|
|
27
|
+
const RESPONSE_BODY_IGNORED_TAG_CONTENT_LENGTH_TOO_BIG =
|
|
28
|
+
'_dd.appsec.downstream_request.response_body_ignored.content_length_too_big'
|
|
29
|
+
|
|
16
30
|
let config
|
|
17
31
|
let samplingRate
|
|
18
32
|
let globalRequestCounter
|
|
19
33
|
let bodyAnalysisCount
|
|
20
34
|
let downstreamAnalysisCount
|
|
21
|
-
let
|
|
35
|
+
let responseBodyIgnoredCount
|
|
22
36
|
|
|
23
37
|
function enable (_config) {
|
|
24
38
|
config = _config
|
|
25
39
|
globalRequestCounter = 0n
|
|
26
40
|
bodyAnalysisCount = new WeakMap()
|
|
27
41
|
downstreamAnalysisCount = new WeakMap()
|
|
28
|
-
|
|
42
|
+
responseBodyIgnoredCount = new WeakMap()
|
|
29
43
|
|
|
30
|
-
const bodyAnalysisSampleRate = config.appsec.
|
|
44
|
+
const bodyAnalysisSampleRate = config.appsec.DD_API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE
|
|
31
45
|
samplingRate = Math.min(Math.max(bodyAnalysisSampleRate, 0), 1)
|
|
32
46
|
|
|
33
47
|
if (samplingRate !== bodyAnalysisSampleRate) {
|
|
@@ -42,53 +56,88 @@ function disable () {
|
|
|
42
56
|
globalRequestCounter = null
|
|
43
57
|
bodyAnalysisCount = null
|
|
44
58
|
downstreamAnalysisCount = null
|
|
45
|
-
|
|
59
|
+
responseBodyIgnoredCount = null
|
|
46
60
|
}
|
|
47
61
|
|
|
48
62
|
/**
|
|
49
|
-
*
|
|
50
|
-
* @
|
|
51
|
-
* @param {string} outgoingUrl the URL being requested.
|
|
52
|
-
* @returns {boolean} the stored decision
|
|
63
|
+
* @param {string|string[]|undefined} contentLength raw content-length header value.
|
|
64
|
+
* @returns {number|null} parsed content length or null when invalid.
|
|
53
65
|
*/
|
|
54
|
-
function
|
|
55
|
-
|
|
56
|
-
|
|
66
|
+
function parseContentLengthHeader (contentLength) {
|
|
67
|
+
if (contentLength == null) {
|
|
68
|
+
return null
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
const value = Array.isArray(contentLength) ? contentLength[0] : contentLength
|
|
72
|
+
const parsed = Number.parseInt(String(value), 10)
|
|
57
73
|
|
|
58
|
-
|
|
74
|
+
if (!Number.isFinite(parsed) || parsed < 0) {
|
|
75
|
+
return null
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
return parsed
|
|
59
79
|
}
|
|
60
80
|
|
|
61
81
|
/**
|
|
62
|
-
*
|
|
63
|
-
* @param {import('http').IncomingMessage} req
|
|
64
|
-
* @param {string}
|
|
82
|
+
* Increments a response-body-ignored counter on the service-entry span.
|
|
83
|
+
* @param {import('http').IncomingMessage} req originating request.
|
|
84
|
+
* @param {string} tag full `_dd.appsec.downstream_request.response_body_ignored.*` span tag.
|
|
65
85
|
*/
|
|
66
|
-
function
|
|
67
|
-
|
|
86
|
+
function recordResponseBodyIgnored (req, tag) {
|
|
87
|
+
const span = web.root(req)
|
|
88
|
+
if (!span) return
|
|
68
89
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
90
|
+
let counts = responseBodyIgnoredCount.get(req)
|
|
91
|
+
if (!counts) {
|
|
92
|
+
counts = {}
|
|
93
|
+
responseBodyIgnoredCount.set(req, counts)
|
|
72
94
|
}
|
|
73
95
|
|
|
74
|
-
|
|
96
|
+
const current = counts[tag] || 0
|
|
97
|
+
const next = current + 1
|
|
98
|
+
counts[tag] = next
|
|
99
|
+
span.setTag(tag, next)
|
|
75
100
|
}
|
|
76
101
|
|
|
77
102
|
/**
|
|
78
|
-
*
|
|
79
|
-
* @param {import('http').IncomingMessage}
|
|
80
|
-
* @
|
|
81
|
-
* @returns {boolean} true when the downstream response body should be captured.
|
|
103
|
+
* @param {import('http').IncomingMessage} originatingReq inbound request (for metrics).
|
|
104
|
+
* @param {import('http').IncomingMessage} res downstream response.
|
|
105
|
+
* @returns {boolean} whether downstream response body should be collected for AppSec.
|
|
82
106
|
*/
|
|
83
|
-
function
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
107
|
+
function evaluateResponseBodyCollection (originatingReq, res) {
|
|
108
|
+
const maxBytes = config.appsec.DD_API_SECURITY_MAX_DOWNSTREAM_BODY_BYTES
|
|
109
|
+
|
|
110
|
+
const mime = extractMimeType(res.headers?.['content-type'])
|
|
111
|
+
if (!mime || !SUPPORTED_RESPONSE_BODY_MIME_TYPES.has(mime)) {
|
|
112
|
+
recordResponseBodyIgnored(originatingReq, RESPONSE_BODY_IGNORED_TAG_CONTENT_TYPE)
|
|
113
|
+
return false
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
const declaredContentLength = parseContentLengthHeader(res.headers?.['content-length'])
|
|
117
|
+
if (declaredContentLength == null || declaredContentLength === 0) {
|
|
118
|
+
recordResponseBodyIgnored(originatingReq, RESPONSE_BODY_IGNORED_TAG_CONTENT_LENGTH_MISSING)
|
|
119
|
+
return false
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
if (declaredContentLength > maxBytes) {
|
|
123
|
+
recordResponseBodyIgnored(originatingReq, RESPONSE_BODY_IGNORED_TAG_CONTENT_LENGTH_TOO_BIG)
|
|
124
|
+
return false
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
return true
|
|
128
|
+
}
|
|
87
129
|
|
|
130
|
+
/**
|
|
131
|
+
* Probabilistic gate for downstream response body capture (rate + per-request cap).
|
|
132
|
+
* Only used from {@link planResponseBodyCollection}; does not increment {@link bodyAnalysisCount}.
|
|
133
|
+
* @param {import('http').IncomingMessage} req originating server request.
|
|
134
|
+
* @returns {boolean}
|
|
135
|
+
*/
|
|
136
|
+
function shouldSampleBody (req) {
|
|
88
137
|
globalRequestCounter = (globalRequestCounter + 1n) & UINT64_MAX
|
|
89
138
|
|
|
90
139
|
const currentCount = bodyAnalysisCount.get(req) || 0
|
|
91
|
-
if (currentCount >= config.appsec.
|
|
140
|
+
if (currentCount >= config.appsec.DD_API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS) {
|
|
92
141
|
return false
|
|
93
142
|
}
|
|
94
143
|
|
|
@@ -96,14 +145,43 @@ function shouldSampleBody (req, outgoingUrl) {
|
|
|
96
145
|
// Replace 1000n with the accuraccy that we want to maintain
|
|
97
146
|
const threshold = (UINT64_MAX * BigInt(Math.round(samplingRate * 1000))) / 1000n
|
|
98
147
|
|
|
99
|
-
|
|
148
|
+
return hashed <= threshold
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/**
|
|
152
|
+
* @param {import('http').IncomingMessage} res downstream HTTP response.
|
|
153
|
+
* @returns {boolean}
|
|
154
|
+
*/
|
|
155
|
+
function isRedirectResponse (res) {
|
|
156
|
+
const location = res.headers?.location || ''
|
|
157
|
+
return res.statusCode >= 300 && res.statusCode < 400 && !!location
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
/**
|
|
161
|
+
* Plans downstream response body capture on the instrumentation ctx when response headers arrive.
|
|
162
|
+
* Redirect responses (3xx + Location) are ignored; each outbound hop is evaluated independently
|
|
163
|
+
* when its own non-redirect response arrives.
|
|
164
|
+
* @param {import('http').IncomingMessage} originatingReq incoming server request.
|
|
165
|
+
* @param {import('http').IncomingMessage} res downstream response.
|
|
166
|
+
* @param {object} ctx http client instrumentation context (mutated).
|
|
167
|
+
*/
|
|
168
|
+
function planResponseBodyCollection (originatingReq, res, ctx) {
|
|
169
|
+
if (!config) {
|
|
170
|
+
return
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
if (isRedirectResponse(res)) {
|
|
174
|
+
return
|
|
175
|
+
}
|
|
100
176
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
incrementBodyAnalysisCount(req)
|
|
177
|
+
if (!shouldSampleBody(originatingReq)) {
|
|
178
|
+
return
|
|
104
179
|
}
|
|
105
180
|
|
|
106
|
-
|
|
181
|
+
if (evaluateResponseBodyCollection(originatingReq, res)) {
|
|
182
|
+
ctx.shouldCollectBody = true
|
|
183
|
+
incrementBodyAnalysisCount(originatingReq)
|
|
184
|
+
}
|
|
107
185
|
}
|
|
108
186
|
|
|
109
187
|
/**
|
|
@@ -137,32 +215,13 @@ function extractRequestData (ctx) {
|
|
|
137
215
|
addresses[HTTP_OUTGOING_METHOD] = getMethod(options.method)
|
|
138
216
|
|
|
139
217
|
const headers = options?.headers
|
|
140
|
-
if (headers &&
|
|
218
|
+
if (headers && !isEmpty(headers)) {
|
|
141
219
|
addresses[HTTP_OUTGOING_HEADERS] = lowercaseHeaderKeys(headers)
|
|
142
220
|
}
|
|
143
221
|
|
|
144
222
|
return addresses
|
|
145
223
|
}
|
|
146
224
|
|
|
147
|
-
/**
|
|
148
|
-
* Checks if a response is a redirect
|
|
149
|
-
* @param {import('http').IncomingMessage} req incoming server request.
|
|
150
|
-
* @param {import('http').IncomingMessage} res downstream response object.
|
|
151
|
-
* @returns {boolean} is redirect.
|
|
152
|
-
*/
|
|
153
|
-
function handleRedirectResponse (req, res) {
|
|
154
|
-
const isRedirect = res.statusCode >= 300 && res.statusCode < 400
|
|
155
|
-
const redirectLocation = res.headers?.location || ''
|
|
156
|
-
|
|
157
|
-
if (isRedirect && redirectLocation) {
|
|
158
|
-
// Store the body collection decision for the redirect target
|
|
159
|
-
storeRedirectBodyCollectionDecision(req, redirectLocation)
|
|
160
|
-
return true
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
return false
|
|
164
|
-
}
|
|
165
|
-
|
|
166
225
|
/**
|
|
167
226
|
* Extracts response data for WAF analysis.
|
|
168
227
|
* @param {import('http').IncomingMessage} res downstream response object.
|
|
@@ -177,7 +236,7 @@ function extractResponseData (res, responseBody) {
|
|
|
177
236
|
}
|
|
178
237
|
|
|
179
238
|
const headers = res.headers
|
|
180
|
-
if (headers &&
|
|
239
|
+
if (headers && !isEmpty(headers)) {
|
|
181
240
|
addresses[HTTP_OUTGOING_RESPONSE_HEADERS] = headers
|
|
182
241
|
}
|
|
183
242
|
|
|
@@ -290,13 +349,8 @@ function extractMimeType (contentType) {
|
|
|
290
349
|
module.exports = {
|
|
291
350
|
enable,
|
|
292
351
|
disable,
|
|
293
|
-
|
|
294
|
-
handleRedirectResponse,
|
|
352
|
+
planResponseBodyCollection,
|
|
295
353
|
incrementDownstreamAnalysisCount,
|
|
296
354
|
extractRequestData,
|
|
297
355
|
extractResponseData,
|
|
298
|
-
// exports for tests
|
|
299
|
-
parseBody,
|
|
300
|
-
getMethod,
|
|
301
|
-
storeRedirectBodyCollectionDecision,
|
|
302
356
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
'use strict'
|
|
2
2
|
|
|
3
|
-
const { storage } = require('../../../datadog-core')
|
|
4
3
|
const log = require('../log')
|
|
5
4
|
const web = require('../plugins/util/web')
|
|
5
|
+
const { getActiveRequest } = require('./store')
|
|
6
6
|
const {
|
|
7
7
|
addSpecificEndpoint,
|
|
8
8
|
specificBlockingTypes,
|
|
@@ -12,7 +12,7 @@ const {
|
|
|
12
12
|
const waf = require('./waf')
|
|
13
13
|
const addresses = require('./addresses')
|
|
14
14
|
const {
|
|
15
|
-
|
|
15
|
+
startGraphqlResolver,
|
|
16
16
|
graphqlMiddlewareChannel,
|
|
17
17
|
apolloHttpServerChannel,
|
|
18
18
|
apolloChannel,
|
|
@@ -32,8 +32,8 @@ function disable () {
|
|
|
32
32
|
disableGraphql()
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
function
|
|
36
|
-
const req =
|
|
35
|
+
function onGraphqlStartResolver ({ abortController, resolverInfo }) {
|
|
36
|
+
const req = getActiveRequest()
|
|
37
37
|
|
|
38
38
|
if (!req) return
|
|
39
39
|
|
|
@@ -46,13 +46,13 @@ function onGraphqlStartResolve ({ context, resolverInfo }) {
|
|
|
46
46
|
if (requestData?.isInGraphqlRequest) {
|
|
47
47
|
requestData.blocked = true
|
|
48
48
|
requestData.wafAction = blockingAction
|
|
49
|
-
|
|
49
|
+
abortController?.abort()
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
function enterInApolloMiddleware (data) {
|
|
55
|
-
const req = data?.req ||
|
|
55
|
+
const req = data?.req || getActiveRequest()
|
|
56
56
|
if (!req) return
|
|
57
57
|
|
|
58
58
|
graphqlRequestData.set(req, {
|
|
@@ -61,7 +61,7 @@ function enterInApolloMiddleware (data) {
|
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
function enterInApolloServerCoreRequest () {
|
|
64
|
-
const req =
|
|
64
|
+
const req = getActiveRequest()
|
|
65
65
|
if (!req) return
|
|
66
66
|
|
|
67
67
|
graphqlRequestData.set(req, {
|
|
@@ -71,19 +71,22 @@ function enterInApolloServerCoreRequest () {
|
|
|
71
71
|
}
|
|
72
72
|
|
|
73
73
|
function enterInApolloRequest () {
|
|
74
|
-
const req =
|
|
74
|
+
const req = getActiveRequest()
|
|
75
|
+
if (!req) return
|
|
75
76
|
|
|
76
|
-
|
|
77
|
-
if (requestData) {
|
|
78
|
-
//
|
|
79
|
-
//
|
|
80
|
-
requestData
|
|
81
|
-
|
|
77
|
+
let requestData = graphqlRequestData.get(req)
|
|
78
|
+
if (!requestData) {
|
|
79
|
+
// executeHTTPGraphQLRequest is the GraphQL request boundary, so seed here
|
|
80
|
+
// when no upstream hook (express4 middleware, drainHttpServer) has run.
|
|
81
|
+
requestData = { blocked: false }
|
|
82
|
+
graphqlRequestData.set(req, requestData)
|
|
82
83
|
}
|
|
84
|
+
requestData.isInGraphqlRequest = true
|
|
85
|
+
addSpecificEndpoint(req, specificBlockingTypes.GRAPHQL)
|
|
83
86
|
}
|
|
84
87
|
|
|
85
88
|
function beforeWriteApolloGraphqlResponse ({ abortController, abortData }) {
|
|
86
|
-
const req =
|
|
89
|
+
const req = getActiveRequest()
|
|
87
90
|
if (!req) return
|
|
88
91
|
|
|
89
92
|
const requestData = graphqlRequestData.get(req)
|
|
@@ -153,11 +156,11 @@ function disableApollo () {
|
|
|
153
156
|
}
|
|
154
157
|
|
|
155
158
|
function enableGraphql () {
|
|
156
|
-
|
|
159
|
+
startGraphqlResolver.subscribe(onGraphqlStartResolver)
|
|
157
160
|
}
|
|
158
161
|
|
|
159
162
|
function disableGraphql () {
|
|
160
|
-
if (
|
|
163
|
+
if (startGraphqlResolver.hasSubscribers) startGraphqlResolver.unsubscribe(onGraphqlStartResolver)
|
|
161
164
|
}
|
|
162
165
|
|
|
163
166
|
module.exports = {
|
|
@@ -5,7 +5,7 @@ const { NameAndValue } = require('./hardcoded-rule-type')
|
|
|
5
5
|
module.exports = [
|
|
6
6
|
{
|
|
7
7
|
id: 'hardcoded-password',
|
|
8
|
-
regex: /(?:pwd|pswd|pass|secret)(?:[0-9a-z\-_\t.]{0,20})(?:[\s|']|[\s|"
|
|
8
|
+
regex: /(?:pwd|pswd|pass|secret)(?:[0-9a-z\-_\t.]{0,20})(?:[\s|']|[\s|"]){0,3}(?:=|>|:{1,3}=|\|\|:|<=|=>|:|\?=)(?:'|""|\s|=|\x60){0,5}([0-9a-z\-_.=]{10,150})(?:['"\s\x60;]|$)/i,
|
|
9
9
|
type: NameAndValue,
|
|
10
10
|
},
|
|
11
11
|
]
|