@depup/dd-trace 5.97.0-depup.0 → 6.5.0-depup.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE-3rdparty.csv +89 -104
- package/README.electron.md +7 -0
- package/README.md +2 -2
- package/changes.json +1 -1
- package/ci/diagnose.js +2100 -0
- package/ci/init.js +46 -5
- package/ci/runbook.md +198 -0
- package/ci/test-optimization-validation/approval-artifacts.js +143 -0
- package/ci/test-optimization-validation/approval.js +299 -0
- package/ci/test-optimization-validation/artifact-id.js +20 -0
- package/ci/test-optimization-validation/bounded-json.js +121 -0
- package/ci/test-optimization-validation/ci-command-candidate.js +83 -0
- package/ci/test-optimization-validation/ci-discovery.js +181 -0
- package/ci/test-optimization-validation/ci-remediation.js +210 -0
- package/ci/test-optimization-validation/cli.js +903 -0
- package/ci/test-optimization-validation/command-blocker.js +81 -0
- package/ci/test-optimization-validation/command-output-policy.js +206 -0
- package/ci/test-optimization-validation/command-runner.js +707 -0
- package/ci/test-optimization-validation/command-suitability.js +471 -0
- package/ci/test-optimization-validation/executable-approval.js +48 -0
- package/ci/test-optimization-validation/executable.js +480 -0
- package/ci/test-optimization-validation/generated-file-policy.js +63 -0
- package/ci/test-optimization-validation/generated-files.js +351 -0
- package/ci/test-optimization-validation/generated-verifier.js +196 -0
- package/ci/test-optimization-validation/init-probe-preload.js +163 -0
- package/ci/test-optimization-validation/init-probe.js +246 -0
- package/ci/test-optimization-validation/late-initialization.js +63 -0
- package/ci/test-optimization-validation/local-command.js +163 -0
- package/ci/test-optimization-validation/manifest-loader.js +133 -0
- package/ci/test-optimization-validation/manifest-scaffold.js +738 -0
- package/ci/test-optimization-validation/manifest-schema.js +862 -0
- package/ci/test-optimization-validation/offline-fixtures.js +327 -0
- package/ci/test-optimization-validation/offline-output.js +406 -0
- package/ci/test-optimization-validation/payload-normalizer.js +72 -0
- package/ci/test-optimization-validation/plan-writer.js +1120 -0
- package/ci/test-optimization-validation/preflight-runner.js +114 -0
- package/ci/test-optimization-validation/redaction.js +331 -0
- package/ci/test-optimization-validation/report-writer.js +1508 -0
- package/ci/test-optimization-validation/safe-files.js +203 -0
- package/ci/test-optimization-validation/scenarios/auto-test-retries.js +159 -0
- package/ci/test-optimization-validation/scenarios/basic-reporting.js +657 -0
- package/ci/test-optimization-validation/scenarios/ci-wiring.js +780 -0
- package/ci/test-optimization-validation/scenarios/early-flake-detection.js +141 -0
- package/ci/test-optimization-validation/scenarios/helpers.js +539 -0
- package/ci/test-optimization-validation/scenarios/test-management.js +218 -0
- package/ci/test-optimization-validation/setup-runner.js +97 -0
- package/ci/test-optimization-validation/static-diagnosis.js +159 -0
- package/ci/test-optimization-validation/test-output.js +129 -0
- package/ci/test-optimization-validation-manifest.schema.json +1 -0
- package/ci/validate-test-optimization.js +3 -0
- package/ci/vitest-no-worker-init-setup.mjs +430 -0
- package/ext/exporters.js +2 -0
- package/ext/tags.js +3 -0
- package/index.d.ts +436 -252
- package/index.electron.js +3 -0
- package/init.js +18 -0
- package/initialize.mjs +10 -9
- package/loader-hook.mjs +170 -53
- package/openfeature.d.ts +1 -0
- package/openfeature.js +4 -0
- package/package.json +118 -80
- package/packages/datadog-core/src/storage.js +47 -48
- package/packages/datadog-esbuild/index.js +32 -1
- package/packages/datadog-esbuild/src/utils.js +46 -3
- package/packages/datadog-instrumentations/src/aerospike.js +3 -3
- package/packages/datadog-instrumentations/src/ai.js +137 -76
- package/packages/datadog-instrumentations/src/amqplib.js +6 -7
- package/packages/datadog-instrumentations/src/anthropic.js +10 -10
- package/packages/datadog-instrumentations/src/apollo-server-core.js +3 -3
- package/packages/datadog-instrumentations/src/apollo-server.js +10 -18
- package/packages/datadog-instrumentations/src/avsc.js +6 -6
- package/packages/datadog-instrumentations/src/aws-durable-execution-sdk-js-context-methods.js +18 -0
- package/packages/datadog-instrumentations/src/aws-durable-execution-sdk-js.js +111 -0
- package/packages/datadog-instrumentations/src/aws-sdk.js +172 -72
- package/packages/datadog-instrumentations/src/azure-cosmos.js +7 -0
- package/packages/datadog-instrumentations/src/azure-durable-functions.js +8 -8
- package/packages/datadog-instrumentations/src/azure-functions.js +3 -0
- package/packages/datadog-instrumentations/src/bluebird.js +2 -2
- package/packages/datadog-instrumentations/src/body-parser.js +5 -2
- package/packages/datadog-instrumentations/src/cassandra-driver.js +12 -9
- package/packages/datadog-instrumentations/src/child_process.js +16 -16
- package/packages/datadog-instrumentations/src/claude-agent-sdk.js +587 -0
- package/packages/datadog-instrumentations/src/confluentinc-kafka-javascript.js +41 -24
- package/packages/datadog-instrumentations/src/connect.js +14 -12
- package/packages/datadog-instrumentations/src/cookie-parser.js +5 -4
- package/packages/datadog-instrumentations/src/cookie.js +9 -3
- package/packages/datadog-instrumentations/src/couchbase.js +73 -238
- package/packages/datadog-instrumentations/src/crypto.js +49 -4
- package/packages/datadog-instrumentations/src/cucumber-worker-threads.js +25 -0
- package/packages/datadog-instrumentations/src/cucumber.js +762 -189
- package/packages/datadog-instrumentations/src/cypress-config.js +547 -93
- package/packages/datadog-instrumentations/src/cypress.js +5 -3
- package/packages/datadog-instrumentations/src/dns.js +60 -59
- package/packages/datadog-instrumentations/src/elasticsearch.js +9 -12
- package/packages/datadog-instrumentations/src/electron/preload.js +42 -0
- package/packages/datadog-instrumentations/src/electron.js +240 -0
- package/packages/datadog-instrumentations/src/express-mongo-sanitize.js +11 -9
- package/packages/datadog-instrumentations/src/express-session.js +14 -13
- package/packages/datadog-instrumentations/src/express.js +52 -30
- package/packages/datadog-instrumentations/src/fastify.js +166 -87
- package/packages/datadog-instrumentations/src/fetch.js +5 -5
- package/packages/datadog-instrumentations/src/fs.js +22 -20
- package/packages/datadog-instrumentations/src/google-cloud-pubsub.js +5 -7
- package/packages/datadog-instrumentations/src/google-genai.js +4 -4
- package/packages/datadog-instrumentations/src/graphql.js +26 -362
- package/packages/datadog-instrumentations/src/grpc/client.js +48 -32
- package/packages/datadog-instrumentations/src/grpc/server.js +20 -2
- package/packages/datadog-instrumentations/src/hapi.js +2 -2
- package/packages/datadog-instrumentations/src/helpers/callback-instrumentor.js +74 -0
- package/packages/datadog-instrumentations/src/helpers/check-require-cache.js +85 -9
- package/packages/datadog-instrumentations/src/helpers/hook.js +31 -7
- package/packages/datadog-instrumentations/src/helpers/hooks.js +12 -0
- package/packages/datadog-instrumentations/src/helpers/instrument.js +36 -3
- package/packages/datadog-instrumentations/src/helpers/kafka.js +58 -0
- package/packages/datadog-instrumentations/src/helpers/optional-peer-bundler.js +65 -0
- package/packages/datadog-instrumentations/src/helpers/promise-instrumentor.js +42 -0
- package/packages/datadog-instrumentations/src/helpers/promise.js +2 -2
- package/packages/datadog-instrumentations/src/helpers/register.js +7 -5
- package/packages/datadog-instrumentations/src/helpers/rewriter/compiler.js +13 -5
- package/packages/datadog-instrumentations/src/helpers/rewriter/index.js +24 -7
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/ai.js +6 -6
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/aws-durable-execution-sdk-js.js +31 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/azure-cosmos.js +50 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/claude-agent-sdk.js +17 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/graphql.js +201 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/index.js +7 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/langgraph.js +4 -2
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/mercurius.js +31 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/modelcontextprotocol-sdk.js +35 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/instrumentations/playwright.js +111 -0
- package/packages/datadog-instrumentations/src/helpers/rewriter/loader.mjs +18 -2
- package/packages/datadog-instrumentations/src/helpers/rewriter/transforms.js +49 -224
- package/packages/datadog-instrumentations/src/helpers/router-helper.js +8 -8
- package/packages/datadog-instrumentations/src/hono.js +71 -9
- package/packages/datadog-instrumentations/src/http/client.js +48 -24
- package/packages/datadog-instrumentations/src/http/server.js +75 -29
- package/packages/datadog-instrumentations/src/http2/client.js +15 -12
- package/packages/datadog-instrumentations/src/http2/server.js +156 -23
- package/packages/datadog-instrumentations/src/ioredis.js +17 -14
- package/packages/datadog-instrumentations/src/iovalkey.js +1 -2
- package/packages/datadog-instrumentations/src/jest/bail-reporter.js +42 -0
- package/packages/datadog-instrumentations/src/jest/coverage-backfill.js +163 -0
- package/packages/datadog-instrumentations/src/jest.js +1809 -401
- package/packages/datadog-instrumentations/src/kafkajs.js +284 -170
- package/packages/datadog-instrumentations/src/knex.js +17 -17
- package/packages/datadog-instrumentations/src/koa.js +15 -14
- package/packages/datadog-instrumentations/src/ldapjs.js +5 -5
- package/packages/datadog-instrumentations/src/light-my-request.js +2 -2
- package/packages/datadog-instrumentations/src/limitd-client.js +4 -4
- package/packages/datadog-instrumentations/src/lodash.js +4 -4
- package/packages/datadog-instrumentations/src/mariadb.js +18 -16
- package/packages/datadog-instrumentations/src/memcached.js +4 -3
- package/packages/datadog-instrumentations/src/mercurius.js +11 -0
- package/packages/datadog-instrumentations/src/microgateway-core.js +2 -2
- package/packages/datadog-instrumentations/src/mocha/common.js +7 -4
- package/packages/datadog-instrumentations/src/mocha/main.js +557 -120
- package/packages/datadog-instrumentations/src/mocha/utils.js +531 -135
- package/packages/datadog-instrumentations/src/mocha/worker.js +27 -9
- package/packages/datadog-instrumentations/src/modelcontextprotocol-sdk.js +254 -0
- package/packages/datadog-instrumentations/src/mongodb-core.js +43 -31
- package/packages/datadog-instrumentations/src/mongodb.js +82 -8
- package/packages/datadog-instrumentations/src/mongoose.js +46 -37
- package/packages/datadog-instrumentations/src/mquery.js +7 -7
- package/packages/datadog-instrumentations/src/multer.js +5 -4
- package/packages/datadog-instrumentations/src/mysql.js +17 -17
- package/packages/datadog-instrumentations/src/mysql2.js +39 -5
- package/packages/datadog-instrumentations/src/nats.js +182 -0
- package/packages/datadog-instrumentations/src/net.js +19 -11
- package/packages/datadog-instrumentations/src/next.js +68 -10
- package/packages/datadog-instrumentations/src/nyc.js +43 -8
- package/packages/datadog-instrumentations/src/openai.js +124 -38
- package/packages/datadog-instrumentations/src/oracledb.js +12 -7
- package/packages/datadog-instrumentations/src/otel-sdk-trace.js +27 -6
- package/packages/datadog-instrumentations/src/passport-utils.js +5 -5
- package/packages/datadog-instrumentations/src/path-to-regexp.js +44 -0
- package/packages/datadog-instrumentations/src/pg.js +58 -25
- package/packages/datadog-instrumentations/src/pino.js +25 -41
- package/packages/datadog-instrumentations/src/playwright-browser-scripts.js +27 -0
- package/packages/datadog-instrumentations/src/playwright.js +1229 -356
- package/packages/datadog-instrumentations/src/process.js +3 -0
- package/packages/datadog-instrumentations/src/protobufjs.js +16 -16
- package/packages/datadog-instrumentations/src/redis.js +28 -15
- package/packages/datadog-instrumentations/src/restify.js +6 -5
- package/packages/datadog-instrumentations/src/router.js +253 -87
- package/packages/datadog-instrumentations/src/selenium.js +53 -28
- package/packages/datadog-instrumentations/src/stripe.js +47 -33
- package/packages/datadog-instrumentations/src/tedious.js +28 -0
- package/packages/datadog-instrumentations/src/vitest-main-no-worker-init.js +1297 -0
- package/packages/datadog-instrumentations/src/vitest-main.js +1590 -0
- package/packages/datadog-instrumentations/src/vitest-util.js +251 -0
- package/packages/datadog-instrumentations/src/vitest-worker.js +822 -0
- package/packages/datadog-instrumentations/src/vitest.js +11 -1262
- package/packages/datadog-instrumentations/src/winston.js +4 -4
- package/packages/datadog-instrumentations/src/ws.js +9 -8
- package/packages/datadog-instrumentations/src/zlib.js +29 -0
- package/packages/datadog-plugin-ai/src/index.js +1 -1
- package/packages/datadog-plugin-ai/src/tracing.js +66 -3
- package/packages/datadog-plugin-ai/src/utils.js +17 -4
- package/packages/datadog-plugin-apollo/src/gateway/request.js +1 -21
- package/packages/datadog-plugin-avsc/src/schema_iterator.js +3 -3
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/checkpoint.js +31 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/client.js +55 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/context.js +123 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/handler.js +129 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/index.js +19 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/trace-checkpoint.js +224 -0
- package/packages/datadog-plugin-aws-durable-execution-sdk-js/src/util.js +80 -0
- package/packages/datadog-plugin-aws-sdk/src/base.js +86 -50
- package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/tracing.js +1 -1
- package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/utils.js +218 -4
- package/packages/datadog-plugin-aws-sdk/src/services/cloudwatchlogs.js +1 -1
- package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js +2 -1
- package/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js +59 -14
- package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js +174 -75
- package/packages/datadog-plugin-aws-sdk/src/services/lambda.js +34 -23
- package/packages/datadog-plugin-aws-sdk/src/services/redshift.js +2 -1
- package/packages/datadog-plugin-aws-sdk/src/services/s3.js +1 -1
- package/packages/datadog-plugin-aws-sdk/src/services/sns.js +26 -26
- package/packages/datadog-plugin-aws-sdk/src/services/sqs.js +187 -101
- package/packages/datadog-plugin-aws-sdk/src/services/stepfunctions.js +20 -18
- package/packages/datadog-plugin-aws-sdk/src/util.js +2 -2
- package/packages/datadog-plugin-azure-cosmos/src/index.js +144 -0
- package/packages/datadog-plugin-azure-event-hubs/src/producer.js +8 -15
- package/packages/datadog-plugin-azure-functions/src/index.js +7 -3
- package/packages/datadog-plugin-azure-service-bus/src/producer.js +5 -10
- package/packages/datadog-plugin-bullmq/src/consumer.js +5 -4
- package/packages/datadog-plugin-bullmq/src/filter.js +35 -0
- package/packages/datadog-plugin-bullmq/src/producer.js +121 -33
- package/packages/datadog-plugin-bunyan/src/index.js +28 -0
- package/packages/datadog-plugin-child_process/src/index.js +13 -2
- package/packages/datadog-plugin-child_process/src/scrub-cmd-params.js +6 -6
- package/packages/datadog-plugin-claude-agent-sdk/src/index.js +31 -0
- package/packages/datadog-plugin-claude-agent-sdk/src/tracing.js +107 -0
- package/packages/datadog-plugin-claude-agent-sdk/src/util.js +15 -0
- package/packages/datadog-plugin-couchbase/src/index.js +58 -52
- package/packages/datadog-plugin-cucumber/src/index.js +47 -29
- package/packages/datadog-plugin-cypress/src/cypress-plugin.js +929 -98
- package/packages/datadog-plugin-cypress/src/index.js +109 -2
- package/packages/datadog-plugin-cypress/src/plugin.js +6 -14
- package/packages/datadog-plugin-cypress/src/source-map-utils.js +48 -1
- package/packages/datadog-plugin-cypress/src/support.js +272 -51
- package/packages/datadog-plugin-dd-trace-api/src/index.js +1 -1
- package/packages/datadog-plugin-dns/src/lookup.js +8 -6
- package/packages/datadog-plugin-elasticsearch/src/index.js +28 -8
- package/packages/datadog-plugin-electron/src/index.js +17 -0
- package/packages/datadog-plugin-electron/src/ipc.js +143 -0
- package/packages/datadog-plugin-electron/src/net.js +82 -0
- package/packages/datadog-plugin-express/src/code_origin.js +1 -1
- package/packages/datadog-plugin-fastify/src/code_origin.js +1 -1
- package/packages/datadog-plugin-fs/src/index.js +2 -1
- package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js +2 -5
- package/packages/datadog-plugin-google-cloud-pubsub/src/producer.js +27 -18
- package/packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js +5 -8
- package/packages/datadog-plugin-graphql/src/execute.js +748 -34
- package/packages/datadog-plugin-graphql/src/index.js +43 -9
- package/packages/datadog-plugin-graphql/src/parse.js +45 -4
- package/packages/datadog-plugin-graphql/src/request.js +135 -0
- package/packages/datadog-plugin-graphql/src/tools/signature.js +32 -7
- package/packages/datadog-plugin-graphql/src/tools/transforms.js +118 -100
- package/packages/datadog-plugin-graphql/src/utils.js +261 -3
- package/packages/datadog-plugin-graphql/src/validate.js +54 -8
- package/packages/datadog-plugin-grpc/src/client.js +7 -8
- package/packages/datadog-plugin-grpc/src/server.js +1 -1
- package/packages/datadog-plugin-grpc/src/util.js +57 -22
- package/packages/datadog-plugin-http/src/client.js +12 -14
- package/packages/datadog-plugin-http/src/index.js +6 -8
- package/packages/datadog-plugin-http/src/server.js +63 -20
- package/packages/datadog-plugin-http2/src/client.js +7 -4
- package/packages/datadog-plugin-http2/src/server.js +48 -8
- package/packages/datadog-plugin-jest/src/index.js +133 -67
- package/packages/datadog-plugin-jest/src/util.js +37 -16
- package/packages/datadog-plugin-kafkajs/src/batch-consumer.js +1 -1
- package/packages/datadog-plugin-kafkajs/src/consumer.js +2 -9
- package/packages/datadog-plugin-kafkajs/src/producer.js +37 -8
- package/packages/datadog-plugin-langchain/src/handlers/embedding.js +2 -1
- package/packages/datadog-plugin-langchain/src/handlers/language_models.js +2 -1
- package/packages/datadog-plugin-langchain/src/tokens.js +2 -2
- package/packages/datadog-plugin-langgraph/src/stream.js +1 -1
- package/packages/datadog-plugin-memcached/src/index.js +1 -1
- package/packages/datadog-plugin-mocha/src/index.js +66 -20
- package/packages/datadog-plugin-modelcontextprotocol-sdk/src/index.js +24 -0
- package/packages/datadog-plugin-modelcontextprotocol-sdk/src/tracing.js +173 -0
- package/packages/datadog-plugin-modelcontextprotocol-sdk/src/utils.js +30 -0
- package/packages/datadog-plugin-mongodb-core/src/bulk-write.js +43 -0
- package/packages/datadog-plugin-mongodb-core/src/index.js +8 -206
- package/packages/datadog-plugin-mongodb-core/src/query.js +452 -0
- package/packages/datadog-plugin-mysql/src/index.js +9 -4
- package/packages/datadog-plugin-nats/src/consumer.js +43 -0
- package/packages/datadog-plugin-nats/src/index.js +20 -0
- package/packages/datadog-plugin-nats/src/producer.js +62 -0
- package/packages/datadog-plugin-nats/src/util.js +33 -0
- package/packages/datadog-plugin-next/src/index.js +12 -4
- package/packages/datadog-plugin-openai/src/services.js +4 -3
- package/packages/datadog-plugin-openai/src/tracing.js +27 -25
- package/packages/datadog-plugin-oracledb/src/index.js +13 -2
- package/packages/datadog-plugin-pg/src/index.js +13 -3
- package/packages/datadog-plugin-pino/src/index.js +42 -0
- package/packages/datadog-plugin-playwright/src/index.js +195 -72
- package/packages/datadog-plugin-protobufjs/src/schema_iterator.js +3 -3
- package/packages/datadog-plugin-redis/src/index.js +54 -25
- package/packages/datadog-plugin-rhea/src/producer.js +1 -1
- package/packages/datadog-plugin-router/src/index.js +55 -44
- package/packages/datadog-plugin-selenium/src/index.js +5 -36
- package/packages/datadog-plugin-tedious/src/index.js +1 -1
- package/packages/datadog-plugin-undici/src/index.js +24 -2
- package/packages/datadog-plugin-vitest/src/index.js +160 -90
- package/packages/datadog-plugin-winston/src/index.js +30 -0
- package/packages/datadog-plugin-ws/src/close.js +5 -2
- package/packages/datadog-plugin-ws/src/producer.js +4 -1
- package/packages/datadog-plugin-ws/src/receiver.js +4 -2
- package/packages/datadog-plugin-ws/src/server.js +2 -1
- package/packages/datadog-shimmer/src/shimmer.js +101 -39
- package/packages/datadog-webpack/index.js +17 -1
- package/packages/datadog-webpack/src/optional-peer-loader.js +17 -0
- package/packages/dd-trace/index.electron.js +3 -0
- package/packages/dd-trace/index.js +2 -36
- package/packages/dd-trace/src/aiguard/channels.js +7 -0
- package/packages/dd-trace/src/aiguard/index.js +16 -34
- package/packages/dd-trace/src/aiguard/integrations/evaluate.js +46 -0
- package/packages/dd-trace/src/aiguard/integrations/index.js +34 -0
- package/packages/dd-trace/src/aiguard/integrations/openai.js +80 -0
- package/packages/dd-trace/src/aiguard/integrations/vercel-ai.js +92 -0
- package/packages/dd-trace/src/aiguard/messages/openai.js +382 -0
- package/packages/{datadog-instrumentations/src/helpers/ai-messages.js → dd-trace/src/aiguard/messages/vercel-ai.js} +30 -27
- package/packages/dd-trace/src/aiguard/sdk.js +148 -55
- package/packages/dd-trace/src/aiguard/tags.js +26 -10
- package/packages/dd-trace/src/appsec/api_security/index.js +55 -0
- package/packages/dd-trace/src/appsec/api_security/sampler.js +147 -0
- package/packages/dd-trace/src/appsec/blocked_templates.js +4 -3
- package/packages/dd-trace/src/appsec/blocking.js +82 -42
- package/packages/dd-trace/src/appsec/channels.js +5 -1
- package/packages/dd-trace/src/appsec/downstream_requests.js +116 -62
- package/packages/dd-trace/src/appsec/graphql.js +20 -17
- package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-rules.js +1 -1
- package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-secret-rules.js +81 -81
- package/packages/dd-trace/src/appsec/iast/analyzers/nosql-injection-mongodb-analyzer.js +23 -23
- package/packages/dd-trace/src/appsec/iast/index.js +3 -2
- package/packages/dd-trace/src/appsec/iast/security-controls/index.js +4 -4
- package/packages/dd-trace/src/appsec/iast/taint-tracking/plugin.js +2 -2
- package/packages/dd-trace/src/appsec/iast/taint-tracking/plugins/kafka.js +2 -2
- package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js +4 -4
- package/packages/dd-trace/src/appsec/iast/taint-tracking/taint-tracking-impl.js +2 -2
- package/packages/dd-trace/src/appsec/iast/telemetry/index.js +2 -1
- package/packages/dd-trace/src/appsec/iast/telemetry/span-tags.js +3 -1
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/ldap-sensitive-analyzer.js +54 -12
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/url-sensitive-analyzer.js +5 -1
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-handler.js +31 -4
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/index.js +1 -3
- package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/utils.js +83 -48
- package/packages/dd-trace/src/appsec/iast/vulnerability-reporter.js +1 -1
- package/packages/dd-trace/src/appsec/index.js +65 -47
- package/packages/dd-trace/src/appsec/lambda.js +135 -0
- package/packages/dd-trace/src/appsec/rasp/command_injection.js +4 -5
- package/packages/dd-trace/src/appsec/rasp/lfi.js +8 -4
- package/packages/dd-trace/src/appsec/rasp/sql_injection.js +5 -10
- package/packages/dd-trace/src/appsec/rasp/ssrf.js +26 -18
- package/packages/dd-trace/src/appsec/recommended.json +2438 -13
- package/packages/dd-trace/src/appsec/reporter.js +87 -28
- package/packages/dd-trace/src/appsec/rule_manager.js +4 -2
- package/packages/dd-trace/src/appsec/sdk/set_user.js +1 -1
- package/packages/dd-trace/src/appsec/sdk/track_event.js +5 -5
- package/packages/dd-trace/src/appsec/sdk/user_blocking.js +7 -11
- package/packages/dd-trace/src/appsec/sdk/utils.js +5 -3
- package/packages/dd-trace/src/appsec/store.js +50 -0
- package/packages/dd-trace/src/appsec/telemetry/api_security.js +34 -0
- package/packages/dd-trace/src/appsec/telemetry/index.js +27 -1
- package/packages/dd-trace/src/appsec/user_tracking.js +5 -4
- package/packages/dd-trace/src/appsec/waf/index.js +19 -9
- package/packages/dd-trace/src/appsec/waf/waf_context_wrapper.js +35 -20
- package/packages/dd-trace/src/appsec/waf/waf_manager.js +1 -1
- package/packages/dd-trace/src/azure_metadata.js +19 -7
- package/packages/dd-trace/src/baggage.js +32 -13
- package/packages/dd-trace/src/bootstrap.js +39 -0
- package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/index.js +123 -33
- package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/worker/index.js +122 -24
- package/packages/dd-trace/src/ci-visibility/early-flake-detection/get-known-tests.js +22 -7
- package/packages/dd-trace/src/ci-visibility/exporters/agent-proxy/index.js +5 -2
- package/packages/dd-trace/src/ci-visibility/exporters/agentless/coverage-writer.js +2 -2
- package/packages/dd-trace/src/ci-visibility/exporters/agentless/di-logs-writer.js +2 -2
- package/packages/dd-trace/src/ci-visibility/exporters/agentless/index.js +6 -2
- package/packages/dd-trace/src/ci-visibility/exporters/agentless/writer.js +2 -2
- package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/index.js +160 -0
- package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/msgpack-to-json.js +288 -0
- package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/payload-projection.js +84 -0
- package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/sink.js +369 -0
- package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/writer.js +60 -0
- package/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js +188 -27
- package/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js +3 -4
- package/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js +28 -10
- package/packages/dd-trace/src/ci-visibility/exporters/test-worker/writer.js +22 -0
- package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites.js +110 -22
- package/packages/dd-trace/src/ci-visibility/lage.js +2 -1
- package/packages/dd-trace/src/ci-visibility/log-submission/log-submission-plugin.js +4 -5
- package/packages/dd-trace/src/ci-visibility/requests/fs-cache.js +4 -5
- package/packages/dd-trace/src/ci-visibility/requests/get-library-configuration.js +73 -55
- package/packages/dd-trace/src/ci-visibility/requests/request.js +14 -50
- package/packages/dd-trace/src/ci-visibility/requests/upload-coverage-report.js +10 -6
- package/packages/dd-trace/src/ci-visibility/requests/upload-test-screenshot.js +156 -0
- package/packages/dd-trace/src/ci-visibility/rum.js +7 -0
- package/packages/dd-trace/src/ci-visibility/test-api-manual/test-api-manual-plugin.js +9 -3
- package/packages/dd-trace/src/ci-visibility/test-management/get-test-management-tests.js +24 -6
- package/packages/dd-trace/src/ci-visibility/test-optimization-cache.js +70 -6
- package/packages/dd-trace/src/ci-visibility/test-optimization-http-cache-schema.js +256 -0
- package/packages/dd-trace/src/ci-visibility/test-optimization-http-cache.js +451 -0
- package/packages/dd-trace/src/ci-visibility/test-screenshot.js +90 -0
- package/packages/dd-trace/src/config/config-types.d.ts +8 -6
- package/packages/dd-trace/src/config/defaults.js +71 -44
- package/packages/dd-trace/src/config/generated-config-types.d.ts +692 -131
- package/packages/dd-trace/src/config/git_properties.js +2 -2
- package/packages/dd-trace/src/config/helper.js +140 -33
- package/packages/dd-trace/src/config/index.js +127 -131
- package/packages/dd-trace/src/config/major-overrides.js +100 -0
- package/packages/dd-trace/src/config/normalize-service.js +31 -0
- package/packages/dd-trace/src/config/parsers.js +138 -10
- package/packages/dd-trace/src/config/remote_config.js +1 -1
- package/packages/dd-trace/src/config/supported-configurations.json +460 -203
- package/packages/dd-trace/src/constants.js +15 -0
- package/packages/dd-trace/src/crashtracking/crashtracker.js +18 -6
- package/packages/dd-trace/src/datastreams/checkpointer.js +6 -12
- package/packages/dd-trace/src/datastreams/context.js +4 -2
- package/packages/dd-trace/src/datastreams/encoding.js +39 -28
- package/packages/dd-trace/src/datastreams/index.js +2 -1
- package/packages/dd-trace/src/datastreams/manager.js +1 -1
- package/packages/dd-trace/src/datastreams/pathway.js +35 -30
- package/packages/dd-trace/src/datastreams/processor.js +31 -22
- package/packages/dd-trace/src/datastreams/size.js +6 -2
- package/packages/dd-trace/src/datastreams/writer.js +15 -6
- package/packages/dd-trace/src/debugger/config.js +9 -4
- package/packages/dd-trace/src/debugger/devtools_client/breakpoints.js +49 -35
- package/packages/dd-trace/src/debugger/devtools_client/condition.js +5 -8
- package/packages/dd-trace/src/debugger/devtools_client/config.js +3 -2
- package/packages/dd-trace/src/debugger/devtools_client/index.js +33 -71
- package/packages/dd-trace/src/debugger/devtools_client/probe_sampler.js +83 -0
- package/packages/dd-trace/src/debugger/devtools_client/send.js +27 -6
- package/packages/dd-trace/src/debugger/devtools_client/snapshot/collector.js +2 -2
- package/packages/dd-trace/src/debugger/devtools_client/snapshot/processor.js +5 -2
- package/packages/dd-trace/src/debugger/devtools_client/snapshot-pruner.js +1 -0
- package/packages/dd-trace/src/debugger/devtools_client/source-maps.js +1 -1
- package/packages/dd-trace/src/debugger/devtools_client/state.js +3 -1
- package/packages/dd-trace/src/debugger/index.js +13 -9
- package/packages/dd-trace/src/debugger/probe_sampler.js +112 -0
- package/packages/dd-trace/src/debugger/probe_sampler_constants.js +19 -0
- package/packages/dd-trace/src/dogstatsd.js +34 -28
- package/packages/dd-trace/src/encode/0.4.js +829 -268
- package/packages/dd-trace/src/encode/0.5.js +158 -22
- package/packages/dd-trace/src/encode/agentless-ci-visibility.js +141 -65
- package/packages/dd-trace/src/encode/agentless-json.js +12 -6
- package/packages/dd-trace/src/encode/coverage-ci-visibility.js +52 -15
- package/packages/dd-trace/src/encode/span-stats.js +19 -16
- package/packages/dd-trace/src/encode/tags-processors.js +30 -25
- package/packages/dd-trace/src/exporter.js +5 -1
- package/packages/dd-trace/src/exporters/agent/index.js +4 -5
- package/packages/dd-trace/src/exporters/agent/writer.js +1 -2
- package/packages/dd-trace/src/exporters/agentless/index.js +12 -13
- package/packages/dd-trace/src/exporters/agentless/intake.js +43 -0
- package/packages/dd-trace/src/exporters/agentless/writer.js +12 -11
- package/packages/dd-trace/src/exporters/common/agents.js +3 -1
- package/packages/dd-trace/src/exporters/common/buffering-exporter.js +3 -3
- package/packages/dd-trace/src/exporters/common/client-library-headers.js +21 -0
- package/packages/dd-trace/src/exporters/common/request.js +93 -44
- package/packages/dd-trace/src/exporters/common/retry.js +104 -0
- package/packages/dd-trace/src/exporters/common/url.js +48 -0
- package/packages/dd-trace/src/exporters/common/util.js +2 -2
- package/packages/dd-trace/src/exporters/common/writer.js +17 -1
- package/packages/dd-trace/src/exporters/electron/index.js +49 -0
- package/packages/dd-trace/src/exporters/span-stats/index.js +1 -2
- package/packages/dd-trace/src/exporters/span-stats/writer.js +1 -3
- package/packages/dd-trace/src/external-logger/src/index.js +2 -1
- package/packages/dd-trace/src/feature-registry.js +29 -0
- package/packages/dd-trace/src/git_metadata.js +68 -0
- package/packages/dd-trace/src/git_metadata_tagger.js +13 -5
- package/packages/dd-trace/src/guardrails/index.js +11 -6
- package/packages/dd-trace/src/guardrails/telemetry.js +40 -3
- package/packages/dd-trace/src/heap_snapshots.js +4 -4
- package/packages/dd-trace/src/id.js +46 -27
- package/packages/dd-trace/src/index.js +7 -8
- package/packages/dd-trace/src/lambda/handler-paths.js +52 -0
- package/packages/dd-trace/src/lambda/handler.js +2 -6
- package/packages/dd-trace/src/lambda/index.js +62 -14
- package/packages/dd-trace/src/lambda/runtime/patch.js +21 -46
- package/packages/dd-trace/src/llmobs/constants/tags.js +13 -0
- package/packages/dd-trace/src/llmobs/experiments/client.js +113 -0
- package/packages/dd-trace/src/llmobs/experiments/dataset.js +154 -0
- package/packages/dd-trace/src/llmobs/experiments/experiment.js +283 -0
- package/packages/dd-trace/src/llmobs/experiments/index.js +152 -0
- package/packages/dd-trace/src/llmobs/experiments/noop.js +30 -0
- package/packages/dd-trace/src/llmobs/experiments/result.js +34 -0
- package/packages/dd-trace/src/llmobs/index.js +37 -7
- package/packages/dd-trace/src/llmobs/noop.js +6 -0
- package/packages/dd-trace/src/llmobs/plugins/ai/ddTelemetry.js +403 -0
- package/packages/dd-trace/src/llmobs/plugins/ai/index.js +8 -395
- package/packages/dd-trace/src/llmobs/plugins/ai/util.js +119 -7
- package/packages/dd-trace/src/llmobs/plugins/ai/vercelTelemetry.js +380 -0
- package/packages/dd-trace/src/llmobs/plugins/{anthropic.js → anthropic/index.js} +32 -79
- package/packages/dd-trace/src/llmobs/plugins/anthropic/util.js +109 -0
- package/packages/dd-trace/src/llmobs/plugins/base.js +4 -4
- package/packages/dd-trace/src/llmobs/plugins/bedrockruntime.js +89 -37
- package/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/index.js +270 -0
- package/packages/dd-trace/src/llmobs/plugins/claude-agent-sdk/utils.js +10 -0
- package/packages/dd-trace/src/llmobs/plugins/genai/index.js +5 -1
- package/packages/dd-trace/src/llmobs/plugins/genai/util.js +81 -16
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/chain.js +3 -2
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/chat_model.js +3 -2
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/embedding.js +2 -1
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/index.js +1 -50
- package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/vectorstore.js +2 -1
- package/packages/dd-trace/src/llmobs/plugins/langchain/index.js +14 -8
- package/packages/dd-trace/src/llmobs/plugins/langchain/messages.js +76 -0
- package/packages/dd-trace/src/llmobs/plugins/langgraph/index.js +4 -29
- package/packages/dd-trace/src/llmobs/plugins/modelcontextprotocol-sdk/index.js +68 -0
- package/packages/dd-trace/src/llmobs/plugins/modelcontextprotocol-sdk/utils.js +57 -0
- package/packages/dd-trace/src/llmobs/plugins/openai/constants.js +8 -0
- package/packages/dd-trace/src/llmobs/plugins/openai/index.js +68 -64
- package/packages/dd-trace/src/llmobs/plugins/openai/utils.js +43 -0
- package/packages/dd-trace/src/llmobs/sdk.js +73 -35
- package/packages/dd-trace/src/llmobs/span_processor.js +90 -11
- package/packages/dd-trace/src/llmobs/tagger.js +197 -4
- package/packages/dd-trace/src/llmobs/telemetry.js +33 -2
- package/packages/dd-trace/src/llmobs/util.js +234 -9
- package/packages/dd-trace/src/llmobs/writers/base.js +11 -5
- package/packages/dd-trace/src/llmobs/writers/spans.js +1 -1
- package/packages/dd-trace/src/llmobs/writers/util.js +1 -2
- package/packages/dd-trace/src/log/index.js +19 -31
- package/packages/dd-trace/src/log/writer.js +3 -1
- package/packages/dd-trace/src/msgpack/chunk.js +430 -11
- package/packages/dd-trace/src/msgpack/index.js +101 -2
- package/packages/dd-trace/src/noop/proxy.js +5 -4
- package/packages/dd-trace/src/noop/span.js +3 -1
- package/packages/dd-trace/src/openfeature/agentless_configuration_source.js +322 -0
- package/packages/dd-trace/src/openfeature/configuration_source.js +90 -0
- package/packages/dd-trace/src/openfeature/encoding.js +70 -0
- package/packages/dd-trace/src/openfeature/eval-metrics-hook.js +103 -0
- package/packages/dd-trace/src/openfeature/flagging_provider.js +32 -16
- package/packages/dd-trace/src/openfeature/index.js +0 -2
- package/packages/dd-trace/src/openfeature/noop.js +41 -64
- package/packages/dd-trace/src/openfeature/register.js +35 -0
- package/packages/dd-trace/src/openfeature/remote_config.js +16 -14
- package/packages/dd-trace/src/openfeature/require-provider.js +18 -0
- package/packages/dd-trace/src/openfeature/span-enrichment-hook.js +143 -0
- package/packages/dd-trace/src/openfeature/span-enrichment.js +149 -0
- package/packages/dd-trace/src/openfeature/writers/base.js +3 -11
- package/packages/dd-trace/src/openfeature/writers/exposures.js +82 -70
- package/packages/dd-trace/src/openfeature/writers/util.js +1 -2
- package/packages/dd-trace/src/opentelemetry/active-span-proxy.js +42 -0
- package/packages/dd-trace/src/opentelemetry/bridge-span-base.js +107 -0
- package/packages/dd-trace/src/opentelemetry/context_manager.js +27 -13
- package/packages/dd-trace/src/opentelemetry/logs/index.js +6 -6
- package/packages/dd-trace/src/opentelemetry/logs/otlp_http_log_exporter.js +3 -2
- package/packages/dd-trace/src/opentelemetry/metrics/index.js +61 -12
- package/packages/dd-trace/src/opentelemetry/metrics/instruments.js +28 -14
- package/packages/dd-trace/src/opentelemetry/metrics/meter.js +7 -10
- package/packages/dd-trace/src/opentelemetry/metrics/otlp_http_metric_exporter.js +3 -2
- package/packages/dd-trace/src/opentelemetry/metrics/otlp_span_stats_exporter.js +40 -0
- package/packages/dd-trace/src/opentelemetry/metrics/otlp_span_stats_transformer.js +169 -0
- package/packages/dd-trace/src/opentelemetry/metrics/periodic_metric_reader.js +99 -5
- package/packages/dd-trace/src/opentelemetry/metrics/time.js +19 -0
- package/packages/dd-trace/src/opentelemetry/otlp/common.proto +2 -2
- package/packages/dd-trace/src/opentelemetry/otlp/logs.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/logs_service.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/metrics.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/metrics_service.proto +1 -1
- package/packages/dd-trace/src/opentelemetry/otlp/otlp_http_exporter_base.js +56 -82
- package/packages/dd-trace/src/opentelemetry/otlp/otlp_transformer_base.js +1 -2
- package/packages/dd-trace/src/opentelemetry/otlp/protobuf_loader.js +14 -2
- package/packages/dd-trace/src/opentelemetry/otlp/trace.proto +358 -0
- package/packages/dd-trace/src/opentelemetry/otlp/trace_service.proto +78 -0
- package/packages/dd-trace/src/opentelemetry/span-ending-hook.js +10 -0
- package/packages/dd-trace/src/opentelemetry/span-helpers.js +325 -0
- package/packages/dd-trace/src/opentelemetry/span.js +64 -109
- package/packages/dd-trace/src/opentelemetry/span_context.js +1 -0
- package/packages/dd-trace/src/opentelemetry/span_processor.js +7 -5
- package/packages/dd-trace/src/opentelemetry/trace/index.js +75 -0
- package/packages/dd-trace/src/opentelemetry/trace/otlp_http_trace_exporter.js +75 -0
- package/packages/dd-trace/src/opentelemetry/trace/otlp_transformer.js +375 -0
- package/packages/dd-trace/src/opentelemetry/tracer.js +20 -69
- package/packages/dd-trace/src/opentelemetry/tracer_provider.js +33 -17
- package/packages/dd-trace/src/opentracing/propagation/log.js +28 -8
- package/packages/dd-trace/src/opentracing/propagation/text_map.js +278 -148
- package/packages/dd-trace/src/opentracing/propagation/text_map_dsm.js +11 -11
- package/packages/dd-trace/src/opentracing/propagation/tracestate.js +98 -32
- package/packages/dd-trace/src/opentracing/span.js +127 -73
- package/packages/dd-trace/src/opentracing/span_context.js +68 -3
- package/packages/dd-trace/src/opentracing/tracer.js +46 -19
- package/packages/dd-trace/src/payload-tagging/config/index.js +2 -2
- package/packages/dd-trace/src/plugin_manager.js +36 -14
- package/packages/dd-trace/src/plugins/apollo.js +3 -1
- package/packages/dd-trace/src/plugins/ci_plugin.js +407 -91
- package/packages/dd-trace/src/plugins/database.js +61 -18
- package/packages/dd-trace/src/plugins/index.js +14 -0
- package/packages/dd-trace/src/plugins/log_injection.js +56 -0
- package/packages/dd-trace/src/plugins/log_plugin.js +4 -44
- package/packages/dd-trace/src/plugins/outbound.js +1 -1
- package/packages/dd-trace/src/plugins/plugin.js +19 -28
- package/packages/dd-trace/src/plugins/storage.js +2 -2
- package/packages/dd-trace/src/plugins/tracing.js +70 -13
- package/packages/dd-trace/src/plugins/util/ci.js +127 -40
- package/packages/dd-trace/src/plugins/util/git-cache.js +23 -23
- package/packages/dd-trace/src/plugins/util/git.js +6 -3
- package/packages/dd-trace/src/plugins/util/http-otel-semantics.js +276 -0
- package/packages/dd-trace/src/plugins/util/inferred_proxy.js +29 -5
- package/packages/dd-trace/src/plugins/util/llm.js +6 -1
- package/packages/dd-trace/src/plugins/util/stacktrace.js +2 -2
- package/packages/dd-trace/src/plugins/util/test.js +950 -69
- package/packages/dd-trace/src/plugins/util/url.js +71 -5
- package/packages/dd-trace/src/plugins/util/user-provided-git.js +18 -16
- package/packages/dd-trace/src/plugins/util/web.js +116 -180
- package/packages/dd-trace/src/priority_sampler.js +12 -21
- package/packages/dd-trace/src/profiling/config.js +132 -212
- package/packages/dd-trace/src/profiling/constants.js +4 -7
- package/packages/dd-trace/src/profiling/exporter_cli.js +10 -10
- package/packages/dd-trace/src/profiling/exporters/agent.js +61 -28
- package/packages/dd-trace/src/profiling/exporters/event_serializer.js +45 -14
- package/packages/dd-trace/src/profiling/exporters/file.js +16 -5
- package/packages/dd-trace/src/profiling/oom.js +71 -0
- package/packages/dd-trace/src/profiling/profiler.js +84 -105
- package/packages/dd-trace/src/profiling/profilers/event_plugins/crypto.js +32 -0
- package/packages/dd-trace/src/profiling/profilers/event_plugins/zlib.js +19 -0
- package/packages/dd-trace/src/profiling/profilers/events.js +57 -13
- package/packages/dd-trace/src/profiling/profilers/space.js +27 -16
- package/packages/dd-trace/src/profiling/profilers/wall.js +49 -35
- package/packages/dd-trace/src/profiling/ssi-heuristics.js +3 -3
- package/packages/dd-trace/src/propagation-hash/index.js +1 -1
- package/packages/dd-trace/src/proxy.js +128 -37
- package/packages/dd-trace/src/rate_limiter.js +1 -1
- package/packages/dd-trace/src/remote_config/index.js +6 -5
- package/packages/dd-trace/src/remote_config/scheduler.js +1 -1
- package/packages/dd-trace/src/ritm.js +6 -3
- package/packages/dd-trace/src/runtime_metrics/client.js +30 -0
- package/packages/dd-trace/src/runtime_metrics/index.js +14 -4
- package/packages/dd-trace/src/runtime_metrics/otlp_runtime_metrics.js +284 -0
- package/packages/dd-trace/src/runtime_metrics/runtime_metrics.js +42 -41
- package/packages/dd-trace/src/sampling_rule.js +7 -7
- package/packages/dd-trace/src/scope.js +10 -15
- package/packages/dd-trace/src/serverless.js +6 -7
- package/packages/dd-trace/src/service-naming/extra-services.js +14 -0
- package/packages/dd-trace/src/service-naming/index.js +1 -1
- package/packages/dd-trace/src/service-naming/schemas/definition.js +4 -1
- package/packages/dd-trace/src/service-naming/schemas/util.js +48 -3
- package/packages/dd-trace/src/service-naming/schemas/v0/graphql.js +6 -0
- package/packages/dd-trace/src/service-naming/schemas/v0/messaging.js +61 -2
- package/packages/dd-trace/src/service-naming/schemas/v0/serverless.js +12 -0
- package/packages/dd-trace/src/service-naming/schemas/v0/storage.js +60 -0
- package/packages/dd-trace/src/service-naming/schemas/v0/web.js +25 -1
- package/packages/dd-trace/src/service-naming/schemas/v0/websocket.js +5 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/graphql.js +8 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/messaging.js +32 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/serverless.js +12 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/storage.js +17 -0
- package/packages/dd-trace/src/service-naming/schemas/v1/web.js +23 -3
- package/packages/dd-trace/src/service-naming/schemas/v1/websocket.js +6 -0
- package/packages/dd-trace/src/service-naming/source-resolver.js +50 -0
- package/packages/dd-trace/src/span_format.js +269 -81
- package/packages/dd-trace/src/span_processor.js +18 -13
- package/packages/dd-trace/src/span_stats.js +101 -79
- package/packages/dd-trace/src/spanleak.js +1 -2
- package/packages/dd-trace/src/standalone/index.js +0 -36
- package/packages/dd-trace/src/startup-log.js +3 -3
- package/packages/dd-trace/src/tagger.js +2 -4
- package/packages/dd-trace/src/telemetry/dependencies.js +2 -2
- package/packages/dd-trace/src/telemetry/endpoints.js +7 -5
- package/packages/dd-trace/src/telemetry/index.js +2 -2
- package/packages/dd-trace/src/telemetry/logs/index.js +1 -1
- package/packages/dd-trace/src/telemetry/send-data.js +22 -22
- package/packages/dd-trace/src/telemetry/session-propagation.js +1 -1
- package/packages/dd-trace/src/telemetry/telemetry.js +16 -14
- package/packages/dd-trace/src/tracer.js +23 -9
- package/packages/dd-trace/src/tracer_metadata.js +1 -1
- package/packages/dd-trace/src/util.js +57 -0
- package/register.js +58 -1
- package/vendor/dist/@apm-js-collab/code-transformer/index.js +94 -42
- package/vendor/dist/@datadog/sketches-js/LICENSE +10 -36
- package/vendor/dist/@datadog/sketches-js/index.js +1 -1
- package/vendor/dist/pprof-format/index.js +1 -1
- package/vendor/dist/protobufjs/index.js +1 -1
- package/vendor/dist/protobufjs/minimal/index.js +1 -1
- package/vendor/dist/shell-quote/index.js +1 -1
- package/packages/datadog-plugin-graphql/src/resolve.js +0 -178
- package/packages/dd-trace/src/agent/url.js +0 -28
- package/packages/dd-trace/src/appsec/api_security_sampler.js +0 -117
- package/packages/dd-trace/src/lambda/runtime/ritm.js +0 -133
- package/packages/dd-trace/src/log/utils.js +0 -16
- package/packages/dd-trace/src/msgpack/encoder.js +0 -308
- package/packages/dd-trace/src/plugins/structured_log_plugin.js +0 -9
- package/scripts/preinstall.js +0 -34
- package/vendor/dist/ignore/LICENSE +0 -21
- package/vendor/dist/ignore/index.js +0 -1
- package/vendor/dist/opentracing/LICENSE +0 -201
- package/vendor/dist/opentracing/binary_carrier.d.ts +0 -11
- package/vendor/dist/opentracing/constants.d.ts +0 -61
- package/vendor/dist/opentracing/examples/demo/demo.d.ts +0 -2
- package/vendor/dist/opentracing/ext/tags.d.ts +0 -90
- package/vendor/dist/opentracing/functions.d.ts +0 -20
- package/vendor/dist/opentracing/global_tracer.d.ts +0 -14
- package/vendor/dist/opentracing/index.d.ts +0 -12
- package/vendor/dist/opentracing/index.js +0 -1
- package/vendor/dist/opentracing/mock_tracer/index.d.ts +0 -5
- package/vendor/dist/opentracing/mock_tracer/mock_context.d.ts +0 -13
- package/vendor/dist/opentracing/mock_tracer/mock_report.d.ts +0 -16
- package/vendor/dist/opentracing/mock_tracer/mock_span.d.ts +0 -50
- package/vendor/dist/opentracing/mock_tracer/mock_tracer.d.ts +0 -26
- package/vendor/dist/opentracing/noop.d.ts +0 -8
- package/vendor/dist/opentracing/reference.d.ts +0 -33
- package/vendor/dist/opentracing/span.d.ts +0 -147
- package/vendor/dist/opentracing/span_context.d.ts +0 -26
- package/vendor/dist/opentracing/test/api_compatibility.d.ts +0 -16
- package/vendor/dist/opentracing/test/mocktracer_implemenation.d.ts +0 -3
- package/vendor/dist/opentracing/test/noop_implementation.d.ts +0 -4
- package/vendor/dist/opentracing/test/opentracing_api.d.ts +0 -3
- package/vendor/dist/opentracing/test/unittest.d.ts +0 -2
- package/vendor/dist/opentracing/tracer.d.ts +0 -127
- package/vendor/dist/path-to-regexp/LICENSE +0 -21
- package/vendor/dist/path-to-regexp/index.js +0 -1
|
@@ -7,14 +7,34 @@ const {
|
|
|
7
7
|
extractTextAndResponseReason,
|
|
8
8
|
parseModelId,
|
|
9
9
|
extractTextAndResponseReasonFromStream,
|
|
10
|
+
extractConverseToolDefinitions,
|
|
11
|
+
extractRequestParamsConverse,
|
|
12
|
+
extractTextAndResponseReasonConverse,
|
|
13
|
+
extractTextAndResponseReasonConverseFromStream,
|
|
10
14
|
} = require('../../../../datadog-plugin-aws-sdk/src/services/bedrockruntime/utils')
|
|
11
15
|
const BaseLLMObsPlugin = require('./base')
|
|
12
16
|
|
|
13
17
|
const llmobsStore = storage('llmobs')
|
|
14
18
|
|
|
15
|
-
const ENABLED_OPERATIONS = new Set([
|
|
16
|
-
|
|
17
|
-
|
|
19
|
+
const ENABLED_OPERATIONS = new Set([
|
|
20
|
+
'invokeModel',
|
|
21
|
+
'invokeModelWithResponseStream',
|
|
22
|
+
'converse',
|
|
23
|
+
'converseStream',
|
|
24
|
+
])
|
|
25
|
+
const CONVERSE_OPERATIONS = new Set(['converse', 'converseStream'])
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* @typedef {{
|
|
29
|
+
* inputTokensFromHeaders?: number,
|
|
30
|
+
* outputTokensFromHeaders?: number,
|
|
31
|
+
* cacheReadTokensFromHeaders?: number,
|
|
32
|
+
* cacheWriteTokensFromHeaders?: number,
|
|
33
|
+
* }} HeaderTokens
|
|
34
|
+
*/
|
|
35
|
+
|
|
36
|
+
/** @type {Map<string, HeaderTokens>} */
|
|
37
|
+
const pendingTokenHeaders = new Map()
|
|
18
38
|
|
|
19
39
|
class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
|
|
20
40
|
constructor () {
|
|
@@ -24,33 +44,39 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
|
|
|
24
44
|
const { response } = ctx
|
|
25
45
|
const request = response.request
|
|
26
46
|
const operation = request.operation
|
|
47
|
+
|
|
48
|
+
// Release the cached headers even for operations the plugin does not tag,
|
|
49
|
+
// so non-LLM Bedrock calls do not leak entries into pendingTokenHeaders.
|
|
50
|
+
const tokensFromHeaders = consumeTokenHeaders(response.$metadata?.requestId)
|
|
51
|
+
|
|
27
52
|
// avoids instrumenting other non supported runtime operations
|
|
28
|
-
if (!ENABLED_OPERATIONS.has(operation))
|
|
29
|
-
|
|
30
|
-
}
|
|
53
|
+
if (!ENABLED_OPERATIONS.has(operation)) return
|
|
54
|
+
|
|
31
55
|
const { modelProvider, modelName } = parseModelId(request.params.modelId)
|
|
32
56
|
|
|
33
57
|
// avoids instrumenting non llm type
|
|
34
|
-
if (modelName.includes('embed'))
|
|
35
|
-
|
|
36
|
-
}
|
|
58
|
+
if (modelName.includes('embed')) return
|
|
59
|
+
|
|
37
60
|
const span = ctx.currentStore?.span
|
|
38
|
-
this.setLLMObsTags({ ctx, request, span, response, modelProvider, modelName })
|
|
61
|
+
this.setLLMObsTags({ ctx, request, span, response, modelProvider, modelName, tokensFromHeaders })
|
|
39
62
|
})
|
|
40
63
|
|
|
41
64
|
this.addSub('apm:aws:response:deserialize:bedrockruntime', ({ headers }) => {
|
|
42
65
|
const requestId = headers['x-amzn-requestid']
|
|
66
|
+
// No request id means no way to correlate with the :complete: event.
|
|
67
|
+
if (!requestId) return
|
|
68
|
+
|
|
43
69
|
const inputTokenCount = headers['x-amzn-bedrock-input-token-count']
|
|
44
70
|
const outputTokenCount = headers['x-amzn-bedrock-output-token-count']
|
|
45
71
|
const cacheReadTokenCount = headers['x-amzn-bedrock-cache-read-input-token-count']
|
|
46
72
|
const cacheWriteTokenCount = headers['x-amzn-bedrock-cache-write-input-token-count']
|
|
47
73
|
|
|
48
|
-
|
|
74
|
+
pendingTokenHeaders.set(requestId, {
|
|
49
75
|
inputTokensFromHeaders: inputTokenCount && Number.parseInt(inputTokenCount),
|
|
50
76
|
outputTokensFromHeaders: outputTokenCount && Number.parseInt(outputTokenCount),
|
|
51
77
|
cacheReadTokensFromHeaders: cacheReadTokenCount && Number.parseInt(cacheReadTokenCount),
|
|
52
78
|
cacheWriteTokensFromHeaders: cacheWriteTokenCount && Number.parseInt(cacheWriteTokenCount),
|
|
53
|
-
}
|
|
79
|
+
})
|
|
54
80
|
})
|
|
55
81
|
|
|
56
82
|
this.addSub('apm:aws:response:streamed-chunk:bedrockruntime', ({ ctx, chunk }) => {
|
|
@@ -60,13 +86,21 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
|
|
|
60
86
|
})
|
|
61
87
|
}
|
|
62
88
|
|
|
63
|
-
setLLMObsTags ({ ctx, request, span, response, modelProvider, modelName }) {
|
|
89
|
+
setLLMObsTags ({ ctx, request, span, response, modelProvider, modelName, tokensFromHeaders }) {
|
|
64
90
|
const isStream = request?.operation?.toLowerCase().includes('stream')
|
|
65
91
|
telemetry.incrementLLMObsSpanStartCount({ autoinstrumented: true, integration: 'bedrock' })
|
|
92
|
+
this.#registerSpan(span, request)
|
|
93
|
+
|
|
94
|
+
if (CONVERSE_OPERATIONS.has(request?.operation)) {
|
|
95
|
+
this.#tagConverseSpan({ ctx, request, span, response, tokensFromHeaders, isStream })
|
|
96
|
+
} else {
|
|
97
|
+
this.#tagInvokeModelSpan({ ctx, request, span, response, modelProvider, modelName, tokensFromHeaders, isStream })
|
|
98
|
+
}
|
|
99
|
+
}
|
|
66
100
|
|
|
101
|
+
#registerSpan (span, request) {
|
|
67
102
|
const parent = llmobsStore.getStore()?.span
|
|
68
103
|
// Use full modelId and unified provider for LLMObs (required for backend cost estimation).
|
|
69
|
-
// Split modelProvider/modelName from parseModelId() are still used below for response parsing.
|
|
70
104
|
this._tagger.registerLLMObsSpan(span, {
|
|
71
105
|
parent,
|
|
72
106
|
modelName: request.params.modelId.toLowerCase(),
|
|
@@ -75,49 +109,67 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
|
|
|
75
109
|
name: 'bedrock-runtime.command',
|
|
76
110
|
integration: 'bedrock',
|
|
77
111
|
})
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
#tagConverseSpan ({ ctx, request, span, response, tokensFromHeaders, isStream }) {
|
|
115
|
+
const requestParams = extractRequestParamsConverse(request.params)
|
|
116
|
+
const textAndResponseReason = isStream
|
|
117
|
+
? extractTextAndResponseReasonConverseFromStream(ctx.chunks)
|
|
118
|
+
: extractTextAndResponseReasonConverse(response)
|
|
119
|
+
|
|
120
|
+
const toolDefinitions = extractConverseToolDefinitions(request.params)
|
|
121
|
+
if (toolDefinitions.length > 0) this._tagger.tagToolDefinitions(span, toolDefinitions)
|
|
122
|
+
if (textAndResponseReason.finishReason) {
|
|
123
|
+
this._tagger.tagMetadata(span, { stop_reason: textAndResponseReason.finishReason })
|
|
124
|
+
}
|
|
125
|
+
this.#tagCommon({ span, requestParams, textAndResponseReason, tokensFromHeaders })
|
|
126
|
+
}
|
|
78
127
|
|
|
128
|
+
#tagInvokeModelSpan ({ ctx, request, span, response, modelProvider, modelName, tokensFromHeaders, isStream }) {
|
|
79
129
|
const requestParams = extractRequestParams(request.params, modelProvider)
|
|
80
130
|
// for streamed responses, we'll use the coerced response object we formed in the stream handler
|
|
81
131
|
const textAndResponseReason = isStream
|
|
82
132
|
? extractTextAndResponseReasonFromStream(ctx.chunks, modelProvider, modelName)
|
|
83
133
|
: extractTextAndResponseReason(response, modelProvider, modelName)
|
|
84
134
|
|
|
85
|
-
|
|
135
|
+
this.#tagCommon({ span, requestParams, textAndResponseReason, tokensFromHeaders })
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
#tagCommon ({ span, requestParams, textAndResponseReason, tokensFromHeaders }) {
|
|
86
139
|
this._tagger.tagMetadata(span, {
|
|
87
140
|
temperature: Number.parseFloat(requestParams.temperature) || 0,
|
|
88
141
|
max_tokens: Number.parseInt(requestParams.maxTokens) || 0,
|
|
89
142
|
})
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
span,
|
|
94
|
-
requestParams.prompt,
|
|
95
|
-
[{ content: textAndResponseReason.message, role: textAndResponseReason.role }]
|
|
96
|
-
)
|
|
97
|
-
|
|
98
|
-
// add token metrics
|
|
99
|
-
const { inputTokens, outputTokens, totalTokens, cacheReadTokens, cacheWriteTokens } = extractTokens({
|
|
100
|
-
requestId: response.$metadata.requestId,
|
|
143
|
+
this._tagger.tagLLMIO(span, requestParams.prompt, textAndResponseReason.messages)
|
|
144
|
+
this._tagger.tagMetrics(span, extractTokens({
|
|
145
|
+
tokensFromHeaders,
|
|
101
146
|
usage: textAndResponseReason.usage,
|
|
102
|
-
})
|
|
103
|
-
this._tagger.tagMetrics(span, {
|
|
104
|
-
inputTokens,
|
|
105
|
-
outputTokens,
|
|
106
|
-
totalTokens,
|
|
107
|
-
cacheReadTokens,
|
|
108
|
-
cacheWriteTokens,
|
|
109
|
-
})
|
|
147
|
+
}))
|
|
110
148
|
}
|
|
111
149
|
}
|
|
112
150
|
|
|
113
|
-
|
|
151
|
+
/**
|
|
152
|
+
* @param {string | undefined} requestId
|
|
153
|
+
* @returns {HeaderTokens | undefined}
|
|
154
|
+
*/
|
|
155
|
+
function consumeTokenHeaders (requestId) {
|
|
156
|
+
const tokens = pendingTokenHeaders.get(requestId)
|
|
157
|
+
pendingTokenHeaders.delete(requestId)
|
|
158
|
+
return tokens
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/**
|
|
162
|
+
* Combine response-body usage with header-derived counts, preferring the body.
|
|
163
|
+
*
|
|
164
|
+
* @param {{ tokensFromHeaders: HeaderTokens | undefined, usage: Record<string, number | undefined> }} options
|
|
165
|
+
*/
|
|
166
|
+
function extractTokens ({ tokensFromHeaders, usage }) {
|
|
114
167
|
const {
|
|
115
168
|
inputTokensFromHeaders,
|
|
116
169
|
outputTokensFromHeaders,
|
|
117
170
|
cacheReadTokensFromHeaders,
|
|
118
171
|
cacheWriteTokensFromHeaders,
|
|
119
|
-
} =
|
|
120
|
-
delete requestIdsToTokens[requestId]
|
|
172
|
+
} = tokensFromHeaders ?? {}
|
|
121
173
|
|
|
122
174
|
const inputTokens = usage.inputTokens || inputTokensFromHeaders || 0
|
|
123
175
|
const outputTokens = usage.outputTokens || outputTokensFromHeaders || 0
|
|
@@ -0,0 +1,270 @@
|
|
|
1
|
+
'use strict'
|
|
2
|
+
|
|
3
|
+
const LLMObsPlugin = require('../base')
|
|
4
|
+
const { storage: llmobsStorage } = require('../../storage')
|
|
5
|
+
const { NAME, SESSION_ID } = require('../../constants/tags')
|
|
6
|
+
const { splitModel } = require('../../../../../datadog-plugin-claude-agent-sdk/src/util')
|
|
7
|
+
|
|
8
|
+
const subagentToolIds = new Set()
|
|
9
|
+
|
|
10
|
+
function normalizeToolOutputString (raw) {
|
|
11
|
+
const footerIndex = raw.search(/\s*agentId: [^\s]+ \(use SendMessage\b/)
|
|
12
|
+
if (footerIndex === -1) return raw
|
|
13
|
+
|
|
14
|
+
return raw.slice(0, footerIndex).trimEnd()
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
function getToolOutputText (raw) {
|
|
18
|
+
if (raw == null) return
|
|
19
|
+
|
|
20
|
+
if (Array.isArray(raw)) {
|
|
21
|
+
const output = []
|
|
22
|
+
for (const block of raw) {
|
|
23
|
+
const text = getToolOutputText(block)
|
|
24
|
+
if (text) output.push(text)
|
|
25
|
+
}
|
|
26
|
+
return output.join('\n') || undefined
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
if (raw.type === 'tool_result') return getToolOutputText(raw.content)
|
|
30
|
+
if (raw.type === 'text') return normalizeToolOutputString(raw.text)
|
|
31
|
+
if (raw.type === 'tool_reference') return raw.tool_name
|
|
32
|
+
if (raw.content !== undefined) return getToolOutputText(raw.content)
|
|
33
|
+
|
|
34
|
+
if (typeof raw === 'string') return normalizeToolOutputString(raw)
|
|
35
|
+
|
|
36
|
+
return JSON.stringify(raw)
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
function buildOutputMessages (chunks, llmStartIdx, llmEndIdx) {
|
|
40
|
+
let thinking = ''
|
|
41
|
+
let text = ''
|
|
42
|
+
const toolCalls = []
|
|
43
|
+
|
|
44
|
+
for (let i = llmStartIdx; i < llmEndIdx; i++) {
|
|
45
|
+
const c = chunks[i]
|
|
46
|
+
if (c.type !== 'assistant') continue
|
|
47
|
+
const block = c.message?.content?.[0]
|
|
48
|
+
if (block?.type === 'thinking') thinking += block.thinking ?? ''
|
|
49
|
+
else if (block?.type === 'text') text += block.text ?? ''
|
|
50
|
+
else if (block?.type === 'tool_use') {
|
|
51
|
+
toolCalls.push({ name: block.name, arguments: block.input ?? {}, toolId: block.id, type: block.type })
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
const messages = []
|
|
56
|
+
if (thinking) messages.push({ role: 'thinking', content: thinking })
|
|
57
|
+
const msg = { role: 'assistant', content: text }
|
|
58
|
+
if (toolCalls.length) msg.toolCalls = toolCalls
|
|
59
|
+
messages.push(msg)
|
|
60
|
+
return messages
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
class QueryLLMObsPlugin extends LLMObsPlugin {
|
|
64
|
+
static integration = 'claude-agent-sdk'
|
|
65
|
+
static id = 'llmobs_claude_agent_sdk_query'
|
|
66
|
+
static prefix = 'tracing:orchestrion:@anthropic-ai/claude-agent-sdk:query'
|
|
67
|
+
|
|
68
|
+
getLLMObsSpanRegisterOptions (ctx) {
|
|
69
|
+
return { kind: 'agent' }
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
start (ctx) {
|
|
73
|
+
super.start(ctx)
|
|
74
|
+
if (!this._tracerConfig.llmobs.DD_LLMOBS_ENABLED) return
|
|
75
|
+
const store = llmobsStorage.getStore()
|
|
76
|
+
const prev = ctx.runInContext ?? (fn => fn())
|
|
77
|
+
ctx.runInContext = fn => prev(() => llmobsStorage.run(store, fn))
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
asyncEnd (ctx) {
|
|
81
|
+
if (!ctx.streamResolved) return
|
|
82
|
+
super.asyncEnd(ctx)
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
setLLMObsTags (ctx) {
|
|
86
|
+
const span = ctx.currentStore?.span
|
|
87
|
+
if (!span) return
|
|
88
|
+
|
|
89
|
+
// post-populate session_id
|
|
90
|
+
if (ctx.session_id) this._tagger._setTag(span, SESSION_ID, ctx.session_id)
|
|
91
|
+
this._tagger.tagTextIO(span, ctx.arguments?.[0]?.prompt, ctx.output)
|
|
92
|
+
|
|
93
|
+
// metadata
|
|
94
|
+
const { cwd, permissionMode } = ctx
|
|
95
|
+
const metadata = {}
|
|
96
|
+
|
|
97
|
+
if (cwd) metadata.cwd = cwd
|
|
98
|
+
if (permissionMode) metadata.permissionMode = permissionMode
|
|
99
|
+
|
|
100
|
+
this._tagger.tagMetadata(span, metadata)
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
class StepLlmObsPlugin extends LLMObsPlugin {
|
|
105
|
+
static integration = 'claude-agent-sdk'
|
|
106
|
+
static id = 'claude_agent_sdk_step_llmobs'
|
|
107
|
+
static system = 'claude-agent-sdk'
|
|
108
|
+
static prefix = 'tracing:apm:claude-agent-sdk:step'
|
|
109
|
+
|
|
110
|
+
getLLMObsSpanRegisterOptions (ctx) {
|
|
111
|
+
if (ctx.parentToolUseId) subagentToolIds.add(ctx.parentToolUseId)
|
|
112
|
+
return { kind: 'step', name: `step-${ctx.stepIndex}`, sessionId: ctx.sessionId }
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
end (ctx) {
|
|
116
|
+
super.end(ctx)
|
|
117
|
+
super.asyncEnd(ctx)
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
setLLMObsTags (ctx) {
|
|
121
|
+
const span = ctx.currentStore?.span
|
|
122
|
+
if (!span) return
|
|
123
|
+
|
|
124
|
+
const { chunks, llmStartIdx, llmEndIdx, toolOutputs } = ctx
|
|
125
|
+
if (!chunks) return
|
|
126
|
+
|
|
127
|
+
const outputMessages = buildOutputMessages(chunks, llmStartIdx, llmEndIdx)
|
|
128
|
+
const thinking = outputMessages.find(m => m.role === 'thinking')?.content ?? ''
|
|
129
|
+
|
|
130
|
+
const output = toolOutputs?.length
|
|
131
|
+
? getToolOutputText(toolOutputs)
|
|
132
|
+
: outputMessages.find(m => m.role === 'assistant')?.content ?? ''
|
|
133
|
+
|
|
134
|
+
this._tagger.tagTextIO(span, thinking, output)
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
class LlmLlmObsPlugin extends LLMObsPlugin {
|
|
139
|
+
static integration = 'claude-agent-sdk'
|
|
140
|
+
static id = 'claude_agent_sdk_llm_llmobs'
|
|
141
|
+
static system = 'claude-agent-sdk'
|
|
142
|
+
static prefix = 'tracing:apm:claude-agent-sdk:llm'
|
|
143
|
+
|
|
144
|
+
getLLMObsSpanRegisterOptions (ctx) {
|
|
145
|
+
const { modelName, modelProvider } = splitModel(ctx.model)
|
|
146
|
+
return { kind: 'llm', name: ctx.model, modelName, modelProvider, sessionId: ctx.sessionId }
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
end (ctx) {
|
|
150
|
+
super.end(ctx)
|
|
151
|
+
super.asyncEnd(ctx)
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
setLLMObsTags (ctx) {
|
|
155
|
+
const span = ctx.currentStore?.span
|
|
156
|
+
if (!span) return
|
|
157
|
+
|
|
158
|
+
const { chunks, llmStartIdx, llmEndIdx, parentToolUseId, initialPrompt, usage } = ctx
|
|
159
|
+
|
|
160
|
+
if (chunks) {
|
|
161
|
+
const inputMessages = this.#buildInputMessages(chunks, llmStartIdx, parentToolUseId, initialPrompt)
|
|
162
|
+
const outputMessages = buildOutputMessages(chunks, llmStartIdx, llmEndIdx)
|
|
163
|
+
this._tagger.tagLLMIO(span, inputMessages, outputMessages)
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
if (usage) {
|
|
167
|
+
const cacheWriteTokens = usage.cache_creation_input_tokens ?? 0
|
|
168
|
+
const cacheReadTokens = usage.cache_read_input_tokens ?? 0
|
|
169
|
+
const inputTokens = (usage.input_tokens ?? 0) + cacheWriteTokens + cacheReadTokens
|
|
170
|
+
const outputTokens = usage.output_tokens ?? 0
|
|
171
|
+
this._tagger.tagMetrics(span, {
|
|
172
|
+
input_tokens: inputTokens,
|
|
173
|
+
output_tokens: outputTokens,
|
|
174
|
+
cache_read_input_tokens: cacheReadTokens,
|
|
175
|
+
cache_write_input_tokens: cacheWriteTokens,
|
|
176
|
+
total_tokens: inputTokens + outputTokens,
|
|
177
|
+
})
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
#buildInputMessages (chunks, llmStartIdx, parentToolUseId, initialPrompt) {
|
|
182
|
+
const messages = []
|
|
183
|
+
if (initialPrompt) messages.push({ role: 'user', content: initialPrompt })
|
|
184
|
+
const seenIds = new Set()
|
|
185
|
+
|
|
186
|
+
for (let i = 0; i < llmStartIdx; i++) {
|
|
187
|
+
const c = chunks[i]
|
|
188
|
+
if (c.parent_tool_use_id !== parentToolUseId) continue
|
|
189
|
+
|
|
190
|
+
if (c.type === 'assistant') {
|
|
191
|
+
const msgId = c.message?.id
|
|
192
|
+
if (!msgId || seenIds.has(msgId)) continue
|
|
193
|
+
seenIds.add(msgId)
|
|
194
|
+
|
|
195
|
+
let thinking = ''
|
|
196
|
+
let text = ''
|
|
197
|
+
const toolCalls = []
|
|
198
|
+
for (let j = i; j < llmStartIdx; j++) {
|
|
199
|
+
const cc = chunks[j]
|
|
200
|
+
if (cc.type !== 'assistant' || cc.message?.id !== msgId) break
|
|
201
|
+
const block = cc.message?.content?.[0]
|
|
202
|
+
if (block?.type === 'thinking') thinking += block.thinking ?? ''
|
|
203
|
+
else if (block?.type === 'text') text += block.text ?? ''
|
|
204
|
+
else if (block?.type === 'tool_use') {
|
|
205
|
+
toolCalls.push({ name: block.name, arguments: block.input ?? {}, toolId: block.id, type: block.type })
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
if (thinking) messages.push({ role: 'thinking', content: thinking })
|
|
209
|
+
const msg = { role: 'assistant', content: text }
|
|
210
|
+
if (toolCalls.length) msg.toolCalls = toolCalls
|
|
211
|
+
messages.push(msg)
|
|
212
|
+
} else if (c.type === 'user') {
|
|
213
|
+
const content = c.message?.content
|
|
214
|
+
if (!content) continue
|
|
215
|
+
for (const block of content) {
|
|
216
|
+
if (block.type === 'text') {
|
|
217
|
+
messages.push({ role: 'user', content: block.text ?? '' })
|
|
218
|
+
} else if (block.type === 'tool_result') {
|
|
219
|
+
const text = getToolOutputText(block.content) ?? ''
|
|
220
|
+
messages.push({ role: 'tool', content: text })
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
return messages
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
class ToolLlmObsPlugin extends LLMObsPlugin {
|
|
231
|
+
static integration = 'claude-agent-sdk'
|
|
232
|
+
static id = 'claude_agent_sdk_tool_llmobs'
|
|
233
|
+
static system = 'claude-agent-sdk'
|
|
234
|
+
static prefix = 'tracing:apm:claude-agent-sdk:tool'
|
|
235
|
+
|
|
236
|
+
getLLMObsSpanRegisterOptions (ctx) {
|
|
237
|
+
return { kind: 'tool', name: ctx.name, sessionId: ctx.sessionId }
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
end (ctx) {
|
|
241
|
+
super.end(ctx)
|
|
242
|
+
super.asyncEnd(ctx)
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
setLLMObsTags (ctx) {
|
|
246
|
+
const span = ctx.currentStore?.span
|
|
247
|
+
if (!span) return
|
|
248
|
+
|
|
249
|
+
if (subagentToolIds.has(ctx.id)) {
|
|
250
|
+
subagentToolIds.delete(ctx.id)
|
|
251
|
+
const description = ctx.input?.description
|
|
252
|
+
this._tagger.changeKind(span, 'agent')
|
|
253
|
+
if (description) this._tagger._setTag(span, NAME, `${ctx.name} (${description})`)
|
|
254
|
+
const output = getToolOutputText(ctx.output)
|
|
255
|
+
this._tagger.tagTextIO(span, ctx.input?.prompt, output)
|
|
256
|
+
return
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
const input = ctx.input ? JSON.stringify(ctx.input) : undefined
|
|
260
|
+
const output = getToolOutputText(ctx.output)
|
|
261
|
+
this._tagger.tagTextIO(span, input, output)
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
module.exports = [
|
|
266
|
+
QueryLLMObsPlugin,
|
|
267
|
+
StepLlmObsPlugin,
|
|
268
|
+
ToolLlmObsPlugin,
|
|
269
|
+
LlmLlmObsPlugin,
|
|
270
|
+
]
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
'use strict'
|
|
2
|
+
|
|
3
|
+
function splitModel (model) {
|
|
4
|
+
if (!model) return { modelName: undefined, modelProvider: 'anthropic' }
|
|
5
|
+
const idx = model.indexOf('/')
|
|
6
|
+
if (idx === -1) return { modelName: model, modelProvider: 'anthropic' }
|
|
7
|
+
return { modelName: model.slice(idx + 1), modelProvider: model.slice(0, idx) }
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
module.exports = { splitModel }
|
|
@@ -5,6 +5,7 @@ const {
|
|
|
5
5
|
getOperation,
|
|
6
6
|
extractMetrics,
|
|
7
7
|
extractMetadata,
|
|
8
|
+
extractToolDefinitions,
|
|
8
9
|
aggregateStreamingChunks,
|
|
9
10
|
formatInputMessages,
|
|
10
11
|
formatEmbeddingInput,
|
|
@@ -55,7 +56,7 @@ class GenAiLLMObsPlugin extends LLMObsPlugin {
|
|
|
55
56
|
|
|
56
57
|
const inputs = args[0]
|
|
57
58
|
const response = ctx.result
|
|
58
|
-
const error = !!span.context().
|
|
59
|
+
const error = !!span.context().getTag('error')
|
|
59
60
|
|
|
60
61
|
const operation = getOperation(methodName)
|
|
61
62
|
|
|
@@ -79,6 +80,9 @@ class GenAiLLMObsPlugin extends LLMObsPlugin {
|
|
|
79
80
|
const metadata = extractMetadata(config)
|
|
80
81
|
this._tagger.tagMetadata(span, metadata)
|
|
81
82
|
|
|
83
|
+
const toolDefinitions = extractToolDefinitions(config)
|
|
84
|
+
if (toolDefinitions.length > 0) this._tagger.tagToolDefinitions(span, toolDefinitions)
|
|
85
|
+
|
|
82
86
|
if (error) {
|
|
83
87
|
this._tagger.tagLLMIO(span, inputMessages, [{ content: '' }])
|
|
84
88
|
return
|
|
@@ -114,7 +114,7 @@ function extractMetrics (response) {
|
|
|
114
114
|
}
|
|
115
115
|
|
|
116
116
|
const totalTokens = tokenUsage.totalTokenCount ||
|
|
117
|
-
|
|
117
|
+
(tokenUsage.promptTokenCount || 0) + (tokenUsage.candidatesTokenCount || 0)
|
|
118
118
|
if (totalTokens) {
|
|
119
119
|
metrics.totalTokens = totalTokens
|
|
120
120
|
}
|
|
@@ -155,6 +155,50 @@ function extractMetadata (config) {
|
|
|
155
155
|
return metadata
|
|
156
156
|
}
|
|
157
157
|
|
|
158
|
+
/**
|
|
159
|
+
* Extract tool definitions from config
|
|
160
|
+
* @param {object} config
|
|
161
|
+
* @returns {Array}
|
|
162
|
+
*/
|
|
163
|
+
function extractToolDefinitions (config) {
|
|
164
|
+
const toolDefinitions = []
|
|
165
|
+
|
|
166
|
+
if (!Array.isArray(config?.tools)) {
|
|
167
|
+
return toolDefinitions
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
for (const tool of config.tools) {
|
|
171
|
+
// Only extract tools with valid function declarations
|
|
172
|
+
if (!Array.isArray(tool?.functionDeclarations)) {
|
|
173
|
+
continue
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
for (const currDeclaration of tool.functionDeclarations) {
|
|
177
|
+
// A valid declaration must have a name
|
|
178
|
+
if (!currDeclaration?.name) {
|
|
179
|
+
continue
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
const toolDef = { name: currDeclaration.name }
|
|
183
|
+
|
|
184
|
+
if (currDeclaration.description !== undefined) {
|
|
185
|
+
toolDef.description = currDeclaration.description
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
// Parameters can be in two different fields depending on user input
|
|
189
|
+
if (currDeclaration.parameters !== undefined) {
|
|
190
|
+
toolDef.schema = currDeclaration.parameters
|
|
191
|
+
} else if (currDeclaration.parametersJsonSchema !== undefined) {
|
|
192
|
+
toolDef.schema = currDeclaration.parametersJsonSchema
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
toolDefinitions.push(toolDef)
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
return toolDefinitions
|
|
200
|
+
}
|
|
201
|
+
|
|
158
202
|
/**
|
|
159
203
|
* Format function call message
|
|
160
204
|
* @param {Array} parts
|
|
@@ -237,15 +281,25 @@ function formatContentObject (content) {
|
|
|
237
281
|
}
|
|
238
282
|
}
|
|
239
283
|
|
|
240
|
-
//
|
|
241
|
-
|
|
242
|
-
|
|
284
|
+
// Two filter passes over `parts` collapse to a single walk. Most parts are
|
|
285
|
+
// text-only so neither bucket is allocated unless a matching part appears.
|
|
286
|
+
let functionCalls
|
|
287
|
+
let functionResponses
|
|
288
|
+
for (const part of parts) {
|
|
289
|
+
if (part.functionCall) {
|
|
290
|
+
functionCalls ??= []
|
|
291
|
+
functionCalls.push(part)
|
|
292
|
+
} else if (part.functionResponse) {
|
|
293
|
+
functionResponses ??= []
|
|
294
|
+
functionResponses.push(part)
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
if (functionCalls) {
|
|
243
299
|
return formatFunctionCallMessage(parts, functionCalls, role)
|
|
244
300
|
}
|
|
245
301
|
|
|
246
|
-
|
|
247
|
-
const functionResponses = parts.filter(part => part.functionResponse)
|
|
248
|
-
if (functionResponses.length > 0) {
|
|
302
|
+
if (functionResponses) {
|
|
249
303
|
return formatFunctionResponseMessage(functionResponses, role)
|
|
250
304
|
}
|
|
251
305
|
|
|
@@ -326,15 +380,27 @@ function formatNonStreamingCandidate (candidate) {
|
|
|
326
380
|
|
|
327
381
|
const { parts } = content
|
|
328
382
|
|
|
329
|
-
//
|
|
330
|
-
|
|
331
|
-
|
|
383
|
+
// One walk replaces three (`filter` + two `find`); priority order is
|
|
384
|
+
// functionCall > executableCode > codeExecutionResult, same as before.
|
|
385
|
+
let functionCalls
|
|
386
|
+
let executableCode
|
|
387
|
+
let codeExecutionResult
|
|
388
|
+
for (const part of parts) {
|
|
389
|
+
if (part.functionCall) {
|
|
390
|
+
functionCalls ??= []
|
|
391
|
+
functionCalls.push(part)
|
|
392
|
+
} else if (!executableCode && part.executableCode) {
|
|
393
|
+
executableCode = part
|
|
394
|
+
} else if (!codeExecutionResult && part.codeExecutionResult) {
|
|
395
|
+
codeExecutionResult = part
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
|
|
399
|
+
if (functionCalls) {
|
|
332
400
|
messages.push(formatFunctionCallMessage(parts, functionCalls, ROLES.ASSISTANT))
|
|
333
401
|
return messages
|
|
334
402
|
}
|
|
335
403
|
|
|
336
|
-
// Check for executable code
|
|
337
|
-
const executableCode = parts.find(part => part.executableCode)
|
|
338
404
|
if (executableCode) {
|
|
339
405
|
messages.push({
|
|
340
406
|
role: ROLES.ASSISTANT,
|
|
@@ -346,8 +412,6 @@ function formatNonStreamingCandidate (candidate) {
|
|
|
346
412
|
return messages
|
|
347
413
|
}
|
|
348
414
|
|
|
349
|
-
// Check for code execution result
|
|
350
|
-
const codeExecutionResult = parts.find(part => part.codeExecutionResult)
|
|
351
415
|
if (codeExecutionResult) {
|
|
352
416
|
messages.push({
|
|
353
417
|
role: ROLES.ASSISTANT,
|
|
@@ -394,8 +458,8 @@ function formatStreamingOutput (response) {
|
|
|
394
458
|
|
|
395
459
|
// Skip special cases in streaming (handle them as non-streaming)
|
|
396
460
|
if (content.parts.some(part => part.functionCall ||
|
|
397
|
-
|
|
398
|
-
|
|
461
|
+
part.executableCode ||
|
|
462
|
+
part.codeExecutionResult)) {
|
|
399
463
|
messages.push(...formatNonStreamingCandidate(candidate))
|
|
400
464
|
continue
|
|
401
465
|
}
|
|
@@ -478,6 +542,7 @@ module.exports = {
|
|
|
478
542
|
getOperation,
|
|
479
543
|
extractMetrics,
|
|
480
544
|
extractMetadata,
|
|
545
|
+
extractToolDefinitions,
|
|
481
546
|
aggregateStreamingChunks,
|
|
482
547
|
formatInputMessages,
|
|
483
548
|
formatEmbeddingInput,
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
'use strict'
|
|
2
2
|
|
|
3
3
|
const { spanHasError } = require('../../../util')
|
|
4
|
+
const { formatIO } = require('../messages')
|
|
4
5
|
const LangChainLLMObsHandler = require('.')
|
|
5
6
|
|
|
6
7
|
class LangChainLLMObsChainHandler extends LangChainLLMObsHandler {
|
|
7
8
|
setMetaTags ({ span, inputs, results }) {
|
|
8
9
|
let input
|
|
9
10
|
if (inputs) {
|
|
10
|
-
input =
|
|
11
|
+
input = formatIO(inputs)
|
|
11
12
|
}
|
|
12
13
|
|
|
13
|
-
const output = !results || spanHasError(span) ? '' :
|
|
14
|
+
const output = !results || spanHasError(span) ? '' : formatIO(results)
|
|
14
15
|
|
|
15
16
|
// chain spans will always be workflows
|
|
16
17
|
this._tagger.tagTextIO(span, input, output)
|