dd-trace 5.99.0 → 5.99.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.99.0",
+  "version": "5.99.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -66,23 +66,39 @@
     "test:profiler": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/dd-trace/test/profiling/**/*.spec.js\"",
     "test:profiler:ci": "nyc --silent node init && nyc -- npm run test:profiler",
     "test:integration": "mocha --timeout 60000 \"integration-tests/*.spec.js\"",
+    "test:integration:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/*.spec.js\"",
     "test:integration:aiguard": "mocha --timeout 60000 \"integration-tests/aiguard/*.spec.js\"",
+    "test:integration:aiguard:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/aiguard/*.spec.js\"",
     "test:integration:appsec": "mocha --timeout 60000 \"integration-tests/appsec/*.spec.js\"",
+    "test:integration:appsec:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/appsec/*.spec.js\"",
     "test:integration:bun": "mocha --timeout 60000 \"integration-tests/bun/*.spec.js\"",
     "test:integration:cucumber": "mocha --timeout 60000 \"integration-tests/cucumber/*.spec.js\"",
+    "test:integration:cucumber:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/cucumber/*.spec.js\"",
     "test:integration:cypress": "mocha --timeout 60000 \"integration-tests/cypress/${SPEC:-cypress-*}.spec.js\"",
+    "test:integration:cypress:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/cypress/${SPEC:-cypress-*}.spec.js\"",
     "test:integration:debugger": "mocha --timeout 60000 \"integration-tests/debugger/*.spec.js\"",
+    "test:integration:debugger:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/debugger/*.spec.js\"",
     "test:integration:esbuild": "mocha --timeout 60000 \"integration-tests/esbuild/*.spec.js\"",
+    "test:integration:esbuild:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/esbuild/*.spec.js\"",
     "test:integration:webpack": "mocha --timeout 60000 \"integration-tests/webpack/*.spec.js\"",
     "test:integration:openfeature": "mocha --timeout 60000 \"integration-tests/openfeature/*.spec.js\"",
+    "test:integration:openfeature:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/openfeature/*.spec.js\"",
     "test:integration:jest": "mocha --timeout 60000 \"integration-tests/jest/*.spec.js\"",
+    "test:integration:jest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/jest/*.spec.js\"",
     "test:integration:mocha": "mocha --timeout 60000 \"integration-tests/mocha/*.spec.js\"",
+    "test:integration:mocha:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/mocha/*.spec.js\"",
     "test:integration:playwright": "mocha --timeout 60000 \"integration-tests/playwright/${SPEC:-playwright-*}.spec.js\"",
+    "test:integration:playwright:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/playwright/${SPEC:-playwright-*}.spec.js\"",
     "test:integration:selenium": "mocha --timeout 60000 \"integration-tests/selenium/*.spec.js\"",
+    "test:integration:selenium:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/selenium/*.spec.js\"",
     "test:integration:vitest": "mocha --timeout 60000 \"integration-tests/vitest/*.spec.js\"",
+    "test:integration:vitest:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 60000 \"integration-tests/vitest/*.spec.js\"",
     "test:integration:testopt": "mocha --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
+    "test:integration:testopt:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 120000 \"integration-tests/ci-visibility/*.spec.js\"",
     "test:integration:profiler": "mocha --timeout 180000 \"integration-tests/profiler/*.spec.js\"",
-    "test:integration:plugins": "mocha \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/*.spec.js\"",
+    "test:integration:profiler:coverage": "node ./integration-tests/coverage/run-suite.js --timeout 180000 \"integration-tests/profiler/*.spec.js\"",
+    "test:integration:plugins": "yarn services && mocha \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/${SPEC:-*}*.spec.js\"",
+    "test:integration:plugins:coverage": "yarn services && node ./integration-tests/coverage/run-suite.js \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/${SPEC:-*}*.spec.js\"",
     "test:unit:plugins": "mocha \"packages/datadog-instrumentations/test/@(${PLUGINS}).spec.js\" \"packages/datadog-plugin-@(${PLUGINS})/test/**/*.spec.js\" --exclude \"packages/datadog-plugin-@(${PLUGINS})/test/integration-test/**/*.spec.js\"",
     "test:shimmer": "mocha \"packages/datadog-shimmer/test/**/*.spec.js\"",
     "test:shimmer:ci": "nyc --silent node init && nyc -- npm run test:shimmer",
@@ -188,12 +204,15 @@
     "globals": "^17.2.0",
     "graphql": "*",
     "husky": "^9.1.7",
+    "istanbul-lib-report": "^3.0.0",
+    "istanbul-reports": "^3.0.2",
     "jszip": "^3.10.1",
     "mocha": "^11.6.0",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "multer": "^2.1.1",
     "nock": "^13.5.6",
+    "node-preload": "^0.2.1",
     "nyc": "^18.0.0",
     "octokit": "^5.0.3",
     "opentracing": ">=0.14.7",

package/packages/datadog-instrumentations/src/jest.js

@@ -78,7 +78,7 @@ let knownTests = {}
 let isCodeCoverageEnabled = false
 let isCodeCoverageEnabledBecauseOfUs = false
 let isSuitesSkippingEnabled = false
-let isKeepingCoverageConfiguration = false
+let DD_TEST_TIA_KEEP_COV_CONFIG = false
 let isUserCodeCoverageEnabled = false
 let isSuitesSkipped = false
 let numSkippedSuites = 0
