enableMiddlewareTracing -> middlewareTracingEnabled

DataDog · Jan 29, 2025 · eefbd9f · eefbd9f
1 parent ada7ede
commit eefbd9f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/packages/datadog-plugin-express/test/integration-test/client.spec.js b/packages/datadog-plugin-express/test/integration-test/client.spec.js
@@ -51,7 +51,7 @@ describe('esm', () => {
       })
     }).timeout(50000)
 
-    it('disables middleware spans when config.enableMiddlewareTracing is set to false through environment variable', async () => {
+    it('disables middleware spans when config.middlewareTracingEnabled is set to false through environment variable', async () => {
       process.env.DD_TRACE_MIDDLEWARE_ENABLED = false
       proc = await spawnPluginIntegrationTestProc(sandbox.folder, 'server.mjs', agent.port)
       const numberOfSpans = 1

diff --git a/packages/dd-trace/src/config.js b/packages/dd-trace/src/config.js
@@ -520,7 +520,7 @@ class Config {
     this._setValue(defaults, 'lookup', undefined)
     this._setValue(defaults, 'inferredProxyServicesEnabled', false)
     this._setValue(defaults, 'memcachedCommandEnabled', false)
-    this._setValue(defaults, 'enableMiddlewareTracing', true)
+    this._setValue(defaults, 'middlewareTracingEnabled', true)
     this._setValue(defaults, 'openAiLogsEnabled', false)
     this._setValue(defaults, 'openaiSpanCharLimit', 128)
     this._setValue(defaults, 'peerServiceMapping', {})
@@ -803,7 +803,7 @@ class Config {
     this._setBoolean(env, 'logInjection', DD_LOGS_INJECTION)
     // Requires an accompanying DD_APM_OBFUSCATION_MEMCACHED_KEEP_COMMAND=true in the agent
     this._setBoolean(env, 'memcachedCommandEnabled', DD_TRACE_MEMCACHED_COMMAND_ENABLED)
-    this._setBoolean(env, 'enableMiddlewareTracing', DD_TRACE_MIDDLEWARE_ENABLED)
+    this._setBoolean(env, 'middlewareTracingEnabled', DD_TRACE_MIDDLEWARE_ENABLED)
     this._setBoolean(env, 'openAiLogsEnabled', DD_OPENAI_LOGS_ENABLED)
     this._setValue(env, 'openaiSpanCharLimit', maybeInt(DD_OPENAI_SPAN_CHAR_LIMIT))
     this._envUnprocessed.openaiSpanCharLimit = DD_OPENAI_SPAN_CHAR_LIMIT
@@ -985,7 +985,7 @@ class Config {
     this._setString(opts, 'llmobs.mlApp', options.llmobs?.mlApp)
     this._setBoolean(opts, 'logInjection', options.logInjection)
     this._setString(opts, 'lookup', options.lookup)
-    this._setBoolean(opts, 'enableMiddlewareTracing', options.enableMiddlewareTracing)
+    this._setBoolean(opts, 'middlewareTracingEnabled', options.middlewareTracingEnabled)
     this._setBoolean(opts, 'openAiLogsEnabled', options.openAiLogsEnabled)
     this._setValue(opts, 'peerServiceMapping', options.peerServiceMapping)
     this._setBoolean(opts, 'plugins', options.plugins)

diff --git a/packages/dd-trace/src/plugins/util/web.js b/packages/dd-trace/src/plugins/util/web.js
@@ -45,7 +45,7 @@ const web = {
     const validateStatus = getStatusValidator(config)
     const hooks = getHooks(config)
     const filter = urlFilter.getFilter(config)
-    const enableMiddlewareTracing = getMiddlewareSetting(config, tracerConfig)
+    const middlewareTracingEnabled = getMiddlewareSetting(config, tracerConfig)
     const queryStringObfuscation = getQsObfuscator(config)
 
     return {
@@ -54,7 +54,7 @@ const web = {
       validateStatus,
       hooks,
       filter,
-      enableMiddlewareTracing,
+      middlewareTracingEnabled,
       queryStringObfuscation
     }
   },
@@ -572,13 +572,13 @@ function getHooks (config) {
 
 function getMiddlewareSetting (config, tracerConfig) {
   if (config) {
-    if (typeof config.enableMiddlewareTracing === 'boolean') {
-      return config.enableMiddlewareTracing
-    } else if (config.hasOwnProperty('enableMiddlewareTracing')) {
-      log.error('Expected `enableMiddlewareTracing` to be a boolean.')
+    if (typeof config.middlewareTracingEnabled === 'boolean') {
+      return config.middlewareTracingEnabled
+    } else if (config.hasOwnProperty('middlewareTracingEnabled')) {
+      log.error('Expected `middlewareTracingEnabled` to be a boolean.')
     }
   }
-  if (tracerConfig && tracerConfig.enableMiddlewareTracing === false) {
+  if (tracerConfig && tracerConfig.middlewareTracingEnabled === false) {
     return false
   }