@depup/dd-trace 5.97.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 +315 -244
- package/index.electron.js +3 -0
- package/initialize.mjs +9 -8
- package/loader-hook.mjs +154 -47
- package/package.json +118 -78
- package/packages/datadog-core/src/storage.js +47 -48
- package/packages/datadog-esbuild/index.js +32 -1
- package/packages/datadog-esbuild/src/utils.js +46 -3
- package/packages/datadog-instrumentations/src/aerospike.js +3 -3
- package/packages/datadog-instrumentations/src/ai.js +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 +15 -15
- package/packages/datadog-instrumentations/src/claude-agent-sdk.js +587 -0
- package/packages/datadog-instrumentations/src/confluentinc-kafka-javascript.js +41 -24
- package/packages/datadog-instrumentations/src/connect.js +14 -12
- package/packages/datadog-instrumentations/src/cookie-parser.js +5 -4
- package/packages/datadog-instrumentations/src/cookie.js +9 -3
- package/packages/datadog-instrumentations/src/couchbase.js +73 -238
- package/packages/datadog-instrumentations/src/crypto.js +49 -4
- package/packages/datadog-instrumentations/src/cucumber-worker-threads.js +19 -0
- package/packages/datadog-instrumentations/src/cucumber.js +747 -187
- package/packages/datadog-instrumentations/src/cypress-config.js +164 -56
- package/packages/datadog-instrumentations/src/cypress.js +5 -3
- package/packages/datadog-instrumentations/src/dns.js +60 -59
- package/packages/datadog-instrumentations/src/elasticsearch.js +9 -12
- package/packages/datadog-instrumentations/src/electron/preload.js +42 -0
- package/packages/datadog-instrumentations/src/electron.js +240 -0
- package/packages/datadog-instrumentations/src/express-mongo-sanitize.js +11 -9
- package/packages/datadog-instrumentations/src/express-session.js +14 -13
- package/packages/datadog-instrumentations/src/express.js +52 -30
- package/packages/datadog-instrumentations/src/fastify.js +169 -86
- package/packages/datadog-instrumentations/src/fetch.js +5 -5
- package/packages/datadog-instrumentations/src/fs.js +22 -20
- package/packages/datadog-instrumentations/src/google-cloud-pubsub.js +5 -7
- package/packages/datadog-instrumentations/src/google-genai.js +4 -4
- package/packages/datadog-instrumentations/src/graphql.js +26 -362
- package/packages/datadog-instrumentations/src/grpc/client.js +48 -32
- package/packages/datadog-instrumentations/src/grpc/server.js +20 -2
- package/packages/datadog-instrumentations/src/hapi.js +2 -2
- package/packages/datadog-instrumentations/src/helpers/callback-instrumentor.js +74 -0
- package/packages/datadog-instrumentations/src/helpers/check-require-cache.js +85 -9
- package/packages/datadog-instrumentations/src/helpers/hook.js +4 -1
- package/packages/datadog-instrumentations/src/helpers/hooks.js +12 -0
- package/packages/datadog-instrumentations/src/helpers/instrument.js +36 -3
- package/packages/datadog-instrumentations/src/helpers/kafka.js +58 -0
- package/packages/datadog-instrumentations/src/helpers/optional-peer-bundler.js +65 -0
- package/packages/datadog-instrumentations/src/helpers/promise-instrumentor.js +42 -0
- package/packages/datadog-instrumentations/src/helpers/promise.js +2 -2
- package/packages/datadog-instrumentations/src/helpers/register.js +7 -5
- package/packages/datadog-instrumentations/src/helpers/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 +48 -24
- package/packages/datadog-instrumentations/src/http/server.js +75 -29
- package/packages/datadog-instrumentations/src/http2/client.js +15 -12
- package/packages/datadog-instrumentations/src/http2/server.js +156 -23
- package/packages/datadog-instrumentations/src/ioredis.js +17 -14
- package/packages/datadog-instrumentations/src/iovalkey.js +1 -2
- package/packages/datadog-instrumentations/src/jest/bail-reporter.js +42 -0
- package/packages/datadog-instrumentations/src/jest/coverage-backfill.js +163 -0
- package/packages/datadog-instrumentations/src/jest.js +1783 -401
- package/packages/datadog-instrumentations/src/kafkajs.js +284 -170
- package/packages/datadog-instrumentations/src/knex.js +17 -17
- package/packages/datadog-instrumentations/src/koa.js +15 -14
- package/packages/datadog-instrumentations/src/ldapjs.js +5 -5
- package/packages/datadog-instrumentations/src/light-my-request.js +2 -2
- package/packages/datadog-instrumentations/src/limitd-client.js +4 -4
- package/packages/datadog-instrumentations/src/lodash.js +4 -4
- package/packages/datadog-instrumentations/src/mariadb.js +18 -16
- package/packages/datadog-instrumentations/src/memcached.js +4 -3
- package/packages/datadog-instrumentations/src/mercurius.js +11 -0
- package/packages/datadog-instrumentations/src/microgateway-core.js +2 -2
- package/packages/datadog-instrumentations/src/mocha/common.js +7 -4
- package/packages/datadog-instrumentations/src/mocha/main.js +557 -118
- package/packages/datadog-instrumentations/src/mocha/utils.js +531 -131
- 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 +19 -11
- 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 +25 -41
- package/packages/datadog-instrumentations/src/playwright-browser-scripts.js +27 -0
- package/packages/datadog-instrumentations/src/playwright.js +1086 -350
- 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 +1 -2
- package/packages/datadog-instrumentations/src/stripe.js +47 -33
- package/packages/datadog-instrumentations/src/tedious.js +28 -0
- package/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js +1297 -0
- package/packages/datadog-instrumentations/src/vitest-main.js +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 -1262
- 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 +86 -50
- package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/tracing.js +1 -1
- package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/utils.js +218 -4
- package/packages/datadog-plugin-aws-sdk/src/services/cloudwatchlogs.js +1 -1
- package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js +2 -1
- package/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js +59 -14
- package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js +174 -75
- package/packages/datadog-plugin-aws-sdk/src/services/lambda.js +34 -23
- package/packages/datadog-plugin-aws-sdk/src/services/redshift.js +2 -1
- package/packages/datadog-plugin-aws-sdk/src/services/s3.js +1 -1
- package/packages/datadog-plugin-aws-sdk/src/services/sns.js +26 -26
- package/packages/datadog-plugin-aws-sdk/src/services/sqs.js +187 -101
- package/packages/datadog-plugin-aws-sdk/src/services/stepfunctions.js +20 -18
- package/packages/datadog-plugin-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 -28
- package/packages/datadog-plugin-cypress/src/cypress-plugin.js +961 -92
- 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 +133 -67
- package/packages/datadog-plugin-jest/src/util.js +37 -16
- package/packages/datadog-plugin-kafkajs/src/batch-consumer.js +1 -1
- package/packages/datadog-plugin-kafkajs/src/consumer.js +2 -9
- package/packages/datadog-plugin-kafkajs/src/producer.js +37 -8
- package/packages/datadog-plugin-langgraph/src/stream.js +1 -1
- package/packages/datadog-plugin-memcached/src/index.js +1 -1
- package/packages/datadog-plugin-mocha/src/index.js +66 -20
- package/packages/datadog-plugin-modelcontextprotocol-sdk/src/index.js +24 -0
- package/packages/datadog-plugin-modelcontextprotocol-sdk/src/tracing.js +173 -0
- package/packages/datadog-plugin-modelcontextprotocol-sdk/src/utils.js +30 -0
- package/packages/datadog-plugin-mongodb-core/src/bulk-write.js +43 -0
- package/packages/datadog-plugin-mongodb-core/src/index.js +8 -206
- package/packages/datadog-plugin-mongodb-core/src/query.js +452 -0
- package/packages/datadog-plugin-mysql/src/index.js +9 -4
- package/packages/datadog-plugin-nats/src/consumer.js +43 -0
- package/packages/datadog-plugin-nats/src/index.js +20 -0
- package/packages/datadog-plugin-nats/src/producer.js +62 -0
- package/packages/datadog-plugin-nats/src/util.js +33 -0
- package/packages/datadog-plugin-next/src/index.js +12 -4
- package/packages/datadog-plugin-openai/src/services.js +4 -3
- package/packages/datadog-plugin-openai/src/tracing.js +27 -25
- package/packages/datadog-plugin-oracledb/src/index.js +13 -2
- package/packages/datadog-plugin-pg/src/index.js +13 -3
- package/packages/datadog-plugin-pino/src/index.js +42 -0
- package/packages/datadog-plugin-playwright/src/index.js +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 +17 -1
- package/packages/datadog-webpack/src/optional-peer-loader.js +17 -0
- package/packages/dd-trace/index.electron.js +3 -0
- package/packages/dd-trace/index.js +2 -36
- package/packages/dd-trace/src/aiguard/channels.js +7 -0
- package/packages/dd-trace/src/aiguard/index.js +16 -34
- package/packages/dd-trace/src/aiguard/integrations/evaluate.js +46 -0
- package/packages/dd-trace/src/aiguard/integrations/index.js +34 -0
- package/packages/dd-trace/src/aiguard/integrations/openai.js +80 -0
- package/packages/dd-trace/src/aiguard/integrations/vercel-ai.js +92 -0
- package/packages/dd-trace/src/aiguard/messages/openai.js +382 -0
- package/packages/{datadog-instrumentations/src/helpers/ai-messages.js → dd-trace/src/aiguard/messages/vercel-ai.js} +30 -27
- package/packages/dd-trace/src/aiguard/sdk.js +147 -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 +82 -42
- package/packages/dd-trace/src/appsec/channels.js +5 -1
- package/packages/dd-trace/src/appsec/downstream_requests.js +116 -62
- package/packages/dd-trace/src/appsec/graphql.js +20 -17
- package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-rules.js +1 -1
- package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-secret-rules.js +81 -81
- package/packages/dd-trace/src/appsec/iast/analyzers/nosql-injection-mongodb-analyzer.js +23 -23
- package/packages/dd-trace/src/appsec/iast/index.js +3 -2
- package/packages/dd-trace/src/appsec/iast/security-controls/index.js +4 -4
- package/packages/dd-trace/src/appsec/iast/taint-tracking/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 +31 -4
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/index.js +1 -3
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js +83 -48
- package/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js +1 -1
- package/packages/dd-trace/src/appsec/index.js +65 -47
- package/packages/dd-trace/src/appsec/lambda.js +135 -0
- package/packages/dd-trace/src/appsec/rasp/command_injection.js +4 -5
- package/packages/dd-trace/src/appsec/rasp/lfi.js +8 -4
- package/packages/dd-trace/src/appsec/rasp/sql_injection.js +5 -10
- package/packages/dd-trace/src/appsec/rasp/ssrf.js +26 -18
- package/packages/dd-trace/src/appsec/recommended.json +2438 -13
- package/packages/dd-trace/src/appsec/reporter.js +87 -28
- package/packages/dd-trace/src/appsec/rule_manager.js +4 -2
- package/packages/dd-trace/src/appsec/sdk/set_user.js +1 -1
- package/packages/dd-trace/src/appsec/sdk/track_event.js +5 -5
- package/packages/dd-trace/src/appsec/sdk/user_blocking.js +7 -11
- package/packages/dd-trace/src/appsec/sdk/utils.js +5 -3
- package/packages/dd-trace/src/appsec/store.js +50 -0
- package/packages/dd-trace/src/appsec/telemetry/api_security.js +34 -0
- package/packages/dd-trace/src/appsec/telemetry/index.js +27 -1
- package/packages/dd-trace/src/appsec/user_tracking.js +5 -4
- package/packages/dd-trace/src/appsec/waf/index.js +19 -9
- package/packages/dd-trace/src/appsec/waf/waf_context_wrapper.js +35 -20
- package/packages/dd-trace/src/appsec/waf/waf_manager.js +1 -1
- package/packages/dd-trace/src/azure_metadata.js +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 +30 -5
- 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 +5 -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 +71 -44
- package/packages/dd-trace/src/config/generated-config-types.d.ts +676 -131
- package/packages/dd-trace/src/config/git_properties.js +2 -2
- package/packages/dd-trace/src/config/helper.js +139 -33
- package/packages/dd-trace/src/config/index.js +117 -131
- package/packages/dd-trace/src/config/major-overrides.js +100 -0
- package/packages/dd-trace/src/config/normalize-service.js +31 -0
- package/packages/dd-trace/src/config/parsers.js +138 -10
- package/packages/dd-trace/src/config/remote_config.js +1 -1
- package/packages/dd-trace/src/config/supported-configurations.json +394 -203
- package/packages/dd-trace/src/constants.js +15 -0
- package/packages/dd-trace/src/crashtracking/crashtracker.js +18 -6
- package/packages/dd-trace/src/datastreams/checkpointer.js +6 -12
- package/packages/dd-trace/src/datastreams/context.js +4 -2
- package/packages/dd-trace/src/datastreams/encoding.js +39 -28
- package/packages/dd-trace/src/datastreams/index.js +2 -1
- package/packages/dd-trace/src/datastreams/manager.js +1 -1
- package/packages/dd-trace/src/datastreams/pathway.js +35 -30
- package/packages/dd-trace/src/datastreams/processor.js +31 -22
- package/packages/dd-trace/src/datastreams/size.js +6 -2
- package/packages/dd-trace/src/datastreams/writer.js +15 -6
- package/packages/dd-trace/src/debugger/config.js +9 -4
- package/packages/dd-trace/src/debugger/devtools_client/breakpoints.js +49 -35
- package/packages/dd-trace/src/debugger/devtools_client/condition.js +5 -8
- package/packages/dd-trace/src/debugger/devtools_client/config.js +3 -2
- package/packages/dd-trace/src/debugger/devtools_client/index.js +33 -71
- package/packages/dd-trace/src/debugger/devtools_client/probe_sampler.js +83 -0
- package/packages/dd-trace/src/debugger/devtools_client/send.js +27 -6
- package/packages/dd-trace/src/debugger/devtools_client/snapshot/collector.js +2 -2
- package/packages/dd-trace/src/debugger/devtools_client/snapshot/processor.js +5 -2
- package/packages/dd-trace/src/debugger/devtools_client/snapshot-pruner.js +1 -0
- package/packages/dd-trace/src/debugger/devtools_client/source-maps.js +1 -1
- package/packages/dd-trace/src/debugger/devtools_client/state.js +3 -1
- package/packages/dd-trace/src/debugger/index.js +13 -9
- package/packages/dd-trace/src/debugger/probe_sampler.js +112 -0
- package/packages/dd-trace/src/debugger/probe_sampler_constants.js +19 -0
- package/packages/dd-trace/src/dogstatsd.js +34 -28
- package/packages/dd-trace/src/encode/0.4.js +829 -268
- package/packages/dd-trace/src/encode/0.5.js +158 -22
- package/packages/dd-trace/src/encode/agentless-ci-visibility.js +141 -65
- package/packages/dd-trace/src/encode/agentless-json.js +12 -6
- package/packages/dd-trace/src/encode/coverage-ci-visibility.js +52 -15
- package/packages/dd-trace/src/encode/span-stats.js +19 -16
- package/packages/dd-trace/src/encode/tags-processors.js +30 -25
- package/packages/dd-trace/src/exporter.js +3 -1
- package/packages/dd-trace/src/exporters/agent/index.js +4 -5
- package/packages/dd-trace/src/exporters/agent/writer.js +1 -2
- package/packages/dd-trace/src/exporters/agentless/index.js +12 -13
- package/packages/dd-trace/src/exporters/agentless/intake.js +43 -0
- package/packages/dd-trace/src/exporters/agentless/writer.js +12 -11
- package/packages/dd-trace/src/exporters/common/agents.js +3 -1
- package/packages/dd-trace/src/exporters/common/buffering-exporter.js +3 -3
- package/packages/dd-trace/src/exporters/common/request.js +48 -28
- 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 +17 -1
- package/packages/dd-trace/src/exporters/electron/index.js +49 -0
- package/packages/dd-trace/src/exporters/span-stats/index.js +1 -2
- package/packages/dd-trace/src/exporters/span-stats/writer.js +1 -3
- package/packages/dd-trace/src/external-logger/src/index.js +2 -1
- package/packages/dd-trace/src/feature-registry.js +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 +4 -4
- package/packages/dd-trace/src/id.js +46 -27
- package/packages/dd-trace/src/index.js +7 -8
- package/packages/dd-trace/src/lambda/handler-paths.js +52 -0
- package/packages/dd-trace/src/lambda/handler.js +2 -6
- package/packages/dd-trace/src/lambda/index.js +62 -14
- package/packages/dd-trace/src/lambda/runtime/patch.js +21 -46
- package/packages/dd-trace/src/llmobs/constants/tags.js +13 -0
- package/packages/dd-trace/src/llmobs/index.js +37 -7
- package/packages/dd-trace/src/llmobs/plugins/ai/ddTelemetry.js +403 -0
- package/packages/dd-trace/src/llmobs/plugins/ai/index.js +8 -395
- package/packages/dd-trace/src/llmobs/plugins/ai/util.js +119 -7
- package/packages/dd-trace/src/llmobs/plugins/ai/vercelTelemetry.js +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 +89 -37
- package/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/index.js +270 -0
- package/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/utils.js +10 -0
- package/packages/dd-trace/src/llmobs/plugins/genai/index.js +5 -1
- package/packages/dd-trace/src/llmobs/plugins/genai/util.js +81 -16
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/chain.js +3 -2
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/chat_model.js +3 -2
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/embedding.js +2 -1
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/index.js +1 -50
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/vectorstore.js +2 -1
- package/packages/dd-trace/src/llmobs/plugins/langchain/index.js +14 -8
- package/packages/dd-trace/src/llmobs/plugins/langchain/messages.js +76 -0
- package/packages/dd-trace/src/llmobs/plugins/langgraph/index.js +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 +56 -35
- package/packages/dd-trace/src/llmobs/span_processor.js +90 -11
- package/packages/dd-trace/src/llmobs/tagger.js +129 -4
- 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 +11 -5
- package/packages/dd-trace/src/llmobs/writers/spans.js +1 -1
- package/packages/dd-trace/src/llmobs/writers/util.js +1 -2
- package/packages/dd-trace/src/log/index.js +19 -31
- package/packages/dd-trace/src/log/writer.js +3 -1
- package/packages/dd-trace/src/msgpack/chunk.js +430 -11
- package/packages/dd-trace/src/msgpack/index.js +101 -2
- package/packages/dd-trace/src/noop/proxy.js +5 -4
- package/packages/dd-trace/src/noop/span.js +3 -1
- package/packages/dd-trace/src/openfeature/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 +6 -6
- package/packages/dd-trace/src/opentelemetry/logs/otlp_http_log_exporter.js +3 -2
- package/packages/dd-trace/src/opentelemetry/metrics/index.js +61 -12
- package/packages/dd-trace/src/opentelemetry/metrics/instruments.js +28 -14
- package/packages/dd-trace/src/opentelemetry/metrics/meter.js +7 -10
- package/packages/dd-trace/src/opentelemetry/metrics/otlp_http_metric_exporter.js +3 -2
- package/packages/dd-trace/src/opentelemetry/metrics/otlp_span_stats_exporter.js +40 -0
- package/packages/dd-trace/src/opentelemetry/metrics/otlp_span_stats_transformer.js +169 -0
- package/packages/dd-trace/src/opentelemetry/metrics/periodic_metric_reader.js +99 -5
- package/packages/dd-trace/src/opentelemetry/metrics/time.js +19 -0
- package/packages/dd-trace/src/opentelemetry/otlp/common.proto +2 -2
- package/packages/dd-trace/src/opentelemetry/otlp/logs.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/logs_service.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/metrics.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/metrics_service.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/otlp_http_exporter_base.js +56 -82
- package/packages/dd-trace/src/opentelemetry/otlp/otlp_transformer_base.js +1 -2
- package/packages/dd-trace/src/opentelemetry/otlp/protobuf_loader.js +14 -2
- package/packages/dd-trace/src/opentelemetry/otlp/trace.proto +358 -0
- package/packages/dd-trace/src/opentelemetry/otlp/trace_service.proto +78 -0
- package/packages/dd-trace/src/opentelemetry/span-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 +278 -148
- package/packages/dd-trace/src/opentracing/propagation/text_map_dsm.js +11 -11
- package/packages/dd-trace/src/opentracing/propagation/tracestate.js +98 -32
- package/packages/dd-trace/src/opentracing/span.js +127 -73
- package/packages/dd-trace/src/opentracing/span_context.js +68 -3
- package/packages/dd-trace/src/opentracing/tracer.js +46 -19
- package/packages/dd-trace/src/payload-tagging/config/index.js +2 -2
- package/packages/dd-trace/src/plugin_manager.js +36 -14
- package/packages/dd-trace/src/plugins/apollo.js +3 -1
- package/packages/dd-trace/src/plugins/ci_plugin.js +387 -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 +19 -28
- package/packages/dd-trace/src/plugins/storage.js +2 -2
- package/packages/dd-trace/src/plugins/tracing.js +70 -13
- package/packages/dd-trace/src/plugins/util/ci.js +127 -40
- package/packages/dd-trace/src/plugins/util/git-cache.js +23 -23
- package/packages/dd-trace/src/plugins/util/git.js +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/profiling/config.js +132 -212
- package/packages/dd-trace/src/profiling/constants.js +4 -7
- package/packages/dd-trace/src/profiling/exporter_cli.js +10 -10
- package/packages/dd-trace/src/profiling/exporters/agent.js +61 -28
- package/packages/dd-trace/src/profiling/exporters/event_serializer.js +45 -14
- package/packages/dd-trace/src/profiling/exporters/file.js +16 -5
- package/packages/dd-trace/src/profiling/oom.js +71 -0
- package/packages/dd-trace/src/profiling/profiler.js +84 -105
- package/packages/dd-trace/src/profiling/profilers/event_plugins/crypto.js +32 -0
- package/packages/dd-trace/src/profiling/profilers/event_plugins/zlib.js +19 -0
- package/packages/dd-trace/src/profiling/profilers/events.js +57 -13
- package/packages/dd-trace/src/profiling/profilers/space.js +27 -16
- package/packages/dd-trace/src/profiling/profilers/wall.js +49 -35
- package/packages/dd-trace/src/profiling/ssi-heuristics.js +3 -3
- package/packages/dd-trace/src/propagation-hash/index.js +1 -1
- package/packages/dd-trace/src/proxy.js +50 -36
- package/packages/dd-trace/src/rate_limiter.js +1 -1
- package/packages/dd-trace/src/remote_config/index.js +6 -5
- package/packages/dd-trace/src/remote_config/scheduler.js +1 -1
- package/packages/dd-trace/src/ritm.js +6 -3
- package/packages/dd-trace/src/runtime_metrics/client.js +30 -0
- package/packages/dd-trace/src/runtime_metrics/index.js +14 -4
- package/packages/dd-trace/src/runtime_metrics/otlp_runtime_metrics.js +284 -0
- package/packages/dd-trace/src/runtime_metrics/runtime_metrics.js +42 -41
- package/packages/dd-trace/src/sampling_rule.js +7 -7
- package/packages/dd-trace/src/scope.js +10 -15
- package/packages/dd-trace/src/serverless.js +6 -7
- package/packages/dd-trace/src/service-naming/extra-services.js +14 -0
- package/packages/dd-trace/src/service-naming/index.js +1 -1
- package/packages/dd-trace/src/service-naming/schemas/definition.js +4 -1
- package/packages/dd-trace/src/service-naming/schemas/util.js +48 -3
- package/packages/dd-trace/src/service-naming/schemas/v0/graphql.js +6 -0
- package/packages/dd-trace/src/service-naming/schemas/v0/messaging.js +61 -2
- package/packages/dd-trace/src/service-naming/schemas/v0/serverless.js +12 -0
- package/packages/dd-trace/src/service-naming/schemas/v0/storage.js +60 -0
- package/packages/dd-trace/src/service-naming/schemas/v0/web.js +25 -1
- package/packages/dd-trace/src/service-naming/schemas/v0/websocket.js +5 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/graphql.js +8 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/messaging.js +32 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/serverless.js +12 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/storage.js +17 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/web.js +23 -3
- package/packages/dd-trace/src/service-naming/schemas/v1/websocket.js +6 -0
- package/packages/dd-trace/src/service-naming/source-resolver.js +50 -0
- package/packages/dd-trace/src/span_format.js +269 -81
- package/packages/dd-trace/src/span_processor.js +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 +3 -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 -2
- package/packages/dd-trace/src/telemetry/logs/index.js +1 -1
- package/packages/dd-trace/src/telemetry/send-data.js +20 -20
- package/packages/dd-trace/src/telemetry/session-propagation.js +1 -1
- package/packages/dd-trace/src/telemetry/telemetry.js +16 -14
- package/packages/dd-trace/src/tracer.js +23 -9
- package/packages/dd-trace/src/tracer_metadata.js +1 -1
- package/packages/dd-trace/src/util.js +31 -0
- package/register.js +58 -1
- package/vendor/dist/@apm-js-collab/code-transformer/index.js +94 -42
- package/vendor/dist/@datadog/sketches-js/LICENSE +10 -36
- package/vendor/dist/@datadog/sketches-js/index.js +1 -1
- package/vendor/dist/pprof-format/index.js +1 -1
- package/vendor/dist/protobufjs/index.js +1 -1
- package/vendor/dist/protobufjs/minimal/index.js +1 -1
- package/vendor/dist/shell-quote/index.js +1 -1
- package/packages/datadog-plugin-graphql/src/resolve.js +0 -178
- package/packages/dd-trace/src/agent/url.js +0 -28
- package/packages/dd-trace/src/appsec/api_security_sampler.js +0 -117
- package/packages/dd-trace/src/lambda/runtime/ritm.js +0 -133
- package/packages/dd-trace/src/log/utils.js +0 -16
- package/packages/dd-trace/src/msgpack/encoder.js +0 -308
- package/packages/dd-trace/src/plugins/structured_log_plugin.js +0 -9
- package/scripts/preinstall.js +0 -34
- package/vendor/dist/ignore/LICENSE +0 -21
- package/vendor/dist/ignore/index.js +0 -1
- package/vendor/dist/opentracing/LICENSE +0 -201
- package/vendor/dist/opentracing/binary_carrier.d.ts +0 -11
- package/vendor/dist/opentracing/constants.d.ts +0 -61
- package/vendor/dist/opentracing/examples/demo/demo.d.ts +0 -2
- package/vendor/dist/opentracing/ext/tags.d.ts +0 -90
- package/vendor/dist/opentracing/functions.d.ts +0 -20
- package/vendor/dist/opentracing/global_tracer.d.ts +0 -14
- package/vendor/dist/opentracing/index.d.ts +0 -12
- package/vendor/dist/opentracing/index.js +0 -1
- package/vendor/dist/opentracing/mock_tracer/index.d.ts +0 -5
- package/vendor/dist/opentracing/mock_tracer/mock_context.d.ts +0 -13
- package/vendor/dist/opentracing/mock_tracer/mock_report.d.ts +0 -16
- package/vendor/dist/opentracing/mock_tracer/mock_span.d.ts +0 -50
- package/vendor/dist/opentracing/mock_tracer/mock_tracer.d.ts +0 -26
- package/vendor/dist/opentracing/noop.d.ts +0 -8
- package/vendor/dist/opentracing/reference.d.ts +0 -33
- package/vendor/dist/opentracing/span.d.ts +0 -147
- package/vendor/dist/opentracing/span_context.d.ts +0 -26
- package/vendor/dist/opentracing/test/api_compatibility.d.ts +0 -16
- package/vendor/dist/opentracing/test/mocktracer_implemenation.d.ts +0 -3
- package/vendor/dist/opentracing/test/noop_implementation.d.ts +0 -4
- package/vendor/dist/opentracing/test/opentracing_api.d.ts +0 -3
- package/vendor/dist/opentracing/test/unittest.d.ts +0 -2
- package/vendor/dist/opentracing/tracer.d.ts +0 -127
- package/vendor/dist/path-to-regexp/LICENSE +0 -21
- package/vendor/dist/path-to-regexp/index.js +0 -1
|
@@ -2,7 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
const shimmer = require('../../datadog-shimmer')
|
|
4
4
|
const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
|
|
5
|
-
const {
|
|
5
|
+
const {
|
|
6
|
+
readCoverageBackfillFromCache,
|
|
7
|
+
readCoverageBackfillRootDirFromCache,
|
|
8
|
+
setupSettingsCachePath,
|
|
9
|
+
} = require('../../dd-trace/src/ci-visibility/test-optimization-cache')
|
|
10
|
+
const { applySkippedCoverageToCoverage } = require('../../dd-trace/src/plugins/util/test')
|
|
6
11
|
const { addHook, channel } = require('./helpers/instrument')
|
|
7
12
|
|
|
8
13
|
const codeCoverageWrapCh = channel('ci:nyc:wrap')
|
|
@@ -16,8 +21,40 @@ addHook({
|
|
|
16
21
|
// when dd-trace fetches library configuration
|
|
17
22
|
setupSettingsCachePath()
|
|
18
23
|
|
|
24
|
+
if (nycPackage.prototype.getCoverageMapFromAllCoverageFiles) {
|
|
25
|
+
// Some test frameworks receive skipped-suite coverage in the test process, but nyc merges reports later in the nyc
|
|
26
|
+
// process. Reuse the settings cache path as the process handoff so nyc can backfill skipped files before reporting.
|
|
27
|
+
shimmer.wrap(
|
|
28
|
+
nycPackage.prototype,
|
|
29
|
+
'getCoverageMapFromAllCoverageFiles',
|
|
30
|
+
getCoverageMapFromAllCoverageFiles => function (...args) {
|
|
31
|
+
const coverageMap = getCoverageMapFromAllCoverageFiles.apply(this, args)
|
|
32
|
+
const applyCoverageBackfill = (resolvedCoverageMap) => {
|
|
33
|
+
try {
|
|
34
|
+
if (!resolvedCoverageMap) {
|
|
35
|
+
return resolvedCoverageMap
|
|
36
|
+
}
|
|
37
|
+
applySkippedCoverageToCoverage(
|
|
38
|
+
resolvedCoverageMap,
|
|
39
|
+
readCoverageBackfillFromCache(),
|
|
40
|
+
readCoverageBackfillRootDirFromCache() || this.cwd
|
|
41
|
+
)
|
|
42
|
+
} catch {
|
|
43
|
+
// Do not break nyc's report generation if the cached backfill is stale or malformed.
|
|
44
|
+
}
|
|
45
|
+
return resolvedCoverageMap
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
if (coverageMap && typeof coverageMap.then === 'function') {
|
|
49
|
+
return coverageMap.then(applyCoverageBackfill)
|
|
50
|
+
}
|
|
51
|
+
return applyCoverageBackfill(coverageMap)
|
|
52
|
+
}
|
|
53
|
+
)
|
|
54
|
+
}
|
|
55
|
+
|
|
19
56
|
// `wrap` is an async function
|
|
20
|
-
shimmer.wrap(nycPackage.prototype, 'wrap', wrap => function () {
|
|
57
|
+
shimmer.wrap(nycPackage.prototype, 'wrap', wrap => function (...args) {
|
|
21
58
|
// Only relevant if the config `all` is set to true (for untested code coverage)
|
|
22
59
|
try {
|
|
23
60
|
if (JSON.parse(getEnvironmentVariable('NYC_CONFIG')).all) {
|
|
@@ -27,16 +64,16 @@ addHook({
|
|
|
27
64
|
// ignore errors
|
|
28
65
|
}
|
|
29
66
|
|
|
30
|
-
return wrap.apply(this,
|
|
67
|
+
return wrap.apply(this, args)
|
|
31
68
|
})
|
|
32
69
|
|
|
33
70
|
// `report` is an async function, so we wait for it to complete before publishing
|
|
34
|
-
shimmer.wrap(nycPackage.prototype, 'report', report => function () {
|
|
71
|
+
shimmer.wrap(nycPackage.prototype, 'report', report => function (...args) {
|
|
35
72
|
if (!codeCoverageReportCh.hasSubscribers) {
|
|
36
|
-
return report.apply(this,
|
|
73
|
+
return report.apply(this, args)
|
|
37
74
|
}
|
|
38
75
|
const nycInstance = this
|
|
39
|
-
const reportPromise = report.apply(this,
|
|
76
|
+
const reportPromise = report.apply(this, args)
|
|
40
77
|
|
|
41
78
|
if (reportPromise && typeof reportPromise.then === 'function') {
|
|
42
79
|
// Return a new promise that waits for both the report AND the coverage upload
|
|
@@ -7,6 +7,48 @@ const { addHook } = require('./helpers/instrument')
|
|
|
7
7
|
const ch = dc.tracingChannel('apm:openai:request')
|
|
8
8
|
const onStreamedChunkCh = dc.channel('apm:openai:request:chunk')
|
|
9
9
|
|
|
10
|
+
// Provider lifecycle channels. Payloads stay OpenAI-native:
|
|
11
|
+
// before { args, parentSpan, abortController, pending }
|
|
12
|
+
// after { args, body, parentSpan, abortController, pending }
|
|
13
|
+
const chatCompletionsBeforeChannel = dc.channel('dd-trace:openai:chat.completions:before')
|
|
14
|
+
const chatCompletionsAfterChannel = dc.channel('dd-trace:openai:chat.completions:after')
|
|
15
|
+
const responsesBeforeChannel = dc.channel('dd-trace:openai:responses:before')
|
|
16
|
+
const responsesAfterChannel = dc.channel('dd-trace:openai:responses:after')
|
|
17
|
+
|
|
18
|
+
const LIFECYCLE_CHANNELS = {
|
|
19
|
+
'chat.completions': {
|
|
20
|
+
before: chatCompletionsBeforeChannel,
|
|
21
|
+
after: chatCompletionsAfterChannel,
|
|
22
|
+
},
|
|
23
|
+
responses: {
|
|
24
|
+
before: responsesBeforeChannel,
|
|
25
|
+
after: responsesAfterChannel,
|
|
26
|
+
},
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Publishes a provider-native lifecycle payload to a cancelable lifecycle channel.
|
|
31
|
+
*
|
|
32
|
+
* Subscribers push async work into `pending` synchronously during publication and
|
|
33
|
+
* abort `abortController` with an error before the pushed promise resolves to block.
|
|
34
|
+
*
|
|
35
|
+
* @param {object} channel
|
|
36
|
+
* @param {object} payload
|
|
37
|
+
* @returns {Promise<void>}
|
|
38
|
+
*/
|
|
39
|
+
function publishLifecycle (channel, payload) {
|
|
40
|
+
const abortController = new AbortController()
|
|
41
|
+
const ctx = { ...payload, abortController, pending: [] }
|
|
42
|
+
|
|
43
|
+
channel.publish(ctx)
|
|
44
|
+
|
|
45
|
+
return Promise.all(ctx.pending).then(() => {
|
|
46
|
+
if (abortController.signal.aborted) {
|
|
47
|
+
throw abortController.signal.reason
|
|
48
|
+
}
|
|
49
|
+
})
|
|
50
|
+
}
|
|
51
|
+
|
|
10
52
|
const V4_PACKAGE_SHIMS = [
|
|
11
53
|
{
|
|
12
54
|
file: 'resources/chat/completions',
|
|
@@ -150,18 +192,18 @@ addHook({ name: 'openai', file: 'dist/api.js', versions: ['>=3.0.0 <4'] }, expor
|
|
|
150
192
|
methodNames.shift() // remove leading 'constructor' method
|
|
151
193
|
|
|
152
194
|
for (const methodName of methodNames) {
|
|
153
|
-
shimmer.wrap(exports.OpenAIApi.prototype, methodName, fn => function () {
|
|
195
|
+
shimmer.wrap(exports.OpenAIApi.prototype, methodName, fn => function (...args) {
|
|
154
196
|
if (!ch.start.hasSubscribers) {
|
|
155
|
-
return fn.apply(this,
|
|
197
|
+
return fn.apply(this, args)
|
|
156
198
|
}
|
|
157
199
|
|
|
158
200
|
const ctx = {
|
|
159
201
|
methodName,
|
|
160
|
-
args
|
|
202
|
+
args,
|
|
161
203
|
basePath: this.basePath,
|
|
162
204
|
}
|
|
163
205
|
|
|
164
|
-
return ch.tracePromise(fn, ctx, this, ...
|
|
206
|
+
return ch.tracePromise(fn, ctx, this, ...args)
|
|
165
207
|
})
|
|
166
208
|
}
|
|
167
209
|
|
|
@@ -175,10 +217,10 @@ addHook({ name: 'openai', file: 'dist/api.js', versions: ['>=3.0.0 <4'] }, expor
|
|
|
175
217
|
*/
|
|
176
218
|
function wrapStreamIterator (response, options, ctx) {
|
|
177
219
|
return function (itr) {
|
|
178
|
-
return function () {
|
|
179
|
-
const iterator = itr.apply(this,
|
|
180
|
-
shimmer.wrap(iterator, 'next', next => function () {
|
|
181
|
-
return next.apply(this,
|
|
220
|
+
return function (...args) {
|
|
221
|
+
const iterator = itr.apply(this, args)
|
|
222
|
+
shimmer.wrap(iterator, 'next', next => function (...args) {
|
|
223
|
+
return next.apply(this, args)
|
|
182
224
|
.then(res => {
|
|
183
225
|
const { done, value: chunk } = res
|
|
184
226
|
onStreamedChunkCh.publish({ ctx, chunk, done })
|
|
@@ -215,41 +257,60 @@ for (const extension of extensions) {
|
|
|
215
257
|
const targetPrototype = exports[targetClass].prototype
|
|
216
258
|
|
|
217
259
|
for (const methodName of methods) {
|
|
218
|
-
shimmer.wrap(targetPrototype, methodName, methodFn => function () {
|
|
219
|
-
if (!ch.start.hasSubscribers) {
|
|
220
|
-
return methodFn.apply(this, arguments)
|
|
221
|
-
}
|
|
222
|
-
|
|
260
|
+
shimmer.wrap(targetPrototype, methodName, methodFn => function (...args) {
|
|
223
261
|
// The OpenAI library lets you set `stream: true` on the options arg to any method
|
|
224
262
|
// However, we only want to handle streamed responses in specific cases
|
|
225
263
|
// chat.completions and completions
|
|
226
|
-
const stream = streamedResponse && getOption(
|
|
264
|
+
const stream = streamedResponse && getOption(args, 'stream', false)
|
|
265
|
+
|
|
266
|
+
const channels = stream ? null : LIFECYCLE_CHANNELS[baseResource]
|
|
267
|
+
const hasLifecycle = !!channels && (channels.before.hasSubscribers || channels.after.hasSubscribers)
|
|
268
|
+
|
|
269
|
+
if (!ch.start.hasSubscribers && !hasLifecycle) {
|
|
270
|
+
return methodFn.apply(this, args)
|
|
271
|
+
}
|
|
227
272
|
|
|
228
273
|
const client = this._client || this.client
|
|
229
274
|
|
|
230
275
|
const ctx = {
|
|
231
276
|
methodName: `${baseResource}.${methodName}`,
|
|
232
|
-
args
|
|
277
|
+
args,
|
|
233
278
|
basePath: client.baseURL,
|
|
234
279
|
}
|
|
235
280
|
|
|
236
281
|
return ch.start.runStores(ctx, () => {
|
|
237
|
-
|
|
282
|
+
// Capture the parent span explicitly: the _thenUnwrap/parse path decouples
|
|
283
|
+
// the lazy evaluation from the active scope at call time.
|
|
284
|
+
const parentSpan = hasLifecycle ? ctx.currentStore?.span : undefined
|
|
285
|
+
|
|
286
|
+
const apiProm = methodFn.apply(this, args)
|
|
287
|
+
|
|
288
|
+
const beforeChannel = hasLifecycle && channels.before.hasSubscribers ? channels.before : null
|
|
289
|
+
const afterChannel = hasLifecycle && channels.after.hasSubscribers ? channels.after : null
|
|
290
|
+
let beforeVerdict
|
|
291
|
+
const getBeforeVerdict = beforeChannel
|
|
292
|
+
? function getBeforeVerdict () {
|
|
293
|
+
beforeVerdict ??= publishLifecycle(beforeChannel, { args, parentSpan })
|
|
294
|
+
return beforeVerdict
|
|
295
|
+
}
|
|
296
|
+
: null
|
|
238
297
|
|
|
239
298
|
if (baseResource === 'chat.completions' && typeof apiProm._thenUnwrap === 'function') {
|
|
240
299
|
// this should only ever be invoked from a client.beta.chat.completions.parse call
|
|
241
|
-
shimmer.wrap(apiProm, '_thenUnwrap', origApiPromThenUnwrap => function () {
|
|
300
|
+
shimmer.wrap(apiProm, '_thenUnwrap', origApiPromThenUnwrap => function (...args) {
|
|
242
301
|
// TODO(sam.brenner): I wonder if we can patch the APIPromise prototype instead, although
|
|
243
302
|
// we might not have access to everything we need...
|
|
244
303
|
|
|
245
304
|
// this is a new apipromise instance
|
|
246
|
-
const unwrappedPromise = origApiPromThenUnwrap.apply(this,
|
|
305
|
+
const unwrappedPromise = origApiPromThenUnwrap.apply(this, args)
|
|
247
306
|
|
|
248
|
-
shimmer.wrap(unwrappedPromise, 'parse', origApiPromParse => function () {
|
|
249
|
-
const parsedPromise = origApiPromParse.apply(this,
|
|
307
|
+
shimmer.wrap(unwrappedPromise, 'parse', origApiPromParse => function (...args) {
|
|
308
|
+
const parsedPromise = origApiPromParse.apply(this, args)
|
|
250
309
|
.then(body => Promise.all([this.responsePromise, body]))
|
|
251
310
|
|
|
252
|
-
return handleUnwrappedAPIPromise(
|
|
311
|
+
return handleUnwrappedAPIPromise(
|
|
312
|
+
parsedPromise, ctx, stream, getBeforeVerdict, afterChannel, parentSpan
|
|
313
|
+
)
|
|
253
314
|
})
|
|
254
315
|
|
|
255
316
|
return unwrappedPromise
|
|
@@ -258,13 +319,21 @@ for (const extension of extensions) {
|
|
|
258
319
|
|
|
259
320
|
// wrapping `parse` avoids problematic wrapping of `then` when trying to call
|
|
260
321
|
// `withResponse` in userland code after. This way, we can return the whole `APIPromise`
|
|
261
|
-
shimmer.wrap(apiProm, 'parse', origApiPromParse => function () {
|
|
262
|
-
const parsedPromise = origApiPromParse.apply(this,
|
|
322
|
+
shimmer.wrap(apiProm, 'parse', origApiPromParse => function (...args) {
|
|
323
|
+
const parsedPromise = origApiPromParse.apply(this, args)
|
|
263
324
|
.then(body => Promise.all([this.responsePromise, body]))
|
|
264
325
|
|
|
265
|
-
return handleUnwrappedAPIPromise(parsedPromise, ctx, stream)
|
|
326
|
+
return handleUnwrappedAPIPromise(parsedPromise, ctx, stream, getBeforeVerdict, afterChannel, parentSpan)
|
|
266
327
|
})
|
|
267
328
|
|
|
329
|
+
// Gate `.asResponse()` callers on the before verdict so raw-response paths still block.
|
|
330
|
+
if (beforeChannel && typeof apiProm.asResponse === 'function') {
|
|
331
|
+
shimmer.wrap(apiProm, 'asResponse', origAsResponse => function (...args) {
|
|
332
|
+
const responsePromise = origAsResponse.apply(this, args)
|
|
333
|
+
return Promise.all([getBeforeVerdict(), responsePromise]).then(([, response]) => response)
|
|
334
|
+
})
|
|
335
|
+
}
|
|
336
|
+
|
|
268
337
|
ch.end.publish(ctx)
|
|
269
338
|
|
|
270
339
|
return apiProm
|
|
@@ -276,8 +345,12 @@ for (const extension of extensions) {
|
|
|
276
345
|
}
|
|
277
346
|
}
|
|
278
347
|
|
|
279
|
-
function handleUnwrappedAPIPromise (apiProm, ctx, stream) {
|
|
280
|
-
|
|
348
|
+
function handleUnwrappedAPIPromise (apiProm, ctx, stream, getBeforeVerdict, afterChannel, parentSpan) {
|
|
349
|
+
const gatedApiProm = getBeforeVerdict
|
|
350
|
+
? Promise.all([getBeforeVerdict(), apiProm]).then(([, result]) => result)
|
|
351
|
+
: apiProm
|
|
352
|
+
|
|
353
|
+
return gatedApiProm
|
|
281
354
|
.then(([{ response, options }, body]) => {
|
|
282
355
|
if (stream) {
|
|
283
356
|
if (body.iterator) {
|
|
@@ -287,22 +360,35 @@ function handleUnwrappedAPIPromise (apiProm, ctx, stream) {
|
|
|
287
360
|
body.response.body, Symbol.asyncIterator, wrapStreamIterator(response, options, ctx)
|
|
288
361
|
)
|
|
289
362
|
}
|
|
290
|
-
|
|
291
|
-
finish(ctx, {
|
|
292
|
-
headers: response.headers,
|
|
293
|
-
data: body,
|
|
294
|
-
request: {
|
|
295
|
-
path: response.url,
|
|
296
|
-
method: options.method,
|
|
297
|
-
},
|
|
298
|
-
})
|
|
363
|
+
return body
|
|
299
364
|
}
|
|
300
365
|
|
|
301
|
-
|
|
366
|
+
const responseData = {
|
|
367
|
+
headers: response.headers,
|
|
368
|
+
data: body,
|
|
369
|
+
request: {
|
|
370
|
+
path: response.url,
|
|
371
|
+
method: options.method,
|
|
372
|
+
},
|
|
373
|
+
}
|
|
374
|
+
|
|
375
|
+
if (!afterChannel) {
|
|
376
|
+
finish(ctx, responseData)
|
|
377
|
+
return body
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
// Finish after evaluation so a block propagates the error to openai.request
|
|
381
|
+
// and the span wraps its child instead of closing before it.
|
|
382
|
+
return publishLifecycle(afterChannel, { args: ctx.args, body, parentSpan }).then(() => {
|
|
383
|
+
finish(ctx, responseData)
|
|
384
|
+
return body
|
|
385
|
+
})
|
|
302
386
|
})
|
|
303
387
|
.catch(error => {
|
|
304
|
-
finish(
|
|
305
|
-
|
|
388
|
+
// ctx.result is set inside finish(); if absent, finish never ran (sync throw in the success
|
|
389
|
+
// branch, Before Model block, After Model block, or openai error) — record the error now so
|
|
390
|
+
// the openai.request span is marked errored. If finish already ran, don't double-publish.
|
|
391
|
+
if (!ctx.result) finish(ctx, undefined, error)
|
|
306
392
|
throw error
|
|
307
393
|
})
|
|
308
394
|
}
|
|
@@ -22,7 +22,7 @@ function finish (ctx) {
|
|
|
22
22
|
|
|
23
23
|
addHook({ name: 'oracledb', versions: ['>=5'], file: 'lib/oracledb.js' }, oracledb => {
|
|
24
24
|
shimmer.wrap(oracledb.Connection.prototype, 'execute', execute => {
|
|
25
|
-
return function wrappedExecute (dbQuery
|
|
25
|
+
return function wrappedExecute (dbQuery) {
|
|
26
26
|
if (!startChannel.hasSubscribers) {
|
|
27
27
|
return execute.apply(this, arguments)
|
|
28
28
|
}
|
|
@@ -72,6 +72,11 @@ addHook({ name: 'oracledb', versions: ['>=5'], file: 'lib/oracledb.js' }, oracle
|
|
|
72
72
|
}
|
|
73
73
|
|
|
74
74
|
return startChannel.runStores(ctx, () => {
|
|
75
|
+
// bindStart is skipped when tracing is suppressed (legacy store is `noop`),
|
|
76
|
+
// leaving ctx.injected unset — do not overwrite the caller's SQL argument.
|
|
77
|
+
if (ctx.injected !== undefined) {
|
|
78
|
+
arguments[0] = ctx.injected
|
|
79
|
+
}
|
|
75
80
|
try {
|
|
76
81
|
let result = execute.apply(this, arguments)
|
|
77
82
|
|
|
@@ -137,21 +142,21 @@ addHook({ name: 'oracledb', versions: ['>=5'], file: 'lib/oracledb.js' }, oracle
|
|
|
137
142
|
}
|
|
138
143
|
})
|
|
139
144
|
shimmer.wrap(oracledb.Pool.prototype, 'getConnection', getConnection => {
|
|
140
|
-
return function wrappedGetConnection () {
|
|
145
|
+
return function wrappedGetConnection (...args) {
|
|
141
146
|
let callback
|
|
142
|
-
if (typeof
|
|
143
|
-
callback =
|
|
147
|
+
if (typeof args[args.length - 1] === 'function') {
|
|
148
|
+
callback = args[args.length - 1]
|
|
144
149
|
}
|
|
145
150
|
if (callback) {
|
|
146
|
-
|
|
151
|
+
args[args.length - 1] = shimmer.wrapFunction(callback, callback => (err, connection) => {
|
|
147
152
|
if (connection) {
|
|
148
153
|
connectionAttributes.set(connection, poolAttributes.get(this))
|
|
149
154
|
}
|
|
150
155
|
callback(err, connection)
|
|
151
156
|
})
|
|
152
|
-
getConnection.apply(this,
|
|
157
|
+
getConnection.apply(this, args)
|
|
153
158
|
} else {
|
|
154
|
-
return getConnection.apply(this,
|
|
159
|
+
return getConnection.apply(this, args).then((connection) => {
|
|
155
160
|
connectionAttributes.set(connection, poolAttributes.get(this))
|
|
156
161
|
return connection
|
|
157
162
|
})
|
|
@@ -5,12 +5,7 @@ const tracer = require('../../dd-trace')
|
|
|
5
5
|
const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
|
|
6
6
|
const { addHook } = require('./helpers/instrument')
|
|
7
7
|
|
|
8
|
-
|
|
9
|
-
getValueFromEnvSources('OTEL_SDK_DISABLED')
|
|
10
|
-
? !getValueFromEnvSources('OTEL_SDK_DISABLED')
|
|
11
|
-
: undefined
|
|
12
|
-
|
|
13
|
-
if (otelSdkEnabled) {
|
|
8
|
+
if (isOtelSdkEnabled()) {
|
|
14
9
|
addHook({
|
|
15
10
|
name: '@opentelemetry/sdk-trace-node',
|
|
16
11
|
file: 'build/src/NodeTracerProvider.js',
|
|
@@ -21,4 +16,30 @@ if (otelSdkEnabled) {
|
|
|
21
16
|
})
|
|
22
17
|
return mod
|
|
23
18
|
})
|
|
19
|
+
|
|
20
|
+
// As of @opentelemetry/sdk-node 0.220.0, NodeSDK builds its provider from
|
|
21
|
+
// @opentelemetry/sdk-trace's TracerProvider instead of sdk-trace-node's
|
|
22
|
+
// NodeTracerProvider, so the hook above no longer intercepts it. Wrap this
|
|
23
|
+
// export too, otherwise DD_TRACE_OTEL_ENABLED spans never reach the tracer.
|
|
24
|
+
addHook({
|
|
25
|
+
name: '@opentelemetry/sdk-trace',
|
|
26
|
+
file: 'build/src/TracerProvider.js',
|
|
27
|
+
versions: ['*'],
|
|
28
|
+
}, (mod) => {
|
|
29
|
+
shimmer.wrap(mod, 'TracerProvider', () => {
|
|
30
|
+
return tracer.TracerProvider
|
|
31
|
+
})
|
|
32
|
+
return mod
|
|
33
|
+
})
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function isOtelSdkEnabled () {
|
|
37
|
+
// Datadog explicit opt-out wins over every OTel signal; check it first.
|
|
38
|
+
// skipDefault: an unset option must stay undefined so the OTel signal still decides — the
|
|
39
|
+
// registered defaults (false / true) would otherwise force-disable before that check.
|
|
40
|
+
const ddTraceOtelEnabled = getValueFromEnvSources('DD_TRACE_OTEL_ENABLED', true)
|
|
41
|
+
if (ddTraceOtelEnabled === false) return false
|
|
42
|
+
const otelSdkDisabled = getValueFromEnvSources('OTEL_SDK_DISABLED', true)
|
|
43
|
+
if (otelSdkDisabled) return false
|
|
44
|
+
return ddTraceOtelEnabled || otelSdkDisabled === false
|
|
24
45
|
}
|
|
@@ -40,15 +40,15 @@ function wrapVerify (verify) {
|
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
function wrapStrategy (Strategy) {
|
|
43
|
-
return function wrappedStrategy () {
|
|
43
|
+
return function wrappedStrategy (...args) {
|
|
44
44
|
// verify function can be either the first or second argument
|
|
45
|
-
if (typeof
|
|
46
|
-
|
|
45
|
+
if (typeof args[0] === 'function') {
|
|
46
|
+
args[0] = wrapVerify(args[0])
|
|
47
47
|
} else {
|
|
48
|
-
|
|
48
|
+
args[1] = wrapVerify(args[1])
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
return Strategy.apply(this,
|
|
51
|
+
return Strategy.apply(this, args)
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
'use strict'
|
|
2
|
+
|
|
3
|
+
const { addHook } = require('./helpers/instrument')
|
|
4
|
+
|
|
5
|
+
/** @type {((pattern: string | RegExp) => RegExp | undefined) | undefined} */
|
|
6
|
+
let compileToRegexp
|
|
7
|
+
|
|
8
|
+
addHook({ name: 'path-to-regexp', versions: ['*'] }, moduleExports => {
|
|
9
|
+
// 0.1.x and 6.x: `module.exports = (path, ...) => RegExp`.
|
|
10
|
+
// 7.x: `module.exports = { pathToRegexp(path, ...) => RegExp }`.
|
|
11
|
+
// 8.x: `module.exports = { pathToRegexp(path, ...) => { regexp, keys } }`.
|
|
12
|
+
const compile = typeof moduleExports === 'function'
|
|
13
|
+
? moduleExports
|
|
14
|
+
: (typeof moduleExports?.pathToRegexp === 'function' ? moduleExports.pathToRegexp : undefined)
|
|
15
|
+
|
|
16
|
+
if (compile !== undefined) {
|
|
17
|
+
compileToRegexp = pattern => {
|
|
18
|
+
let result
|
|
19
|
+
try {
|
|
20
|
+
result = compile(pattern)
|
|
21
|
+
} catch {
|
|
22
|
+
return
|
|
23
|
+
}
|
|
24
|
+
const regex = result?.regexp ?? result
|
|
25
|
+
if (regex instanceof RegExp) return regex
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
return moduleExports
|
|
30
|
+
})
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Returns whatever path-to-regexp compile adapter the host most recently
|
|
34
|
+
* loaded. Capture this once at addHook fire time so each express/router
|
|
35
|
+
* instance keeps the dialect that was current when its routes were wrapped;
|
|
36
|
+
* a later host load that swaps the global compile won't retroactively change
|
|
37
|
+
* already-wrapped routers. `undefined` when the host has not loaded
|
|
38
|
+
* path-to-regexp yet, or never if it does not depend on it.
|
|
39
|
+
*/
|
|
40
|
+
function getCompileToRegexp () {
|
|
41
|
+
return compileToRegexp
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
module.exports = { getCompileToRegexp }
|
|
@@ -15,6 +15,13 @@ const errorCh = channel('apm:pg:query:error')
|
|
|
15
15
|
const startPoolQueryCh = channel('datadog:pg:pool:query:start')
|
|
16
16
|
const finishPoolQueryCh = channel('datadog:pg:pool:query:finish')
|
|
17
17
|
|
|
18
|
+
const poolConnectStartCh = channel('apm:pg:pool:connect:start')
|
|
19
|
+
const poolConnectFinishCh = channel('apm:pg:pool:connect:finish')
|
|
20
|
+
|
|
21
|
+
// Drivers like pg-promise reuse the same prepared-statement query object across executions; cache
|
|
22
|
+
// the un-injected `text` so the wrap doesn't capture a previous DBM injection as the new original.
|
|
23
|
+
const originalTextCache = new WeakMap()
|
|
24
|
+
|
|
18
25
|
addHook({ name: 'pg', versions: ['>=8.0.3'], file: 'lib/native/client.js' }, Client => {
|
|
19
26
|
shimmer.wrap(Client.prototype, 'query', query => wrapQuery(query))
|
|
20
27
|
return Client
|
|
@@ -26,37 +33,47 @@ addHook({ name: 'pg', versions: ['>=8.0.3'], file: 'lib/client.js' }, Client =>
|
|
|
26
33
|
})
|
|
27
34
|
|
|
28
35
|
addHook({ name: 'pg', versions: ['>=8.0.3'] }, pg => {
|
|
36
|
+
// pg defers a busy pool's connect callback and runs it in the releasing query's async context;
|
|
37
|
+
// capture the caller's context and restore it around the callback so spans attach to the caller.
|
|
38
|
+
shimmer.wrap(pg.Pool.prototype, 'connect', connect => function (cb) {
|
|
39
|
+
if (typeof cb !== 'function' || !poolConnectStartCh.hasSubscribers) {
|
|
40
|
+
return connect.apply(this, arguments)
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const ctx = {}
|
|
44
|
+
arguments[0] = function (...args) {
|
|
45
|
+
return poolConnectFinishCh.runStores(ctx, cb, this, ...args)
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
poolConnectStartCh.publish(ctx)
|
|
49
|
+
|
|
50
|
+
return connect.apply(this, arguments)
|
|
51
|
+
})
|
|
29
52
|
shimmer.wrap(pg.Pool.prototype, 'query', query => wrapPoolQuery(query))
|
|
30
53
|
return pg
|
|
31
54
|
})
|
|
32
55
|
|
|
33
56
|
function wrapQuery (query) {
|
|
34
|
-
return function () {
|
|
57
|
+
return function (...args) {
|
|
35
58
|
if (!startCh.hasSubscribers) {
|
|
36
|
-
return query.apply(this,
|
|
59
|
+
return query.apply(this, args)
|
|
37
60
|
}
|
|
38
61
|
|
|
39
62
|
const processId = this.processID
|
|
40
63
|
|
|
41
|
-
const pgQuery =
|
|
42
|
-
?
|
|
43
|
-
: { text:
|
|
64
|
+
const pgQuery = args[0] !== null && typeof args[0] === 'object'
|
|
65
|
+
? args[0]
|
|
66
|
+
: { text: args[0] }
|
|
44
67
|
|
|
45
68
|
const textPropObj = pgQuery.cursor ?? pgQuery
|
|
46
|
-
const textProp = Object.getOwnPropertyDescriptor(textPropObj, 'text')
|
|
47
69
|
const stream = typeof textPropObj.read === 'function'
|
|
48
70
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
if (!textProp || textProp.configurable) {
|
|
71
|
+
let originalText = originalTextCache.get(textPropObj)
|
|
72
|
+
if (originalText === undefined) {
|
|
52
73
|
originalText = textPropObj.text
|
|
53
|
-
|
|
54
|
-
Object.defineProperty(textPropObj, 'text', {
|
|
55
|
-
get () {
|
|
56
|
-
return this?.__ddInjectableQuery || originalText
|
|
57
|
-
},
|
|
58
|
-
})
|
|
74
|
+
originalTextCache.set(textPropObj, originalText)
|
|
59
75
|
}
|
|
76
|
+
|
|
60
77
|
const abortController = new AbortController()
|
|
61
78
|
const ctx = {
|
|
62
79
|
params: this.connectionParameters,
|
|
@@ -80,7 +97,7 @@ function wrapQuery (query) {
|
|
|
80
97
|
|
|
81
98
|
// Based on: https://github.com/brianc/node-postgres/blob/54eb0fa216aaccd727765641e7d1cf5da2bc483d/packages/pg/lib/client.js#L510
|
|
82
99
|
const reusingQuery = typeof pgQuery.submit === 'function'
|
|
83
|
-
const callback =
|
|
100
|
+
const callback = args[args.length - 1]
|
|
84
101
|
|
|
85
102
|
finish(error)
|
|
86
103
|
|
|
@@ -109,9 +126,25 @@ function wrapQuery (query) {
|
|
|
109
126
|
return Promise.reject(error)
|
|
110
127
|
}
|
|
111
128
|
|
|
112
|
-
|
|
129
|
+
const injected = ctx.injected
|
|
130
|
+
if (injected !== undefined) {
|
|
131
|
+
// Skip the per-read getter trampoline when `text` is a configurable, writable data
|
|
132
|
+
// property (the pg / pg-cursor common shape). Accessor descriptors and read-only data
|
|
133
|
+
// still go through `defineProperty(get)` so `get text ()` query objects keep working.
|
|
134
|
+
const textProp = Object.getOwnPropertyDescriptor(textPropObj, 'text')
|
|
135
|
+
if (textProp?.configurable === true && textProp.writable === true) {
|
|
136
|
+
textPropObj.text = injected
|
|
137
|
+
} else if (textProp === undefined || textProp.configurable === true) {
|
|
138
|
+
Object.defineProperty(textPropObj, 'text', {
|
|
139
|
+
configurable: true,
|
|
140
|
+
get () { return injected },
|
|
141
|
+
})
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
args[0] = pgQuery
|
|
113
146
|
|
|
114
|
-
const retval = query.apply(this,
|
|
147
|
+
const retval = query.apply(this, args)
|
|
115
148
|
|
|
116
149
|
const deperecated = Object.hasOwn(this, '_activeQuery')
|
|
117
150
|
const queryQueue = deperecated ? this._queryQueue : this.queryQueue
|
|
@@ -153,18 +186,18 @@ const finish = (ctx) => {
|
|
|
153
186
|
finishPoolQueryCh.publish(ctx)
|
|
154
187
|
}
|
|
155
188
|
function wrapPoolQuery (query) {
|
|
156
|
-
return function () {
|
|
189
|
+
return function (...args) {
|
|
157
190
|
if (!startPoolQueryCh.hasSubscribers) {
|
|
158
|
-
return query.apply(this,
|
|
191
|
+
return query.apply(this, args)
|
|
159
192
|
}
|
|
160
193
|
|
|
161
|
-
const pgQuery =
|
|
194
|
+
const pgQuery = args[0] !== null && typeof args[0] === 'object' ? args[0] : { text: args[0] }
|
|
162
195
|
const abortController = new AbortController()
|
|
163
196
|
|
|
164
197
|
const ctx = { query: pgQuery, abortController }
|
|
165
198
|
|
|
166
199
|
return startPoolQueryCh.runStores(ctx, () => {
|
|
167
|
-
const cb =
|
|
200
|
+
const cb = args[args.length - 1]
|
|
168
201
|
|
|
169
202
|
if (abortController.signal.aborted) {
|
|
170
203
|
const error = abortController.signal.reason || new Error('Aborted')
|
|
@@ -179,13 +212,13 @@ function wrapPoolQuery (query) {
|
|
|
179
212
|
}
|
|
180
213
|
|
|
181
214
|
if (typeof cb === 'function') {
|
|
182
|
-
|
|
215
|
+
args[args.length - 1] = shimmer.wrapCallback(cb, cb => function (...args) {
|
|
183
216
|
finish(ctx)
|
|
184
|
-
return cb.apply(this,
|
|
217
|
+
return cb.apply(this, args)
|
|
185
218
|
})
|
|
186
219
|
}
|
|
187
220
|
|
|
188
|
-
const retval = query.apply(this,
|
|
221
|
+
const retval = query.apply(this, args)
|
|
189
222
|
|
|
190
223
|
if (retval?.then) {
|
|
191
224
|
retval.then(() => {
|