@@ -1141,8 +1141,8 @@ function getCliWrapper (isNewJestVersion) {
         if (!err) {
           isCodeCoverageEnabled = libraryConfig.isCodeCoverageEnabled
           isSuitesSkippingEnabled = libraryConfig.isSuitesSkippingEnabled
-          isKeepingCoverageConfiguration =
-            libraryConfig.isKeepingCoverageConfiguration ?? isKeepingCoverageConfiguration
+          DD_TEST_TIA_KEEP_COV_CONFIG =
+            libraryConfig.DD_TEST_TIA_KEEP_COV_CONFIG ?? DD_TEST_TIA_KEEP_COV_CONFIG
           isEarlyFlakeDetectionEnabled = libraryConfig.isEarlyFlakeDetectionEnabled
           earlyFlakeDetectionNumRetries = libraryConfig.earlyFlakeDetectionNumRetries
           earlyFlakeDetectionSlowTestRetries = libraryConfig.earlyFlakeDetectionSlowTestRetries ?? {}
@@ -1495,7 +1495,7 @@ function coverageReporterWrapper (coverageReporter) {
    */
   // `_addUntestedFiles` is an async function
   shimmer.wrap(CoverageReporter.prototype, '_addUntestedFiles', addUntestedFiles => function () {
-    if (isKeepingCoverageConfiguration) {
+    if (DD_TEST_TIA_KEEP_COV_CONFIG) {
       return addUntestedFiles.apply(this, arguments)
     }
     if (isCodeCoverageEnabledBecauseOfUs) {
@@ -1697,7 +1697,7 @@ function configureTestEnvironment (readConfigsResult) {
       ...readConfigsResult.globalConfig,
       passWithNoTests: true,
     }
-    if (isCodeCoverageEnabledBecauseOfUs && !isKeepingCoverageConfiguration) {
+    if (isCodeCoverageEnabledBecauseOfUs && !DD_TEST_TIA_KEEP_COV_CONFIG) {
       globalConfig.coverageReporters = ['none']
       readConfigsResult.configs = configs.map(config => ({
         ...config,

package/packages/datadog-plugin-dd-trace-api/src/index.js

@@ -14,7 +14,7 @@ module.exports = class DdTraceApiPlugin extends Plugin {
     super(...args)
 
     const tracer = this._tracer
-    const injectionEnabledTag = `injection_enabled:${this._tracerConfig.injectionEnabled ? 'yes' : 'no'}`
+    const injectionEnabledTag = `injection_enabled:${this._tracerConfig.DD_INJECTION_ENABLED ? 'yes' : 'no'}`
 
     this.addSub('datadog-api:v1:tracerinit', ({ proxy }) => {
       const proxyVal = proxy()

package/packages/datadog-plugin-graphql/src/utils.js

@@ -26,8 +26,8 @@ function extractErrorIntoSpanEvent (config, span, exc) {
     attributes.message = exc.message
   }
 
-  if (config.graphqlErrorExtensions) {
-    for (const ext of config.graphqlErrorExtensions) {
+  if (config.DD_TRACE_GRAPHQL_ERROR_EXTENSIONS) {
+    for (const ext of config.DD_TRACE_GRAPHQL_ERROR_EXTENSIONS) {
       if (exc.extensions?.[ext]) {
         const value = exc.extensions[ext]
 

package/packages/datadog-plugin-memcached/src/index.js

@@ -16,7 +16,7 @@ class MemcachedPlugin extends CachePlugin {
       [CLIENT_PORT_KEY]: address[1],
     }
 
-    if (this.config.memcachedCommandEnabled) {
+    if (this.config.DD_TRACE_MEMCACHED_COMMAND_ENABLED) {
       meta['memcached.command'] = query.command
     }
 

package/packages/dd-trace/src/appsec/blocking.js

@@ -1,10 +1,16 @@
 'use strict'
 
+const { LRUCache } = require('../../../../vendor/dist/lru-cache')
 const log = require('../log')
+const web = require('../plugins/util/web')
 const blockedTemplates = require('./blocked_templates')
 const { updateBlockFailureMetric } = require('./telemetry')
 
-const detectedSpecificEndpoints = {}
+// Bounded by the LRU as defense-in-depth: getSpecificKey already keys on the
+// resolved route (or the path with the query string stripped) so cardinality
+// follows the routing table, not the URL space.
+const SPECIFIC_ENDPOINT_CACHE_MAX = 16_384
+const detectedSpecificEndpoints = new LRUCache({ max: SPECIFIC_ENDPOINT_CACHE_MAX })
 
 const templateKeyword = '[security_response_id]'
 
@@ -38,12 +44,18 @@ const specificBlockingTypes = {
   GRAPHQL: 'graphqlJson',
 }
 
-function getSpecificKey (method, url) {
-  return `${method}+${url}`
+function getSpecificKey (req) {
+  const route = web.getContext(req)?.paths?.join('')
+  if (route) return `${req.method}+${route}`
+
+  // Strip the query string so unique parameters do not balloon the cache.
+  const url = req.originalUrl || req.url || ''
+  const queryStart = url.indexOf('?')
+  return `${req.method}+${queryStart === -1 ? url : url.slice(0, queryStart)}`
 }
 
-function addSpecificEndpoint (method, url, type) {
-  detectedSpecificEndpoints[getSpecificKey(method, url)] = type
+function addSpecificEndpoint (req, type) {
+  detectedSpecificEndpoints.set(getSpecificKey(req), type)
 }
 
 function getBlockWithRedirectData (actionParameters) {
@@ -65,7 +77,7 @@ function getBlockWithContentData (req, specificType, actionParameters) {
   let type
   let body
 
-  const specificBlockingType = specificType || detectedSpecificEndpoints[getSpecificKey(req.method, req.url)]
+  const specificBlockingType = specificType || detectedSpecificEndpoints.get(getSpecificKey(req))
   if (specificBlockingType) {
     const specificBlockingContent = getTemplate(specificBlockingType, actionParameters)
     type = specificBlockingContent?.type

package/packages/dd-trace/src/appsec/graphql.js

@@ -78,7 +78,7 @@ function enterInApolloRequest () {
     // Set isInGraphqlRequest=true since this function only runs for GraphQL requests
     // This works for both Apollo v4 (middleware) and v5 (HTTP server) contexts
     requestData.isInGraphqlRequest = true
-    addSpecificEndpoint(req.method, req.originalUrl || req.url, specificBlockingTypes.GRAPHQL)
+    addSpecificEndpoint(req, specificBlockingTypes.GRAPHQL)
   }
 }
 

package/packages/dd-trace/src/baggage.js

@@ -3,10 +3,9 @@
 const { storage } = require('../../datadog-core')
 
 /**
- * Spec (API semantics):
- * - OpenTelemetry Baggage API: https://opentelemetry.io/docs/specs/otel/baggage/api/
+ * In-process baggage map stored in async local storage. Frozen on every write.
  *
- * In-process baggage is a string->string map stored in async local storage.
+ * @see https://opentelemetry.io/docs/specs/otel/baggage/api/
  * @typedef {import('../../datadog-core/src/storage').Store<string>} BaggageStore
  */
 
@@ -18,6 +17,8 @@ const baggageStorage =
     /** @type {unknown} */ (storage('baggage'))
   )
 
+const EMPTY_STORE = Object.freeze(/** @type {BaggageStore} */ ({}))
+
 // TODO: Implement metadata https://opentelemetry.io/docs/specs/otel/baggage/api/#set-value
 /**
  * @param {string} key
@@ -25,12 +26,11 @@ const baggageStorage =
  * @param {object} [metadata] Not used yet
  */
 function setBaggageItem (key, value, metadata) {
+  const store = baggageStorage.getStore()
   if (typeof key !== 'string' || typeof value !== 'string' || key === '') {
-    return baggageStorage.getStore() ?? {}
+    return store ?? EMPTY_STORE
   }
-
-  const store = baggageStorage.getStore()
-  const newStore = { ...store, [key]: value }
+  const newStore = Object.freeze({ ...store, [key]: value })
   baggageStorage.enterWith(newStore)
   return newStore
 }
@@ -44,23 +44,26 @@ function getBaggageItem (key) {
 }
 
 function getAllBaggageItems () {
-  return baggageStorage.getStore() ?? {}
+  return baggageStorage.getStore() ?? EMPTY_STORE
 }
 
 /**
- * @param {string} keyToRemove
+ * @param {string} keyToRemove No-op for non-string or empty keys.
  */
 function removeBaggageItem (keyToRemove) {
-  const store = baggageStorage.getStore() ?? {}
+  const store = baggageStorage.getStore() ?? EMPTY_STORE
+  if (typeof keyToRemove !== 'string' || keyToRemove === '') {
+    return store
+  }
   const { [keyToRemove]: _, ...newBaggage } = store
+  Object.freeze(newBaggage)
   baggageStorage.enterWith(newBaggage)
   return newBaggage
 }
 
 function removeAllBaggageItems () {
-  const newContext = /** @type {BaggageStore} */ ({})
-  baggageStorage.enterWith(newContext)
-  return newContext
+  baggageStorage.enterWith(EMPTY_STORE)
+  return EMPTY_STORE
 }
 
 module.exports = {

package/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js

@@ -234,7 +234,7 @@ class CiVisibilityExporter extends BufferingExporter {
         testManagementAttemptToFixRetries ?? this._config.testManagementAttemptToFixRetries,
       isImpactedTestsEnabled: isImpactedTestsEnabled && this._config.isImpactedTestsEnabled,
       isCoverageReportUploadEnabled,
-      isKeepingCoverageConfiguration: this._config.isKeepingCoverageConfiguration,
+      DD_TEST_TIA_KEEP_COV_CONFIG: this._config.DD_TEST_TIA_KEEP_COV_CONFIG,
     }
   }
 

package/packages/dd-trace/src/config/generated-config-types.d.ts

@@ -48,8 +48,6 @@ export interface GeneratedConfig {
   baggageMaxBytes: number;
   baggageMaxItems: number;
   baggageTagKeys: string[];
-  ciVisAgentlessLogSubmissionEnabled: boolean;
-  ciVisibilityTestSessionName: string | undefined;
   clientIpEnabled: boolean;
   clientIpHeader: string | undefined;
   cloudPayloadTagging: {
@@ -73,6 +71,7 @@ export interface GeneratedConfig {
   };
   dbmPropagationMode: string;
   DD_ACTION_EXECUTION_ID: string | undefined;
+  DD_AGENTLESS_LOG_SUBMISSION_ENABLED: boolean;
   DD_AGENTLESS_LOG_SUBMISSION_URL: string | undefined;
   DD_APM_FLUSH_DEADLINE_MILLISECONDS: number;
   DD_AZURE_RESOURCE_GROUP: string | undefined;
@@ -83,6 +82,7 @@ export interface GeneratedConfig {
   DD_CIVISIBILITY_DANGEROUSLY_FORCE_TEST_SKIPPING: boolean;
   DD_CIVISIBILITY_ENABLED: boolean;
   DD_CIVISIBILITY_GIT_UNSHALLOW_ENABLED: boolean;
+  DD_CIVISIBILITY_MANUAL_API_ENABLED: boolean;
   DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS: number;
   DD_CIVISIBILITY_TEST_COMMAND: string | undefined;
   DD_CIVISIBILITY_TEST_MODULE_ID: string | undefined;
@@ -111,8 +111,12 @@ export interface GeneratedConfig {
   DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA: string | undefined;
   DD_GIT_REPOSITORY_URL: string | undefined;
   DD_GIT_TAG: string | undefined;
+  DD_INJECT_FORCE: boolean;
+  DD_INJECTION_ENABLED: string | undefined;
+  DD_INSTRUMENTATION_CONFIG_ID: string | undefined;
   DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED: boolean;
   DD_LAMBDA_HANDLER: string | undefined;
+  DD_LOGS_OTEL_ENABLED: boolean;
   DD_MINI_AGENT_PATH: string | undefined;
   DD_PIPELINE_EXECUTION_ID: string | undefined;
   DD_PLAYWRIGHT_WORKER: string | undefined;
@@ -147,6 +151,8 @@ export interface GeneratedConfig {
   DD_TELEMETRY_FORWARDER_PATH: string | undefined;
   DD_TEST_FLEET_CONFIG_PATH: string | undefined;
   DD_TEST_LOCAL_CONFIG_PATH: string | undefined;
+  DD_TEST_SESSION_NAME: string | undefined;
+  DD_TEST_TIA_KEEP_COV_CONFIG: boolean;
   DD_TRACE_AEROSPIKE_ENABLED: boolean;
   DD_TRACE_AI_ENABLED: boolean;
   DD_TRACE_AMQP10_ENABLED: boolean;
@@ -239,11 +245,13 @@ export interface GeneratedConfig {
   DD_TRACE_FS_ENABLED: boolean;
   DD_TRACE_GCP_PUBSUB_PUSH_ENABLED: boolean;
   DD_TRACE_GENERIC_POOL_ENABLED: boolean;
+  DD_TRACE_GIT_METADATA_ENABLED: boolean;
   DD_TRACE_GOOGLE_CLOUD_PUBSUB_ENABLED: boolean;
   DD_TRACE_GOOGLE_CLOUD_VERTEXAI_ENABLED: boolean;
   DD_TRACE_GOOGLE_GAX_ENABLED: boolean;
   DD_TRACE_GOOGLE_GENAI_ENABLED: boolean;
   DD_TRACE_GRAPHQL_ENABLED: boolean;
+  DD_TRACE_GRAPHQL_ERROR_EXTENSIONS: string[];
   DD_TRACE_GRAPHQL_TAG_ENABLED: boolean;
   DD_TRACE_GRAPHQL_TOOLS_ENABLED: boolean;
   DD_TRACE_GRAPHQL_TOOLS_EXECUTOR_ENABLED: boolean;
@@ -292,6 +300,7 @@ export interface GeneratedConfig {
   DD_TRACE_LODASH_ENABLED: boolean;
   DD_TRACE_LOOPBACK_ENABLED: boolean;
   DD_TRACE_MARIADB_ENABLED: boolean;
+  DD_TRACE_MEMCACHED_COMMAND_ENABLED: boolean;
   DD_TRACE_MEMCACHED_ENABLED: boolean;
   DD_TRACE_MICROGATEWAY_CORE_ENABLED: boolean;
   DD_TRACE_MIDDIE_ENABLED: boolean;
@@ -335,6 +344,7 @@ export interface GeneratedConfig {
   DD_TRACE_PROCESS_ENABLED: boolean;
   DD_TRACE_PROMISE_ENABLED: boolean;
   DD_TRACE_PROMISE_JS_ENABLED: boolean;
+  DD_TRACE_PROPAGATION_EXTRACT_FIRST: boolean;
   DD_TRACE_PROPAGATION_STYLE: string[];
   DD_TRACE_PROTOBUFJS_ENABLED: boolean;
   DD_TRACE_PUG_ENABLED: boolean;
@@ -352,6 +362,7 @@ export interface GeneratedConfig {
   DD_TRACE_SEQUELIZE_ENABLED: boolean;
   DD_TRACE_SHAREDB_ENABLED: boolean;
   DD_TRACE_SMITHY_SMITHY_CLIENT_ENABLED: boolean;
+  DD_TRACE_SPAN_LEAK_DEBUG: number;
   DD_TRACE_SQLITE3_ENABLED: boolean;
   DD_TRACE_SUFFIXPLUGIN_ENABLED: boolean;
   DD_TRACE_TAGS: Record<string, string> | undefined;
@@ -365,6 +376,7 @@ export interface GeneratedConfig {
   DD_TRACE_WINSTON_ENABLED: boolean;
   DD_TRACE_WORKERPOOL_ENABLED: boolean;
   DD_TRACE_WS_ENABLED: boolean;
+  DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH: number;
   DD_VITEST_WORKER: string | undefined;
   dogstatsd: {
     hostname: string;
@@ -405,8 +417,6 @@ export interface GeneratedConfig {
   flakyTestRetriesCount: number;
   flushInterval: number;
   flushMinSpans: number;
-  gitMetadataEnabled: boolean;
-  graphqlErrorExtensions: string[];
   grpc: {
     client: {
       error: {
@@ -443,21 +453,16 @@ export interface GeneratedConfig {
     telemetryVerbosity: string;
   };
   inferredProxyServicesEnabled: boolean;
-  injectForce: boolean;
-  injectionEnabled: string | undefined;
   installSignature: {
     id: string | undefined;
     time: string | undefined;
     type: string | undefined;
   };
-  instrumentation_config_id: string | undefined;
   isEarlyFlakeDetectionEnabled: boolean;
   isFlakyTestRetriesEnabled: boolean;
   isGitUploadEnabled: boolean;
   isImpactedTestsEnabled: boolean;
   isIntelligentTestRunnerEnabled: boolean;
-  isKeepingCoverageConfiguration: boolean;
-  isManualApiEnabled: boolean;
   isTestDynamicInstrumentationEnabled: boolean;
   isTestManagementEnabled: boolean;
   langchain: {
@@ -472,43 +477,41 @@ export interface GeneratedConfig {
   };
   logInjection: boolean;
   logLevel: "debug" | "info" | "warn" | "error";
-  memcachedCommandEnabled: boolean;
   middlewareTracingEnabled: boolean;
   openai: {
     spanCharLimit: number;
   };
   openAiLogsEnabled: boolean;
+  OTEL_BSP_MAX_EXPORT_BATCH_SIZE: number;
+  OTEL_BSP_MAX_QUEUE_SIZE: number;
+  OTEL_BSP_SCHEDULE_DELAY: number;
   OTEL_EXPORTER_OTLP_ENDPOINT: string | undefined;
   OTEL_EXPORTER_OTLP_HEADERS: Record<string, string> | undefined;
+  OTEL_EXPORTER_OTLP_LOGS_ENDPOINT: string;
   OTEL_EXPORTER_OTLP_LOGS_HEADERS: Record<string, string> | undefined;
+  OTEL_EXPORTER_OTLP_LOGS_PROTOCOL: string;
+  OTEL_EXPORTER_OTLP_LOGS_TIMEOUT: number;
+  OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: string;
   OTEL_EXPORTER_OTLP_METRICS_HEADERS: Record<string, string> | undefined;
+  OTEL_EXPORTER_OTLP_METRICS_PROTOCOL: string;
+  OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE: "DELTA" | "CUMULATIVE" | "LOWMEMORY";
+  OTEL_EXPORTER_OTLP_METRICS_TIMEOUT: number;
+  OTEL_EXPORTER_OTLP_PROTOCOL: string;
+  OTEL_EXPORTER_OTLP_TIMEOUT: number;
   OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: string;
   OTEL_EXPORTER_OTLP_TRACES_HEADERS: Record<string, string> | undefined;
   OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: "http/json";
   OTEL_EXPORTER_OTLP_TRACES_TIMEOUT: number;
   OTEL_LOGS_EXPORTER: "none" | "otlp" | undefined;
+  OTEL_METRIC_EXPORT_INTERVAL: number;
+  OTEL_METRIC_EXPORT_TIMEOUT: number;
   OTEL_METRICS_EXPORTER: "none" | "otlp" | undefined;
   OTEL_RESOURCE_ATTRIBUTES: Record<string, string>;
   OTEL_SDK_DISABLED: boolean;
   OTEL_TRACES_EXPORTER: "none" | "otlp" | undefined;
   OTEL_TRACES_SAMPLER: "always_on" | "always_off" | "traceidratio" | "parentbased_always_on" | "parentbased_always_off" | "parentbased_traceidratio";
   OTEL_TRACES_SAMPLER_ARG: number | undefined;
-  otelBatchTimeout: number;
-  otelLogsEnabled: boolean;
-  otelLogsProtocol: string;
-  otelLogsTimeout: number;
-  otelLogsUrl: string;
-  otelMaxExportBatchSize: number;
-  otelMaxQueueSize: number;
   otelMetricsEnabled: boolean;
-  otelMetricsExportInterval: number;
-  otelMetricsExportTimeout: number;
-  otelMetricsProtocol: string;
-  otelMetricsTemporalityPreference: "DELTA" | "CUMULATIVE" | "LOWMEMORY";
-  otelMetricsTimeout: number;
-  otelMetricsUrl: string;
-  otelProtocol: string;
-  otelTimeout: number;
   peerServiceMapping: Record<string, string>;
   port: string | number;
   profiling: {
@@ -542,7 +545,6 @@ export interface GeneratedConfig {
   site: string;
   spanAttributeSchema: "v0" | "v1";
   spanComputePeerService: boolean;
-  spanLeakDebug: number;
   spanRemoveIntegrationFromService: boolean;
   spanSamplingRules: import('../../../../index').SpanSamplingRule[] | undefined;
   startupLogs: boolean;
@@ -550,7 +552,6 @@ export interface GeneratedConfig {
     enabled: boolean;
   };
   tags: Record<string, string>;
-  tagsHeaderMaxLength: number;
   telemetry: {
     debug: boolean;
     dependencyCollection: boolean;
@@ -573,7 +574,6 @@ export interface GeneratedConfig {
   traceId128BitGenerationEnabled: boolean;
   traceId128BitLoggingEnabled: boolean;
   tracePropagationBehaviorExtract: "continue" | "restart" | "ignore";
-  tracePropagationExtractFirst: boolean;
   tracePropagationStyle: {
     extract: string[];
     inject: string[];

package/packages/dd-trace/src/config/index.js

@@ -214,7 +214,7 @@ class Config extends ConfigBase {
 
     warnWrongOtelSettings()
 
-    if (this.gitMetadataEnabled) {
+    if (this.DD_TRACE_GIT_METADATA_ENABLED) {
       this.#loadGitMetadata()
     }
 
@@ -355,7 +355,7 @@ class Config extends ConfigBase {
     }
     // Disable log injection when OTEL logs are enabled
     // OTEL logs and DD log injection are mutually exclusive
-    if (this.otelLogsEnabled) {
+    if (this.DD_LOGS_OTEL_ENABLED) {
       setAndTrack(this, 'logInjection', false)
     }
     if (this.otelMetricsEnabled &&
@@ -427,7 +427,7 @@ class Config extends ConfigBase {
       ))
     }
 
-    if (this.injectionEnabled) {
+    if (this.DD_INJECTION_ENABLED) {
       setAndTrack(this, 'instrumentationSource', 'ssi')
     }
 
@@ -600,11 +600,11 @@ class Config extends ConfigBase {
     // Default OTLP endpoints follow the configured agent host so users who point DD at a custom
     // agent (DD_AGENT_HOST / DD_TRACE_AGENT_URL) also reach OTLP on that host.
     const defaultOtlpBase = this.OTEL_EXPORTER_OTLP_ENDPOINT?.replace(/\/$/, '') ?? `http://${agentHostname}:4318`
-    if (!this.otelLogsUrl) {
-      setAndTrack(this, 'otelLogsUrl', `${defaultOtlpBase}/v1/logs`)
+    if (!this.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT) {
+      setAndTrack(this, 'OTEL_EXPORTER_OTLP_LOGS_ENDPOINT', `${defaultOtlpBase}/v1/logs`)
     }
-    if (!this.otelMetricsUrl) {
-      setAndTrack(this, 'otelMetricsUrl', `${defaultOtlpBase}/v1/metrics`)
+    if (!this.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT) {
+      setAndTrack(this, 'OTEL_EXPORTER_OTLP_METRICS_ENDPOINT', `${defaultOtlpBase}/v1/metrics`)
     }
     if (!this.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT) {
       setAndTrack(this, 'OTEL_EXPORTER_OTLP_TRACES_ENDPOINT', `${defaultOtlpBase}/v1/traces`)

package/packages/dd-trace/src/config/supported-configurations.json

@@ -12,8 +12,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "ciVisAgentlessLogSubmissionEnabled"
+        "default": "false"
       }
     ],
     "DD_AGENTLESS_LOG_SUBMISSION_URL": [
@@ -541,8 +540,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "true",
-        "internalPropertyName": "isManualApiEnabled"
+        "default": "true"
       }
     ],
     "DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS": [
@@ -1105,24 +1103,21 @@
       {
         "implementation": "C",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "injectionEnabled"
+        "default": null
       }
     ],
     "DD_INJECT_FORCE": [
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "injectForce"
+        "default": "false"
       }
     ],
     "DD_INSTRUMENTATION_CONFIG_ID": [
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "instrumentation_config_id"
+        "default": null
       }
     ],
     "DD_INSTRUMENTATION_INSTALL_ID": [
@@ -1240,8 +1235,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "otelLogsEnabled"
+        "default": "false"
       }
     ],
     "DD_TRACE_LOG_LEVEL": [
@@ -1790,16 +1784,14 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "isKeepingCoverageConfiguration"
+        "default": "false"
       }
     ],
     "DD_TEST_SESSION_NAME": [
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "ciVisibilityTestSessionName"
+        "default": null
       }
     ],
     "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED": [
@@ -2644,8 +2636,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "true",
-        "internalPropertyName": "gitMetadataEnabled"
+        "default": "true"
       }
     ],
     "DD_TRACE_GOOGLE_CLOUD_PUBSUB_ENABLED": [
@@ -2687,8 +2678,7 @@
       {
         "implementation": "A",
         "type": "array",
-        "default": "",
-        "internalPropertyName": "graphqlErrorExtensions"
+        "default": ""
       }
     ],
     "DD_TRACE_GRAPHQL_TAG_ENABLED": [
@@ -3062,8 +3052,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "memcachedCommandEnabled"
+        "default": "false"
       }
     ],
     "DD_TRACE_MEMCACHED_ENABLED": [
@@ -3437,8 +3426,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "tracePropagationExtractFirst"
+        "default": "false"
       }
     ],
     "DD_TRACE_PROPAGATION_STYLE": [
@@ -3678,7 +3666,6 @@
       {
         "implementation": "A",
         "type": "int",
-        "internalPropertyName": "spanLeakDebug",
         "default": "0"
       }
     ],
@@ -3831,8 +3818,7 @@
       {
         "implementation": "A",
         "type": "int",
-        "default": "512",
-        "internalPropertyName": "tagsHeaderMaxLength"
+        "default": "512"
       }
     ],
     "DD_VERSION": [
@@ -3872,7 +3858,6 @@
       {
         "implementation": "A",
         "type": "int",
-        "internalPropertyName": "otelMaxExportBatchSize",
         "default": "512",
         "allowed": "[1-9]\\d*"
       }
@@ -3881,7 +3866,6 @@
       {
         "implementation": "A",
         "type": "int",
-        "internalPropertyName": "otelMaxQueueSize",
         "default": "2048",
         "allowed": "[1-9]\\d*"
       }
@@ -3890,7 +3874,6 @@
       {
         "implementation": "A",
         "type": "int",
-        "internalPropertyName": "otelBatchTimeout",
         "default": "5000",
         "allowed": "[1-9]\\d*"
       }
@@ -3951,8 +3934,7 @@
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "otelLogsUrl"
+        "default": null
       }
     ],
     "OTEL_EXPORTER_OTLP_LOGS_HEADERS": [
@@ -3970,7 +3952,6 @@
         "implementation": "D",
         "type": "string",
         "default": "http/protobuf",
-        "internalPropertyName": "otelLogsProtocol",
         "aliases": [
           "OTEL_EXPORTER_OTLP_PROTOCOL"
         ]
@@ -3980,7 +3961,6 @@
       {
         "implementation": "A",
         "type": "int",
-        "internalPropertyName": "otelLogsTimeout",
         "default": "10000",
         "allowed": "[1-9]\\d*",
         "aliases": [
@@ -3992,8 +3972,7 @@
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "otelMetricsUrl"
+        "default": null
       }
     ],
     "OTEL_EXPORTER_OTLP_METRICS_HEADERS": [
@@ -4011,7 +3990,6 @@
         "implementation": "B",
         "type": "string",
         "default": "http/protobuf",
-        "internalPropertyName": "otelMetricsProtocol",
         "aliases": [
           "OTEL_EXPORTER_OTLP_PROTOCOL"
         ]
@@ -4023,7 +4001,6 @@
         "type": "string",
         "allowed": "Delta|Cumulative|LowMemory",
         "transform": "toUpperCase",
-        "internalPropertyName": "otelMetricsTemporalityPreference",
         "default": "delta"
       }
     ],
@@ -4032,7 +4009,6 @@
         "implementation": "B",
         "type": "int",
         "allowed": "[1-9]\\d*",
-        "internalPropertyName": "otelMetricsTimeout",
         "default": "10000",
         "aliases": [
           "OTEL_EXPORTER_OTLP_TIMEOUT"
@@ -4043,8 +4019,7 @@
       {
         "implementation": "A",
         "type": "string",
-        "default": "http/protobuf",
-        "internalPropertyName": "otelProtocol"
+        "default": "http/protobuf"
       }
     ],
     "OTEL_EXPORTER_OTLP_TIMEOUT": [
@@ -4052,7 +4027,6 @@
         "implementation": "A",
         "type": "int",
         "allowed": "[1-9]\\d*",
-        "internalPropertyName": "otelTimeout",
         "default": "10000"
       }
     ],
@@ -4079,7 +4053,6 @@
         "implementation": "A",
         "type": "int",
         "allowed": "[1-9]\\d*",
-        "internalPropertyName": "otelMetricsExportInterval",
         "default": "10000"
       }
     ],
@@ -4088,7 +4061,6 @@
         "implementation": "A",
         "type": "int",
         "allowed": "[1-9]\\d*",
-        "internalPropertyName": "otelMetricsExportTimeout",
         "default": "7500"
       }
     ],

package/packages/dd-trace/src/dogstatsd.js

@@ -266,6 +266,8 @@ class MetricsAggregationClient {
     this._captureTree(this._gauges, (node, name, tags) => {
       this._client.gauge(name, node.value, tags)
     })
+
+    this._gauges.clear()
   }
 
   _captureCounters () {
@@ -278,12 +280,7 @@ class MetricsAggregationClient {
 
   _captureHistograms () {
     this._captureTree(this._histograms, (node, name, tags) => {
-      let stats = node.value
-
-      // Stats can contain garbage data when a value was never recorded.
-      if (stats.count === 0) {
-        stats = { max: 0, min: 0, sum: 0, avg: 0, median: 0, p95: 0, count: 0 }
-      }
+      const stats = node.value
 
       this._client.gauge(`${name}.min`, stats.min, tags)
       this._client.gauge(`${name}.max`, stats.max, tags)
@@ -293,9 +290,9 @@ class MetricsAggregationClient {
       this._client.increment(`${name}.count`, stats.count, tags)
       this._client.gauge(`${name}.median`, stats.median, tags)
       this._client.gauge(`${name}.95percentile`, stats.p95, tags)
-
-      node.value.reset()
     })
+
+    this._histograms.clear()
   }
 
   _captureTree (tree, fn) {

package/packages/dd-trace/src/exporter.js

@@ -29,7 +29,7 @@ module.exports = function getExporter (name) {
         fs.existsSync(constants.DATADOG_LAMBDA_EXTENSION_PATH) ||
         fs.existsSync(constants.DATADOG_MINI_AGENT_PATH)
       )
-      return require(inAWSLambda && !usingAgent ? './exporters/log' : './exporters/agent')
+      return inAWSLambda && !usingAgent ? require('./exporters/log') : require('./exporters/agent')
     }
   }
 }

package/packages/dd-trace/src/git_metadata_tagger.js

@@ -8,7 +8,7 @@ class GitMetadataTagger {
   }
 
   tagGitMetadata (spanContext) {
-    if (this._config.gitMetadataEnabled) {
+    if (this._config.DD_TRACE_GIT_METADATA_ENABLED) {
       // These tags are added only to the local root span
       spanContext._trace.tags[SCI_COMMIT_SHA] = this._config.commitSHA
       spanContext._trace.tags[SCI_REPOSITORY_URL] = this._config.repositoryUrl

package/packages/dd-trace/src/llmobs/constants/tags.js

@@ -16,6 +16,9 @@ module.exports = {
   NAME: '_ml_obs.name',
   TRACE_ID: '_ml_obs.trace_id',
   PROPAGATED_TRACE_ID_KEY: '_dd.p.llmobs_trace_id',
+  LLMOBS_TRACE_ID_BRIDGE_KEY: 'llmobs_trace_id',
+  LLMOBS_PARENT_ID_BRIDGE_KEY: 'llmobs_parent_id',
+  LLMOBS_SUBMITTED_TAG_KEY: '_dd.llmobs.submitted',
   ROOT_PARENT_ID: 'undefined',
   DEFAULT_PROMPT_NAME: 'unnamed-prompt',
   INTERNAL_CONTEXT_VARIABLE_KEYS: '_dd_context_variable_keys',

package/packages/dd-trace/src/llmobs/sdk.js

@@ -7,7 +7,13 @@ const tracerVersion = require('../../../../package.json').version
 const logger = require('../log')
 const { getValueFromEnvSources } = require('../config/helper')
 const Span = require('../opentracing/span')
-const { SPAN_KIND, OUTPUT_VALUE, INPUT_VALUE } = require('./constants/tags')
+const {
+  SPAN_KIND,
+  OUTPUT_VALUE,
+  INPUT_VALUE,
+  LLMOBS_TRACE_ID_BRIDGE_KEY,
+  LLMOBS_PARENT_ID_BRIDGE_KEY,
+} = require('./constants/tags')
 const {
   getFunctionArguments,
   validateKind,
@@ -533,6 +539,20 @@ class LLMObs extends NoopLLMObs {
         ...options,
         parent: parentStore?.span,
       })
+
+      // Bridge tags read by the dd-go LLMObs trace-indexer to correlate OTel
+      // gen_ai.* spans with SDK LLMObs spans. Written once per local trace,
+      // on the first successful SDK LLMObs span registration. The shared
+      // _trace.tags bag is serialized to the first span in every flushed
+      // chunk's meta, so partial flush is covered automatically without a
+      // separate flush-time processor. Writing only after registerLLMObsSpan
+      // succeeds avoids poisoning _trace.tags with bridge tags pointing at a
+      // span that will never produce an LLMObs event.
+      const traceTags = span?.context?.()._trace?.tags
+      if (this.enabled && traceTags && !traceTags[LLMOBS_TRACE_ID_BRIDGE_KEY]) {
+        traceTags[LLMOBS_TRACE_ID_BRIDGE_KEY] = span.context().toTraceId(true)
+        traceTags[LLMOBS_PARENT_ID_BRIDGE_KEY] = span.context().toSpanId()
+      }
     }
 
     try {

package/packages/dd-trace/src/llmobs/span_processor.js

@@ -30,6 +30,7 @@ const {
   INPUT_PROMPT,
   ROUTING_API_KEY,
   ROUTING_SITE,
+  LLMOBS_SUBMITTED_TAG_KEY,
 } = require('./constants/tags')
 const { UNSERIALIZABLE_VALUE_TEXT } = require('./constants/text')
 const telemetry = require('./telemetry')
@@ -87,7 +88,19 @@ class LLMObsSpanProcessor {
         site: mlObsTags[ROUTING_SITE],
       }
 
-      this.#writer.append(formattedEvent, routing)
+      const enqueued = this.#writer.append(formattedEvent, routing)
+
+      // Marker read by the dd-go LLMObs trace-indexer: when reparenting OTel
+      // gen_ai.* spans, the parent-chain walk stops at any span carrying this
+      // tag, preserving this span as the immediate LLMObs parent. Set only
+      // when the writer actually buffered the event — format may have dropped
+      // it (user processor returned null), thrown, or the writer may have
+      // dropped it silently when its buffer is full. Leaving this tag off in
+      // those cases avoids dd-go reparenting OTel children under a span that
+      // has no corresponding LLMObs event.
+      if (enqueued) {
+        span.context()._tags[LLMOBS_SUBMITTED_TAG_KEY] = '1'
+      }
     } catch (e) {
       // this should be a rare case
       // we protect against unserializable properties in the format function, and in

package/packages/dd-trace/src/llmobs/writers/base.js

@@ -87,19 +87,25 @@ class BaseLLMObsWriter {
     return buffer
   }
 
+  /**
+   * @returns {boolean} `true` if the event was buffered, `false` if it was dropped
+   * (e.g. the per-routing buffer was full). Callers that depend on the event
+   * actually being submitted should check this value.
+   */
   append (event, routing, byteLength) {
     const buffer = this._getBuffer(routing)
 
     if (buffer.events.length >= buffer.limit) {
       logger.warn(`${this.constructor.name} event buffer full (limit is ${buffer.limit}), dropping event`)
       telemetry.recordDroppedPayload(1, this._eventType, 'buffer_full')
-      return
+      return false
     }
 
     const eventSize = byteLength || Buffer.byteLength(JSON.stringify(event))
 
     buffer.size += eventSize
     buffer.events.push(event)
+    return true
   }
 
   flush () {

package/packages/dd-trace/src/llmobs/writers/spans.js

@@ -45,7 +45,7 @@ class LLMObsSpanWriter extends BaseWriter {
       this.flush()
     }
 
-    super.append(event, routing, processedEventSizeBytes)
+    return super.append(event, routing, processedEventSizeBytes)
   }
 
   makePayload (events) {

package/packages/dd-trace/src/opentelemetry/logs/index.js

@@ -60,18 +60,18 @@ function initializeOpenTelemetryLogs (config) {
 
   // Create OTLP exporter using resolved config values
   const exporter = new OtlpHttpLogExporter(
-    config.otelLogsUrl,
+    config.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT,
     config.OTEL_EXPORTER_OTLP_LOGS_HEADERS,
-    config.otelLogsTimeout,
-    config.otelLogsProtocol,
+    config.OTEL_EXPORTER_OTLP_LOGS_TIMEOUT,
+    config.OTEL_EXPORTER_OTLP_LOGS_PROTOCOL,
     resourceAttributes
   )
 
   // Create batch processor for exporting logs to Datadog Agent
   const processor = new BatchLogRecordProcessor(
     exporter,
-    config.otelBatchTimeout,
-    config.otelMaxExportBatchSize
+    config.OTEL_BSP_SCHEDULE_DELAY,
+    config.OTEL_BSP_MAX_EXPORT_BATCH_SIZE
   )
 
   // Create logger provider with processor for Datadog Agent export

package/packages/dd-trace/src/opentelemetry/metrics/index.js

@@ -57,18 +57,18 @@ function initializeOpenTelemetryMetrics (config) {
   }
 
   const exporter = new OtlpHttpMetricExporter(
-    config.otelMetricsUrl,
+    config.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT,
     config.OTEL_EXPORTER_OTLP_METRICS_HEADERS,
-    config.otelMetricsTimeout,
-    config.otelMetricsProtocol,
+    config.OTEL_EXPORTER_OTLP_METRICS_TIMEOUT,
+    config.OTEL_EXPORTER_OTLP_METRICS_PROTOCOL,
     resourceAttributes
   )
 
   const reader = new PeriodicMetricReader(
     exporter,
-    config.otelMetricsExportInterval,
-    config.otelMetricsTemporalityPreference,
-    config.otelMaxQueueSize
+    config.OTEL_METRIC_EXPORT_INTERVAL,
+    config.OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE,
+    config.OTEL_BSP_MAX_QUEUE_SIZE
   )
 
   const meterProvider = new MeterProvider({ reader })

package/packages/dd-trace/src/opentelemetry/trace/otlp_http_trace_exporter.js

@@ -19,7 +19,7 @@ const OtlpTraceTransformer = require('./otlp_transformer')
  * (https://opentelemetry.io/docs/specs/otel/trace/sdk/#batching-processor).
  * Currently each finished trace is sent as its own HTTP request, which is
  * unsuitable for high-traffic production environments. The config values
- * `otelBatchTimeout`, `otelMaxExportBatchSize`, and `otelMaxQueueSize`
+ * `OTEL_BSP_SCHEDULE_DELAY`, `OTEL_BSP_MAX_EXPORT_BATCH_SIZE`, and `OTEL_BSP_MAX_QUEUE_SIZE`
  * (OTEL_BSP_*) are already defined and should drive that implementation.
  *
  * @class OtlpHttpTraceExporter

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -64,6 +64,7 @@ const tracestateTagValueFilter = /[^\x20-\x2B\x2D-\x3A\x3C-\x7D]/g
 const invalidSegment = /^0+$/
 const zeroTraceId = '0000000000000000'
 const hex16 = /^[0-9A-Fa-f]{16}$/
+const percentByte = /%([0-9A-Fa-f]{2})/g
 
 class TextMapPropagator {
   #extractB3Context
@@ -173,15 +174,15 @@ class TextMapPropagator {
       const baggageItems = getAllBaggageItems()
       if (!baggageItems) return
       for (const [key, value] of Object.entries(baggageItems)) {
-        const baggageKey = String(key).trim()
-        if (!baggageKey || !baggageTokenExpr.test(baggageKey)) continue
+        const baggageKey = key.trim()
+        if (!baggageTokenExpr.test(baggageKey)) continue
 
         // Do not trim values. If callers include leading/trailing whitespace, it must be percent-encoded.
         // W3C list-member allows optional properties after ';'.
         // https://www.w3.org/TR/baggage/#header-content
-        const item = `${baggageKey}=${encodeURIComponent(String(value))},`
+        const item = `${baggageKey}=${encodeURIComponent(value)},`
         itemCounter += 1
-        byteCounter += Buffer.byteLength(item)
+        byteCounter += item.length
 
         // Check for item count limit exceeded
         if (itemCounter > this._config.baggageMaxItems) {
@@ -209,7 +210,7 @@ class TextMapPropagator {
   _injectTags (spanContext, carrier) {
     const trace = spanContext._trace
 
-    if (this._config.tagsHeaderMaxLength === 0) {
+    if (this._config.DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH === 0) {
       log.debug('Trace tag propagation is disabled, skipping injection.')
       return
     }
@@ -228,7 +229,7 @@ class TextMapPropagator {
 
     const header = tags.join(',')
 
-    if (header.length > this._config.tagsHeaderMaxLength) {
+    if (header.length > this._config.DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH) {
       log.error('Trace tags from span are too large, skipping injection.')
     } else if (header) {
       carrier[tagsKey] = header
@@ -387,7 +388,7 @@ class TextMapPropagator {
       if (context === null) {
         context = extractedContext
         style = extractor
-        if (this._config.tracePropagationExtractFirst) {
+        if (this._config.DD_TRACE_PROPAGATION_EXTRACT_FIRST) {
           break
         }
       } else {
@@ -436,7 +437,7 @@ class TextMapPropagator {
     this._extractSamplingPriority(carrier, spanContext)
     this._extractTags(carrier, spanContext)
 
-    if (this._config.tracePropagationExtractFirst) return spanContext
+    if (this._config.DD_TRACE_PROPAGATION_EXTRACT_FIRST) return spanContext
 
     const tc = this._extractTraceparentContext(carrier)
 
@@ -706,9 +707,8 @@ class TextMapPropagator {
       try {
         value = decodeURIComponent(value)
       } catch {
-        tracerMetrics.count('context_header_style.malformed', ['header_style:baggage']).inc()
-        removeAllBaggageItems()
-        return
+        const bytes = value.replaceAll(percentByte, (_, hex) => String.fromCharCode(Number.parseInt(hex, 16)))
+        value = Buffer.from(bytes, 'binary').toString('utf8')
       }
 
       if (spanContext && (tagAllKeys || baggageTagKeys.has(key))) {
@@ -734,9 +734,9 @@ class TextMapPropagator {
 
     const trace = spanContext._trace
 
-    if (this._config.tagsHeaderMaxLength === 0) {
+    if (this._config.DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH === 0) {
       log.debug('Trace tag propagation is disabled, skipping extraction.')
-    } else if (carrier[tagsKey].length > this._config.tagsHeaderMaxLength) {
+    } else if (carrier[tagsKey].length > this._config.DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH) {
       log.error('Trace tags from carrier are too large, skipping extraction.')
     } else {
       const pairs = carrier[tagsKey].split(',')

package/packages/dd-trace/src/opentracing/span.js

@@ -112,7 +112,7 @@ class DatadogSpan {
     // even `Span` itself in this case.
     //
     // TODO: Refactor Tracer/Span + tests to avoid having to do nullish checks.
-    if (tracer?._config?.spanLeakDebug > 0) {
+    if (tracer?._config?.DD_TRACE_SPAN_LEAK_DEBUG > 0) {
       require('../spanleak').addSpan(this, operationName)
     }
 

package/packages/dd-trace/src/plugin_manager.js

@@ -163,9 +163,9 @@ module.exports = class PluginManager {
       dsmEnabled,
       clientIpEnabled,
       clientIpHeader,
-      memcachedCommandEnabled,
-      ciVisibilityTestSessionName,
-      ciVisAgentlessLogSubmissionEnabled,
+      DD_TRACE_MEMCACHED_COMMAND_ENABLED,
+      DD_TEST_SESSION_NAME,
+      DD_AGENTLESS_LOG_SUBMISSION_ENABLED,
       isTestDynamicInstrumentationEnabled,
       isServiceUserProvided,
       middlewareTracingEnabled,
@@ -180,13 +180,13 @@ module.exports = class PluginManager {
       codeOriginForSpans,
       dbmPropagationMode,
       dsmEnabled,
-      memcachedCommandEnabled,
+      DD_TRACE_MEMCACHED_COMMAND_ENABLED,
       site,
       url,
       headers: headerTags || [],
       clientIpHeader,
-      ciVisibilityTestSessionName,
-      ciVisAgentlessLogSubmissionEnabled,
+      DD_TEST_SESSION_NAME,
+      DD_AGENTLESS_LOG_SUBMISSION_ENABLED,
       isTestDynamicInstrumentationEnabled,
       isServiceUserProvided,
       traceWebsocketMessagesEnabled,

package/packages/dd-trace/src/plugins/log_plugin.js

@@ -51,7 +51,7 @@ module.exports = class LogPlugin extends Plugin {
   configure (config) {
     return super.configure({
       ...config,
-      enabled: config.enabled && (config.logInjection || config.ciVisAgentlessLogSubmissionEnabled),
+      enabled: config.enabled && (config.logInjection || config.DD_AGENTLESS_LOG_SUBMISSION_ENABLED),
     })
   }
 }

package/packages/dd-trace/src/plugins/util/test.js

@@ -1055,8 +1055,8 @@ function getIsFaultyEarlyFlakeDetection (projectSuites, testsBySuiteName, faulty
 }
 
 function getTestSessionName (config, trimmedCommand, envTags) {
-  if (config.ciVisibilityTestSessionName) {
-    return config.ciVisibilityTestSessionName
+  if (config.DD_TEST_SESSION_NAME) {
+    return config.DD_TEST_SESSION_NAME
   }
   const lageTestSessionName = getLageTestSessionName()
   if (lageTestSessionName) {

package/packages/dd-trace/src/proxy.js

@@ -128,11 +128,11 @@ class Tracer extends NoopProxy {
         lazyProxy(this, 'dogstatsd', () => require('./dogstatsd').CustomMetrics, config)
       }
 
-      if (config.spanLeakDebug > 0) {
+      if (config.DD_TRACE_SPAN_LEAK_DEBUG > 0) {
         const spanleak = require('./spanleak')
-        if (config.spanLeakDebug === spanleak.MODES.LOG) {
+        if (config.DD_TRACE_SPAN_LEAK_DEBUG === spanleak.MODES.LOG) {
           spanleak.enableLogging()
-        } else if (config.spanLeakDebug === spanleak.MODES.GC_AND_LOG) {
+        } else if (config.DD_TRACE_SPAN_LEAK_DEBUG === spanleak.MODES.GC_AND_LOG) {
           spanleak.enableGarbageCollection()
         }
         spanleak.startScrubber()
@@ -203,7 +203,7 @@ class Tracer extends NoopProxy {
 
       this._modules.rewriter.enable(config)
 
-      if (config.tracing && config.isManualApiEnabled) {
+      if (config.tracing && config.DD_CIVISIBILITY_MANUAL_API_ENABLED) {
         const TestApiManualPlugin = require('./ci-visibility/test-api-manual/test-api-manual-plugin')
         this._testApiManualPlugin = new TestApiManualPlugin(this)
         // `shouldGetEnvironmentData` is passed as false so that we only lazily calculate it
@@ -211,7 +211,7 @@ class Tracer extends NoopProxy {
         // are lazily configured when the library is imported.
         this._testApiManualPlugin.configure({ ...config, enabled: true }, false)
       }
-      if (config.ciVisAgentlessLogSubmissionEnabled) {
+      if (config.DD_AGENTLESS_LOG_SUBMISSION_ENABLED) {
         if (config.apiKey) {
           const LogSubmissionPlugin = require('./ci-visibility/log-submission/log-submission-plugin')
           const automaticLogPlugin = new LogSubmissionPlugin(this)
@@ -224,7 +224,7 @@ class Tracer extends NoopProxy {
         }
       }
 
-      if (config.otelLogsEnabled) {
+      if (config.DD_LOGS_OTEL_ENABLED) {
         const { initializeOpenTelemetryLogs } = require('./opentelemetry/logs')
         initializeOpenTelemetryLogs(config)
       }