@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
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
const { URL } = require('url')
|
|
4
4
|
|
|
5
|
+
const log = require('../../log')
|
|
6
|
+
|
|
5
7
|
const HTTP2_HEADER_AUTHORITY = ':authority'
|
|
6
8
|
const HTTP2_HEADER_SCHEME = ':scheme'
|
|
7
9
|
const HTTP2_HEADER_PATH = ':path'
|
|
@@ -31,7 +33,8 @@ function extractURL (req) {
|
|
|
31
33
|
}
|
|
32
34
|
|
|
33
35
|
function getProtocol (req) {
|
|
34
|
-
|
|
36
|
+
// Do not check deprecated `req.connection` property.
|
|
37
|
+
return req.socket?.encrypted ? 'https' : 'http'
|
|
35
38
|
}
|
|
36
39
|
|
|
37
40
|
/**
|
|
@@ -59,6 +62,69 @@ function obfuscateQs (config, url) {
|
|
|
59
62
|
return `${path}?${qs}`
|
|
60
63
|
}
|
|
61
64
|
|
|
65
|
+
const qsObfuscatorCache = new Map()
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* Compile the configured query-string obfuscator (a regex string, or a boolean)
|
|
69
|
+
* into the boolean / RegExp form that `obfuscateQs` consumes. The compiled regex
|
|
70
|
+
* is cached, since the configuration is stable for the process lifetime.
|
|
71
|
+
*
|
|
72
|
+
* @param {{ queryStringObfuscation?: boolean | string }} config
|
|
73
|
+
* @returns {boolean | RegExp}
|
|
74
|
+
*/
|
|
75
|
+
function getQsObfuscator (config) {
|
|
76
|
+
const obfuscator = config.queryStringObfuscation
|
|
77
|
+
|
|
78
|
+
if (typeof obfuscator === 'boolean') return obfuscator
|
|
79
|
+
|
|
80
|
+
if (typeof obfuscator === 'string') {
|
|
81
|
+
const cached = qsObfuscatorCache.get(obfuscator)
|
|
82
|
+
if (cached !== undefined) return cached
|
|
83
|
+
|
|
84
|
+
let compiled = true
|
|
85
|
+
if (obfuscator === '') {
|
|
86
|
+
compiled = false // disable obfuscator
|
|
87
|
+
} else if (obfuscator !== '.*') { // '.*' optimizes to a full redact (true)
|
|
88
|
+
try {
|
|
89
|
+
compiled = new RegExp(obfuscator, 'gi')
|
|
90
|
+
} catch (err) {
|
|
91
|
+
log.error('Error getting qs obfuscator', err)
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
qsObfuscatorCache.set(obfuscator, compiled)
|
|
96
|
+
return compiled
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
if (Object.hasOwn(config, 'queryStringObfuscation')) {
|
|
100
|
+
log.error('Expected `queryStringObfuscation` to be a regex string or boolean.')
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
return true
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/**
|
|
107
|
+
* Build a client span's `http.url` with its query retained but obfuscated per
|
|
108
|
+
* `config.queryStringObfuscation` (OTel `url.full` is the absolute URL including
|
|
109
|
+
* the redacted query). Falls back to `strippedUrl` when there is no query.
|
|
110
|
+
* Callers gate this behind `DD_TRACE_OTEL_SEMANTICS_ENABLED`, so the default
|
|
111
|
+
* (flag off) hot path stays a plain tag assignment.
|
|
112
|
+
*
|
|
113
|
+
* @param {{ queryStringObfuscation?: boolean | string }} config
|
|
114
|
+
* @param {string} base `scheme://host[:port]`
|
|
115
|
+
* @param {string} [pathname] raw request path, may include `?query`
|
|
116
|
+
* @param {string} strippedUrl `base` + query-stripped path (used when there is no query)
|
|
117
|
+
* @returns {string}
|
|
118
|
+
*/
|
|
119
|
+
function buildClientHttpUrl (config, base, pathname, strippedUrl) {
|
|
120
|
+
if (pathname?.includes('?')) {
|
|
121
|
+
// `config.queryStringObfuscation` is the raw config value here (client plugins
|
|
122
|
+
// don't normalize it the way the server does), so compile it first.
|
|
123
|
+
return obfuscateQs({ queryStringObfuscation: getQsObfuscator(config) }, `${base}${pathname}`)
|
|
124
|
+
}
|
|
125
|
+
return strippedUrl
|
|
126
|
+
}
|
|
127
|
+
|
|
62
128
|
/**
|
|
63
129
|
* Extract URL path from URL using regex pattern instead of Node.js URL API because:
|
|
64
130
|
*
|
|
@@ -107,11 +173,9 @@ function calculateHttpEndpoint (url) {
|
|
|
107
173
|
return element
|
|
108
174
|
})
|
|
109
175
|
|
|
110
|
-
|
|
176
|
+
return normalizedElements.length > 0
|
|
111
177
|
? '/' + normalizedElements.join('/')
|
|
112
178
|
: '/'
|
|
113
|
-
|
|
114
|
-
return endpoint
|
|
115
179
|
}
|
|
116
180
|
|
|
117
181
|
function filterSensitiveInfoFromRepository (repositoryUrl) {
|
|
@@ -140,7 +204,9 @@ function filterSensitiveInfoFromRepository (repositoryUrl) {
|
|
|
140
204
|
module.exports = {
|
|
141
205
|
extractURL,
|
|
142
206
|
obfuscateQs,
|
|
207
|
+
getQsObfuscator,
|
|
208
|
+
buildClientHttpUrl,
|
|
143
209
|
calculateHttpEndpoint,
|
|
144
210
|
filterSensitiveInfoFromRepository,
|
|
145
|
-
extractPathFromUrl, //
|
|
211
|
+
extractPathFromUrl, // used by http-otel-semantics decomposeServerUrl fallback (and tests)
|
|
146
212
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict'
|
|
2
2
|
|
|
3
|
-
const
|
|
3
|
+
const getConfig = require('../../config')
|
|
4
4
|
const {
|
|
5
5
|
GIT_COMMIT_SHA,
|
|
6
6
|
GIT_BRANCH,
|
|
@@ -36,7 +36,7 @@ function removeEmptyValues (tagsAndValues) {
|
|
|
36
36
|
// https://github.com/jonschlinkert/is-git-url/blob/396965ffabf2f46656c8af4c47bef1d69f09292e/index.js#L9C15-L9C87
|
|
37
37
|
// The `.git` suffix is optional in this version
|
|
38
38
|
function validateGitRepositoryUrl (repoUrl) {
|
|
39
|
-
return /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\/?|#[-\
|
|
39
|
+
return /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\/?|#[-\w.]+?)$/.test(repoUrl)
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
function validateGitCommitSha (gitCommitSha) {
|
|
@@ -46,20 +46,22 @@ function validateGitCommitSha (gitCommitSha) {
|
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
function getUserProviderGitMetadata () {
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
49
|
+
const {
|
|
50
|
+
DD_GIT_COMMIT_SHA,
|
|
51
|
+
DD_GIT_BRANCH,
|
|
52
|
+
DD_GIT_REPOSITORY_URL,
|
|
53
|
+
DD_GIT_TAG,
|
|
54
|
+
DD_GIT_COMMIT_MESSAGE,
|
|
55
|
+
DD_GIT_COMMIT_COMMITTER_NAME,
|
|
56
|
+
DD_GIT_COMMIT_COMMITTER_EMAIL,
|
|
57
|
+
DD_GIT_COMMIT_COMMITTER_DATE,
|
|
58
|
+
DD_GIT_COMMIT_AUTHOR_NAME,
|
|
59
|
+
DD_GIT_COMMIT_AUTHOR_EMAIL,
|
|
60
|
+
DD_GIT_COMMIT_AUTHOR_DATE,
|
|
61
|
+
DD_GIT_PULL_REQUEST_BASE_BRANCH,
|
|
62
|
+
DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA,
|
|
63
|
+
DD_GIT_COMMIT_HEAD_SHA,
|
|
64
|
+
} = getConfig()
|
|
63
65
|
|
|
64
66
|
const branch = normalizeRef(DD_GIT_BRANCH)
|
|
65
67
|
let tag = normalizeRef(DD_GIT_TAG)
|
|
@@ -7,18 +7,18 @@ const log = require('../../log')
|
|
|
7
7
|
const tags = require('../../../../../ext/tags')
|
|
8
8
|
const types = require('../../../../../ext/types')
|
|
9
9
|
const kinds = require('../../../../../ext/kinds')
|
|
10
|
-
const { ERROR_MESSAGE
|
|
10
|
+
const { ERROR_MESSAGE } = require('../../constants')
|
|
11
11
|
const TracingPlugin = require('../tracing')
|
|
12
|
+
const { storage } = require('../../../../datadog-core')
|
|
13
|
+
const legacyStorage = storage('legacy')
|
|
12
14
|
const urlFilter = require('./urlfilter')
|
|
13
15
|
const { createInferredProxySpan, finishInferredProxySpan } = require('./inferred_proxy')
|
|
14
|
-
const { extractURL, obfuscateQs, calculateHttpEndpoint } = require('./url')
|
|
15
|
-
|
|
16
|
-
let extractIp
|
|
16
|
+
const { extractURL, obfuscateQs, getQsObfuscator, calculateHttpEndpoint } = require('./url')
|
|
17
|
+
const { NETWORK_PEER_ADDRESS } = require('./http-otel-semantics')
|
|
17
18
|
|
|
18
19
|
const WEB = types.WEB
|
|
19
20
|
const SERVER = kinds.SERVER
|
|
20
21
|
const RESOURCE_NAME = tags.RESOURCE_NAME
|
|
21
|
-
const SERVICE_NAME = tags.SERVICE_NAME
|
|
22
22
|
const SPAN_TYPE = tags.SPAN_TYPE
|
|
23
23
|
const SPAN_KIND = tags.SPAN_KIND
|
|
24
24
|
const ERROR = tags.ERROR
|
|
@@ -34,7 +34,6 @@ const HTTP_CLIENT_IP = tags.HTTP_CLIENT_IP
|
|
|
34
34
|
const MANUAL_DROP = tags.MANUAL_DROP
|
|
35
35
|
|
|
36
36
|
const contexts = new WeakMap()
|
|
37
|
-
const ends = new WeakMap()
|
|
38
37
|
|
|
39
38
|
// TODO: change this to no longer rely on creating a dummy plugin to be able to access startSpan
|
|
40
39
|
function createWebPlugin (tracer, config = {}) {
|
|
@@ -66,7 +65,9 @@ const web = {
|
|
|
66
65
|
const middleware = getMiddlewareSetting(config)
|
|
67
66
|
const queryStringObfuscation = getQsObfuscator(config)
|
|
68
67
|
|
|
69
|
-
extractIp = config.clientIpEnabled
|
|
68
|
+
const extractIp = config.clientIpEnabled
|
|
69
|
+
? require('./ip_extractor').extractIp
|
|
70
|
+
: undefined
|
|
70
71
|
|
|
71
72
|
return {
|
|
72
73
|
...config,
|
|
@@ -76,6 +77,7 @@ const web = {
|
|
|
76
77
|
filter,
|
|
77
78
|
middleware,
|
|
78
79
|
queryStringObfuscation,
|
|
80
|
+
extractIp,
|
|
79
81
|
}
|
|
80
82
|
},
|
|
81
83
|
|
|
@@ -86,7 +88,7 @@ const web = {
|
|
|
86
88
|
if (!span) return
|
|
87
89
|
|
|
88
90
|
span.context()._name = `${name}.request`
|
|
89
|
-
span.context().
|
|
91
|
+
span.context().setTag('component', name)
|
|
90
92
|
span._integrationName = name
|
|
91
93
|
|
|
92
94
|
web.setConfig(req, config)
|
|
@@ -104,7 +106,7 @@ const web = {
|
|
|
104
106
|
}
|
|
105
107
|
|
|
106
108
|
if (config.service) {
|
|
107
|
-
|
|
109
|
+
web.plugin.setServiceName(span, config.service)
|
|
108
110
|
}
|
|
109
111
|
|
|
110
112
|
analyticsSampler.sample(span, config.measured, true)
|
|
@@ -131,27 +133,6 @@ const web = {
|
|
|
131
133
|
|
|
132
134
|
return span
|
|
133
135
|
},
|
|
134
|
-
wrap (req) {
|
|
135
|
-
const context = contexts.get(req)
|
|
136
|
-
if (!context.instrumented) {
|
|
137
|
-
this.wrapEnd(context)
|
|
138
|
-
context.instrumented = true
|
|
139
|
-
}
|
|
140
|
-
},
|
|
141
|
-
// Start a span and activate a scope for a request.
|
|
142
|
-
instrument (tracer, config, req, res, name, callback) {
|
|
143
|
-
const span = this.startSpan(tracer, config, req, res, name)
|
|
144
|
-
|
|
145
|
-
this.wrap(req)
|
|
146
|
-
|
|
147
|
-
return callback && tracer.scope().activate(span, () => callback(span))
|
|
148
|
-
},
|
|
149
|
-
|
|
150
|
-
// Reactivate the request scope in case it was changed by a middleware.
|
|
151
|
-
reactivate (req, fn) {
|
|
152
|
-
return reactivate(req, fn)
|
|
153
|
-
},
|
|
154
|
-
|
|
155
136
|
// Add a route segment that will be used for the resource name.
|
|
156
137
|
enterRoute (req, path) {
|
|
157
138
|
if (typeof path === 'string') {
|
|
@@ -172,61 +153,6 @@ const web = {
|
|
|
172
153
|
contexts.get(req).paths.pop()
|
|
173
154
|
},
|
|
174
155
|
|
|
175
|
-
// Start a new middleware span and activate a new scope with the span.
|
|
176
|
-
wrapMiddleware (req, middleware, name, fn) {
|
|
177
|
-
if (!this.active(req)) return fn()
|
|
178
|
-
|
|
179
|
-
const context = contexts.get(req)
|
|
180
|
-
const tracer = context.tracer
|
|
181
|
-
const childOf = this.active(req)
|
|
182
|
-
const config = context.config
|
|
183
|
-
const traceCtx = context.traceCtx
|
|
184
|
-
|
|
185
|
-
if (config.middleware === false) return this.bindAndWrapMiddlewareErrors(fn, req, tracer, childOf)
|
|
186
|
-
|
|
187
|
-
const span = startSpanHelper(tracer, name, { childOf }, traceCtx, config)
|
|
188
|
-
|
|
189
|
-
analyticsSampler.sample(span, config.measured)
|
|
190
|
-
|
|
191
|
-
span.addTags({
|
|
192
|
-
[RESOURCE_NAME]: middleware._name || middleware.name || '<anonymous>',
|
|
193
|
-
})
|
|
194
|
-
|
|
195
|
-
context.middleware.push(span)
|
|
196
|
-
|
|
197
|
-
return tracer.scope().activate(span, fn)
|
|
198
|
-
},
|
|
199
|
-
|
|
200
|
-
// catch errors and apply to active span
|
|
201
|
-
bindAndWrapMiddlewareErrors (fn, req, tracer, activeSpan) {
|
|
202
|
-
try {
|
|
203
|
-
return tracer.scope().bind(fn, activeSpan).apply(this, arguments)
|
|
204
|
-
} catch (e) {
|
|
205
|
-
web.addError(req, e) // TODO: remove when error formatting is moved to Span
|
|
206
|
-
throw e
|
|
207
|
-
}
|
|
208
|
-
},
|
|
209
|
-
|
|
210
|
-
// Finish the active middleware span.
|
|
211
|
-
finish (req, error) {
|
|
212
|
-
if (!this.active(req)) return
|
|
213
|
-
|
|
214
|
-
const context = contexts.get(req)
|
|
215
|
-
const span = context.middleware.pop()
|
|
216
|
-
|
|
217
|
-
if (span) {
|
|
218
|
-
if (error) {
|
|
219
|
-
span.addTags({
|
|
220
|
-
[ERROR_TYPE]: error.name,
|
|
221
|
-
[ERROR_MESSAGE]: error.message,
|
|
222
|
-
[ERROR_STACK]: error.stack,
|
|
223
|
-
})
|
|
224
|
-
}
|
|
225
|
-
|
|
226
|
-
span.finish()
|
|
227
|
-
}
|
|
228
|
-
},
|
|
229
|
-
|
|
230
156
|
// Register a callback to run before res.end() is called.
|
|
231
157
|
beforeEnd (req, callback) {
|
|
232
158
|
contexts.get(req).beforeEnd.push(callback)
|
|
@@ -259,6 +185,18 @@ const web = {
|
|
|
259
185
|
return context
|
|
260
186
|
},
|
|
261
187
|
|
|
188
|
+
// Key an existing context on the underlying `Http2Stream` so a second request
|
|
189
|
+
// backed by the same stream resolves to it via the `req.stream` lookup in
|
|
190
|
+
// `patch`. Only a mixed HTTP/2 server (raw-stream + 'request' listeners) needs
|
|
191
|
+
// this: it creates the span from a throwaway stream adapter, then the
|
|
192
|
+
// compatibility layer synthesizes the real `Http2ServerRequest` off the same
|
|
193
|
+
// stream and must reuse the adapter's span rather than open an orphan context.
|
|
194
|
+
// Confined to that path so the common single-listener request pays no extra
|
|
195
|
+
// per-request map write.
|
|
196
|
+
linkContextToStream (stream, context) {
|
|
197
|
+
contexts.set(stream, context)
|
|
198
|
+
},
|
|
199
|
+
|
|
262
200
|
// Return the request root span.
|
|
263
201
|
root (req) {
|
|
264
202
|
const context = contexts.get(req)
|
|
@@ -278,8 +216,7 @@ const web = {
|
|
|
278
216
|
startServerlessSpanWithInferredProxy (tracer, config, name, req, traceCtx) {
|
|
279
217
|
const headers = req.headers
|
|
280
218
|
const reqCtx = contexts.get(req)
|
|
281
|
-
const
|
|
282
|
-
const store = storage('legacy').getStore()
|
|
219
|
+
const store = legacyStorage.getStore()
|
|
283
220
|
const pubsubSpan = store?.span?._name === 'pubsub.push.receive' ? store.span : null
|
|
284
221
|
|
|
285
222
|
let childOf = pubsubSpan || tracer.extract(FORMAT_HTTP_HEADERS, headers)
|
|
@@ -292,9 +229,7 @@ const web = {
|
|
|
292
229
|
}
|
|
293
230
|
}
|
|
294
231
|
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
return span
|
|
232
|
+
return startSpanHelper(tracer, name, { childOf }, traceCtx, config)
|
|
298
233
|
},
|
|
299
234
|
|
|
300
235
|
// Validate a request's status code and then add error tags if necessary
|
|
@@ -302,9 +237,11 @@ const web = {
|
|
|
302
237
|
const context = contexts.get(req)
|
|
303
238
|
const { span, inferredProxySpan, error } = context
|
|
304
239
|
|
|
305
|
-
const
|
|
240
|
+
const spanContext = span.context()
|
|
241
|
+
const spanHasExistingError = spanContext.getTag('error') || spanContext.getTag(ERROR_MESSAGE)
|
|
306
242
|
const inferredSpanContext = inferredProxySpan?.context()
|
|
307
|
-
const inferredSpanHasExistingError = inferredSpanContext?.
|
|
243
|
+
const inferredSpanHasExistingError = inferredSpanContext?.getTag('error') ||
|
|
244
|
+
inferredSpanContext?.getTag(ERROR_MESSAGE)
|
|
308
245
|
|
|
309
246
|
const isValidStatusCode = context.config.validateStatus(statusCode)
|
|
310
247
|
|
|
@@ -343,7 +280,16 @@ const web = {
|
|
|
343
280
|
|
|
344
281
|
if (context.finished && !req.stream) return
|
|
345
282
|
|
|
283
|
+
// `addRequestTags` is idempotent: in the normal HTTP path it ran during
|
|
284
|
+
// `web.startSpan`. Serverless callers (e.g. Azure Functions) skip
|
|
285
|
+
// `web.startSpan` and rely on this call to do the request-side work.
|
|
346
286
|
addRequestTags(context, spanType)
|
|
287
|
+
// Configured-header tagging runs at finish time. Framework plugins
|
|
288
|
+
// (connect, express, ...) install their own config via `setFramework`
|
|
289
|
+
// after `web.startSpan` has already locked the http-plugin config in;
|
|
290
|
+
// tagging earlier would use the http-plugin's `headers` list and drop
|
|
291
|
+
// the framework's.
|
|
292
|
+
addRequestHeaders(context)
|
|
347
293
|
addResponseTags(context)
|
|
348
294
|
|
|
349
295
|
context.config.hooks.request(context.span, req, res)
|
|
@@ -370,11 +316,18 @@ const web = {
|
|
|
370
316
|
const writeHead = res.writeHead
|
|
371
317
|
|
|
372
318
|
return function (statusCode, statusMessage, headers) {
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
319
|
+
// CORS preflight tagging only matters for OPTIONS requests. Skip the
|
|
320
|
+
// getHeaders() spread + isOriginAllowed work entirely for the common
|
|
321
|
+
// GET / POST / etc. case. Node's http module passes `req.method`
|
|
322
|
+
// through unchanged, so all standard methods are uppercase; the
|
|
323
|
+
// `toLowerCase` fallback covers any non-standard caller.
|
|
324
|
+
if (req.method === 'OPTIONS' || req.method.toLowerCase() === 'options') {
|
|
325
|
+
headers = typeof statusMessage === 'string' ? headers : statusMessage
|
|
326
|
+
headers = { ...res.getHeaders(), ...headers }
|
|
327
|
+
|
|
328
|
+
if (isOriginAllowed(req, headers)) {
|
|
329
|
+
addAllowHeaders(req, res, headers)
|
|
330
|
+
}
|
|
378
331
|
}
|
|
379
332
|
|
|
380
333
|
return writeHead.apply(this, arguments)
|
|
@@ -383,33 +336,6 @@ const web = {
|
|
|
383
336
|
getContext (req) {
|
|
384
337
|
return contexts.get(req)
|
|
385
338
|
},
|
|
386
|
-
wrapRes (context, req, res, end) {
|
|
387
|
-
return function () {
|
|
388
|
-
web.finishAll(context)
|
|
389
|
-
|
|
390
|
-
return end.apply(res, arguments)
|
|
391
|
-
}
|
|
392
|
-
},
|
|
393
|
-
wrapEnd (context) {
|
|
394
|
-
const scope = context.tracer.scope()
|
|
395
|
-
const req = context.req
|
|
396
|
-
const res = context.res
|
|
397
|
-
const end = res.end
|
|
398
|
-
|
|
399
|
-
res.writeHead = web.wrapWriteHead(context)
|
|
400
|
-
|
|
401
|
-
ends.set(res, this.wrapRes(context, req, res, end))
|
|
402
|
-
|
|
403
|
-
Object.defineProperty(res, 'end', {
|
|
404
|
-
configurable: true,
|
|
405
|
-
get () {
|
|
406
|
-
return ends.get(this)
|
|
407
|
-
},
|
|
408
|
-
set (value) {
|
|
409
|
-
ends.set(this, scope.bind(value, context.span))
|
|
410
|
-
},
|
|
411
|
-
})
|
|
412
|
-
},
|
|
413
339
|
setRouteOrEndpointTag (req) {
|
|
414
340
|
const context = contexts.get(req)
|
|
415
341
|
|
|
@@ -453,16 +379,18 @@ function splitHeader (str) {
|
|
|
453
379
|
return typeof str === 'string' ? str.split(/\s*,\s*/) : []
|
|
454
380
|
}
|
|
455
381
|
|
|
456
|
-
function reactivate (req, fn) {
|
|
457
|
-
const context = contexts.get(req)
|
|
458
|
-
|
|
459
|
-
return context
|
|
460
|
-
? context.tracer.scope().activate(context.span, fn)
|
|
461
|
-
: fn()
|
|
462
|
-
}
|
|
463
|
-
|
|
464
382
|
function addRequestTags (context, spanType) {
|
|
465
383
|
const { req, span, inferredProxySpan, config } = context
|
|
384
|
+
const spanContext = span.context()
|
|
385
|
+
|
|
386
|
+
// Idempotency guard. `addRequestTags` runs in `web.startSpan` for the
|
|
387
|
+
// normal HTTP path and again in `web.finishSpan`; without this guard the
|
|
388
|
+
// second call would re-extract the URL, re-obfuscate the query string,
|
|
389
|
+
// and re-publish five `tagsUpdateCh` events with the same values. The
|
|
390
|
+
// serverless path skips `startSpan` and lands here first, in which case
|
|
391
|
+
// HTTP_URL is unset and the work runs normally.
|
|
392
|
+
if (spanContext.hasTag(HTTP_URL)) return
|
|
393
|
+
|
|
466
394
|
const url = extractURL(req)
|
|
467
395
|
const type = spanType ?? WEB
|
|
468
396
|
|
|
@@ -474,9 +402,18 @@ function addRequestTags (context, spanType) {
|
|
|
474
402
|
[HTTP_USERAGENT]: req.headers['user-agent'],
|
|
475
403
|
})
|
|
476
404
|
|
|
405
|
+
// OTel `network.peer.address` is the immediate socket peer. It has no Datadog
|
|
406
|
+
// equivalent and the socket isn't available at serialization, so (unlike the
|
|
407
|
+
// other HTTP attributes, which are renamed centrally in span_format) it is set
|
|
408
|
+
// here directly when OTel semantics are enabled.
|
|
409
|
+
if (config.DD_TRACE_OTEL_SEMANTICS_ENABLED) {
|
|
410
|
+
const peerAddress = req.socket?.remoteAddress
|
|
411
|
+
if (peerAddress) span.setTag(NETWORK_PEER_ADDRESS, peerAddress)
|
|
412
|
+
}
|
|
413
|
+
|
|
477
414
|
// if client ip has already been set by appsec, no need to run it again
|
|
478
|
-
if (extractIp && !
|
|
479
|
-
const clientIp = extractIp(config, req)
|
|
415
|
+
if (config.extractIp && !spanContext.hasTag(HTTP_CLIENT_IP)) {
|
|
416
|
+
const clientIp = config.extractIp(config, req)
|
|
480
417
|
|
|
481
418
|
if (clientIp) {
|
|
482
419
|
span.setTag(HTTP_CLIENT_IP, clientIp)
|
|
@@ -484,7 +421,16 @@ function addRequestTags (context, spanType) {
|
|
|
484
421
|
}
|
|
485
422
|
}
|
|
486
423
|
|
|
487
|
-
|
|
424
|
+
// Datadog scan/test markers, tagged unconditionally so the API endpoint
|
|
425
|
+
// reducer can keep scan/test traffic out of the API inventory.
|
|
426
|
+
const endpointScan = req.headers['x-datadog-endpoint-scan']
|
|
427
|
+
if (endpointScan !== undefined) {
|
|
428
|
+
span.setTag(`${HTTP_REQUEST_HEADERS}.x-datadog-endpoint-scan`, endpointScan)
|
|
429
|
+
}
|
|
430
|
+
const securityTest = req.headers['x-datadog-security-test']
|
|
431
|
+
if (securityTest !== undefined) {
|
|
432
|
+
span.setTag(`${HTTP_REQUEST_HEADERS}.x-datadog-security-test`, securityTest)
|
|
433
|
+
}
|
|
488
434
|
}
|
|
489
435
|
|
|
490
436
|
function addResponseTags (context) {
|
|
@@ -499,59 +445,75 @@ function addResponseTags (context) {
|
|
|
499
445
|
[HTTP_STATUS_CODE]: res.statusCode,
|
|
500
446
|
})
|
|
501
447
|
|
|
448
|
+
addResponseHeaders(context)
|
|
449
|
+
|
|
502
450
|
web.addStatusError(req, res.statusCode)
|
|
503
451
|
}
|
|
504
452
|
|
|
505
453
|
function applyRouteOrEndpointTag (context) {
|
|
506
454
|
const { paths, span, config } = context
|
|
507
455
|
if (!span) return
|
|
508
|
-
const
|
|
509
|
-
|
|
456
|
+
const spanContext = span.context()
|
|
457
|
+
|
|
458
|
+
// AppSec runs this from a pre-finish hook and the finish path runs it
|
|
459
|
+
// again. http.route is terminal once set; nothing supersedes it.
|
|
460
|
+
if (spanContext.hasTag(HTTP_ROUTE)) return
|
|
461
|
+
|
|
462
|
+
// Skip the `Array.prototype.join` builtin in the empty / single-segment
|
|
463
|
+
// cases; `paths[0]` covers both (`undefined` is falsy for the empty case).
|
|
464
|
+
const route = paths.length > 1 ? paths.join('') : paths[0]
|
|
510
465
|
|
|
511
466
|
if (route) {
|
|
512
|
-
//
|
|
467
|
+
// A framework route supersedes any http.endpoint fallback a pre-finish
|
|
468
|
+
// call stamped before the route resolved; it must not be gated on
|
|
469
|
+
// HTTP_ENDPOINT.
|
|
513
470
|
span.setTag(HTTP_ROUTE, route)
|
|
514
471
|
return
|
|
515
472
|
}
|
|
516
473
|
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
}
|
|
474
|
+
// Route unavailable. Compute the http.endpoint fallback once across both calls.
|
|
475
|
+
if (!config.resourceRenamingEnabled || spanContext.hasTag(HTTP_ENDPOINT)) return
|
|
520
476
|
|
|
521
|
-
|
|
522
|
-
const url = tags[HTTP_URL]
|
|
477
|
+
const url = spanContext.getTag(HTTP_URL)
|
|
523
478
|
const endpoint = url ? calculateHttpEndpoint(url) : '/'
|
|
524
479
|
span.setTag(HTTP_ENDPOINT, endpoint)
|
|
525
480
|
}
|
|
526
481
|
|
|
527
482
|
function addResourceTag (context) {
|
|
528
483
|
const { req, span } = context
|
|
529
|
-
const
|
|
484
|
+
const spanContext = span.context()
|
|
530
485
|
|
|
531
|
-
if (
|
|
486
|
+
if (spanContext.getTag(RESOURCE_NAME)) return
|
|
532
487
|
|
|
533
|
-
const resource = [req.method,
|
|
488
|
+
const resource = [req.method, spanContext.getTag(HTTP_ROUTE)]
|
|
534
489
|
.filter(Boolean)
|
|
535
490
|
.join(' ')
|
|
536
491
|
|
|
537
492
|
span.setTag(RESOURCE_NAME, resource)
|
|
538
493
|
}
|
|
539
494
|
|
|
540
|
-
function
|
|
541
|
-
const { req,
|
|
495
|
+
function addRequestHeaders (context) {
|
|
496
|
+
const { req, config, span, inferredProxySpan } = context
|
|
542
497
|
|
|
543
498
|
for (const [key, tag] of config.headers) {
|
|
544
499
|
const reqHeader = req.headers[key]
|
|
545
|
-
const resHeader = res.getHeader(key)
|
|
546
|
-
|
|
547
500
|
if (reqHeader) {
|
|
548
|
-
|
|
549
|
-
|
|
501
|
+
const tagName = tag || `${HTTP_REQUEST_HEADERS}.${key}`
|
|
502
|
+
span.setTag(tagName, reqHeader)
|
|
503
|
+
inferredProxySpan?.setTag(tagName, reqHeader)
|
|
550
504
|
}
|
|
505
|
+
}
|
|
506
|
+
}
|
|
507
|
+
|
|
508
|
+
function addResponseHeaders (context) {
|
|
509
|
+
const { res, config, span, inferredProxySpan } = context
|
|
551
510
|
|
|
511
|
+
for (const [key, tag] of config.headers) {
|
|
512
|
+
const resHeader = res.getHeader(key)
|
|
552
513
|
if (resHeader) {
|
|
553
|
-
|
|
554
|
-
|
|
514
|
+
const tagName = tag || `${HTTP_RESPONSE_HEADERS}.${key}`
|
|
515
|
+
span.setTag(tagName, resHeader)
|
|
516
|
+
inferredProxySpan?.setTag(tagName, resHeader)
|
|
555
517
|
}
|
|
556
518
|
}
|
|
557
519
|
}
|
|
@@ -602,30 +564,4 @@ function getMiddlewareSetting (config) {
|
|
|
602
564
|
return true
|
|
603
565
|
}
|
|
604
566
|
|
|
605
|
-
function getQsObfuscator (config) {
|
|
606
|
-
const obfuscator = config.queryStringObfuscation
|
|
607
|
-
|
|
608
|
-
if (typeof obfuscator === 'boolean') {
|
|
609
|
-
return obfuscator
|
|
610
|
-
}
|
|
611
|
-
|
|
612
|
-
if (typeof obfuscator === 'string') {
|
|
613
|
-
if (obfuscator === '') return false // disable obfuscator
|
|
614
|
-
|
|
615
|
-
if (obfuscator === '.*') return true // optimize full redact
|
|
616
|
-
|
|
617
|
-
try {
|
|
618
|
-
return new RegExp(obfuscator, 'gi')
|
|
619
|
-
} catch (err) {
|
|
620
|
-
log.error('Web plugin error getting qs obfuscator', err)
|
|
621
|
-
}
|
|
622
|
-
}
|
|
623
|
-
|
|
624
|
-
if (config.hasOwnProperty('queryStringObfuscation')) {
|
|
625
|
-
log.error('Expected `queryStringObfuscation` to be a regex string or boolean.')
|
|
626
|
-
}
|
|
627
|
-
|
|
628
|
-
return true
|
|
629
|
-
}
|
|
630
|
-
|
|
631
567
|
module.exports = web
|