dd-trace 3.29.1 → 3.31.0

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

@@ -188,6 +188,31 @@ addHook({
   versions: ['>=24.8.0']
 }, getTestEnvironment)
 
+addHook({
+  name: '@jest/test-sequencer',
+  versions: ['>=24.8.0']
+}, sequencerPackage => {
+  shimmer.wrap(sequencerPackage.default.prototype, 'shard', shard => function () {
+    const shardedTests = shard.apply(this, arguments)
+
+    if (!shardedTests.length) {
+      return shardedTests
+    }
+    // TODO: could we get the rootDir from each test?
+    const [test] = shardedTests
+    const rootDir = test && test.context && test.context.config && test.context.config.rootDir
+
+    const filteredTests = getJestSuitesToRun(skippableSuites, shardedTests, rootDir || process.cwd())
+
+    isSuitesSkipped = filteredTests.length !== shardedTests.length
+
+    skippableSuites = []
+
+    return filteredTests
+  })
+  return sequencerPackage
+})
+
 function cliWrapper (cli, jestVersion) {
   const wrapped = shimmer.wrap(cli, 'runCLI', runCLI => async function () {
     let onDone
@@ -451,7 +476,18 @@ addHook({
       return getTestPaths.apply(this, arguments)
     }
 
-    const [{ rootDir }] = arguments
+    const [{ rootDir, shard }] = arguments
+
+    if (shard && shard.shardIndex) {
+      // If the user is using jest sharding, we want to apply the filtering of tests in the shard process.
+      // The reason for this is the following:
+      // The tests for different shards are likely being run in different CI jobs so
+      // the requests to the skippable endpoint might be done at different times and their responses might be different.
+      // If the skippable endpoint is returning different suites and we filter the list of tests here,
+      // the base list of tests that is used for sharding might be different,
+      // causing the shards to potentially run the same suite.
+      return getTestPaths.apply(this, arguments)
+    }
 
     const testPaths = await getTestPaths.apply(this, arguments)
     const { tests } = testPaths

package/packages/datadog-plugin-aws-sdk/src/base.js

@@ -31,11 +31,10 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       if (!this.isEnabled(request)) {
         return
       }
-      const serviceName = this.getServiceName()
       const childOf = this.tracer.scope().active()
       const tags = {
         'span.kind': 'client',
-        'service.name': serviceName,
+        'service.name': this.serviceName(),
         'aws.operation': operation,
         'aws.region': awsRegion,
         'region': awsRegion,
@@ -45,7 +44,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       }
       if (this.requestTags) this.requestTags.set(request, tags)
 
-      const span = this.tracer.startSpan('aws.request', { childOf, tags })
+      const span = this.tracer.startSpan(this.operationFromRequest(request), { childOf, tags })
 
       analyticsSampler.sample(span, this.config.measured)
 
@@ -79,6 +78,26 @@ class BaseAwsSdkPlugin extends ClientPlugin {
     // implemented by subclasses, or not
   }
 
+  operationFromRequest (request) {
+    // can be overriden by subclasses
+    return this.operationName({
+      id: 'aws',
+      type: 'web',
+      kind: 'client',
+      awsService: this.serviceIdentifier
+    })
+  }
+
+  serviceName () {
+    return this.config.service ||
+      super.serviceName({
+        id: 'aws',
+        type: 'web',
+        kind: 'client',
+        awsService: this.serviceIdentifier
+      })
+  }
+
   isEnabled (request) {
     const serviceId = this.serviceIdentifier.toUpperCase()
     const envVarValue = process.env[`DD_TRACE_AWS_SDK_${serviceId}_ENABLED`]
@@ -122,13 +141,6 @@ class BaseAwsSdkPlugin extends ClientPlugin {
   configure (config) {
     super.configure(normalizeConfig(config, this.serviceIdentifier))
   }
-
-  // TODO: test splitByAwsService when the test suite is fixed
-  getServiceName () {
-    return this.config.service
-      ? this.config.service
-      : `${this.tracer._service}-aws-${this.serviceIdentifier}`
-  }
 }
 
 function normalizeConfig (config, serviceIdentifier) {

package/packages/datadog-plugin-aws-sdk/src/services/lambda.js

@@ -48,6 +48,22 @@ class Lambda extends BaseAwsSdkPlugin {
       }
     }
   }
+
+  operationFromRequest (request) {
+    if (request.operation === 'invoke') {
+      return this.operationName({
+        type: 'web',
+        kind: 'client'
+      })
+    }
+
+    return this.operationName({
+      id: 'aws',
+      type: 'web',
+      kind: 'client',
+      awsService: 'lambda'
+    })
+  }
 }
 
 module.exports = Lambda

package/packages/datadog-plugin-aws-sdk/src/services/sns.js

@@ -27,6 +27,24 @@ class Sns extends BaseAwsSdkPlugin {
     // for example if it contains a phone number?
   }
 
+  operationFromRequest (request) {
+    switch (request.operation) {
+      case 'publish':
+      case 'publishBatch':
+        return this.operationName({
+          type: 'messaging',
+          kind: 'producer'
+        })
+    }
+
+    return this.operationName({
+      id: 'aws',
+      type: 'web',
+      kind: 'client',
+      awsService: 'sns'
+    })
+  }
+
   requestInject (span, request) {
     const { operation, params } = request
 

package/packages/datadog-plugin-aws-sdk/src/services/sqs.js

@@ -41,6 +41,29 @@ class Sqs extends BaseAwsSdkPlugin {
     })
   }
 
+  operationFromRequest (request) {
+    switch (request.operation) {
+      case 'receiveMessage':
+        return this.operationName({
+          type: 'messaging',
+          kind: 'consumer'
+        })
+      case 'sendMessage':
+      case 'sendMessageBatch':
+        return this.operationName({
+          type: 'messaging',
+          kind: 'producer'
+        })
+    }
+
+    return this.operationName({
+      id: 'aws',
+      type: 'web',
+      kind: 'client',
+      awsService: 'sqs'
+    })
+  }
+
   isEnabled (request) {
     // TODO(bengl) Figure out a way to make separate plugins for consumer and producer so that
     // config can be isolated to `.configure()` instead of this whole isEnabled() thing.

package/packages/datadog-plugin-cassandra-driver/src/index.js

@@ -14,7 +14,7 @@ class CassandraDriverPlugin extends DatabasePlugin {
     }
 
     this.startSpan(this.operationName(), {
-      service: this.serviceName(this.config, this.system),
+      service: this.serviceName({ pluginConfig: this.config, system: this.system }),
       resource: trim(query, 5000),
       type: 'cassandra',
       kind: 'client',

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

@@ -1,51 +1,57 @@
 'use strict'
 
-const Plugin = require('../../dd-trace/src/plugins/plugin')
+const StoragePlugin = require('../../dd-trace/src/plugins/storage')
 const { storage } = require('../../datadog-core')
-const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
 
-class CouchBasePlugin extends Plugin {
-  static get id () {
-    return 'couchbase'
-  }
+class CouchBasePlugin extends StoragePlugin {
+  static get id () { return 'couchbase' }
+  static get peerServicePrecursors () { return ['db.couchbase.seed.nodes'] }
 
-  addSubs (func, start, finish = defaultFinish) {
+  addSubs (func, start) {
     this.addSub(`apm:couchbase:${func}:start`, start)
-    this.addSub(`apm:couchbase:${func}:error`, this.addError)
-    this.addSub(`apm:couchbase:${func}:finish`, finish)
+    this.addSub(`apm:couchbase:${func}:error`, error => this.addError(error))
+    this.addSub(`apm:couchbase:${func}:finish`, message => this.finish(message))
   }
 
-  startSpan (operation, customTags, store, { bucket, collection }) {
+  startSpan (operation, customTags, store, { bucket, collection, seedNodes }) {
     const tags = {
       'db.type': 'couchbase',
       'component': 'couchbase',
-      'service.name': this.config.service || `${this.tracer._service}-couchbase`,
       'resource.name': `couchbase.${operation}`,
-      'span.kind': 'client'
+      'span.kind': this.constructor.kind,
+      'db.couchbase.seed.nodes': seedNodes
     }
 
+    if (bucket) tags['couchbase.bucket.name'] = bucket.name
+    if (collection) tags['couchbase.collection.name'] = collection.name
+
     for (const tag in customTags) {
       tags[tag] = customTags[tag]
     }
-    const span = this.tracer.startSpan(`couchbase.${operation}`, {
-      childOf: store ? store.span : null,
-      tags
-    })
 
-    if (bucket) span.setTag(`couchbase.bucket.name`, bucket.name)
-    if (collection) span.setTag(`couchbase.collection.name`, collection.name)
-
-    analyticsSampler.sample(span, this.config.measured)
-    return span
+    return super.startSpan(
+      this.operationName({ operation }),
+      {
+        service: this.serviceName({ pluginConfig: this.config }),
+        meta: tags
+      }
+    )
   }
 
   constructor (...args) {
     super(...args)
 
-    this.addSubs('query', ({ resource, bucket }) => {
+    this.addSubs('query', ({ resource, bucket, seedNodes }) => {
       const store = storage.getStore()
-      const span = this.startSpan('query', { 'span.type': 'sql', 'resource.name': resource },
-        store, { bucket })
+      const span = this.startSpan(
+        'query', {
+          'span.type': 'sql',
+          'resource.name': resource,
+          'span.kind': this.constructor.kind
+        },
+        store,
+        { bucket, seedNodes }
+      )
       this.enter(span, store)
     })
 
@@ -56,16 +62,12 @@ class CouchBasePlugin extends Plugin {
     this._addCommandSubs('prepend')
   }
   _addCommandSubs (name) {
-    this.addSubs(name, ({ bucket, collection }) => {
+    this.addSubs(name, ({ bucket, collection, seedNodes }) => {
       const store = storage.getStore()
-      const span = this.startSpan(name, {}, store, { bucket, collection })
+      const span = this.startSpan(name, {}, store, { bucket, collection, seedNodes })
       this.enter(span, store)
     })
   }
 }
 
-function defaultFinish () {
-  storage.getStore().span.finish()
-}
-
 module.exports = CouchBasePlugin

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

@@ -9,7 +9,7 @@ class ElasticsearchPlugin extends DatabasePlugin {
     const body = getBody(params.body || params.bulkBody)
 
     this.startSpan(this.operationName(), {
-      service: this.serviceName(this.config),
+      service: this.serviceName({ pluginConfig: this.config }),
       resource: `${params.method} ${quantizePath(params.path)}`,
       type: 'elasticsearch',
       kind: 'client',

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

@@ -21,6 +21,7 @@ class FetchPlugin extends HttpClientPlugin {
 
     const store = super.bindStart(message)
 
+    message.headers = headers
     message.req = new globalThis.Request(req, { headers })
 
     return store

package/packages/datadog-plugin-http/src/client.js

@@ -8,8 +8,8 @@ const formats = require('../../../ext/formats')
 const HTTP_HEADERS = formats.HTTP_HEADERS
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 const log = require('../../dd-trace/src/log')
-const url = require('url')
 const { CLIENT_PORT_KEY, COMPONENT, ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
+const { URL } = require('url')
 
 const HTTP_STATUS_CODE = tags.HTTP_STATUS_CODE
 const HTTP_REQUEST_HEADERS = tags.HTTP_REQUEST_HEADERS
@@ -36,12 +36,12 @@ class HttpClientPlugin extends ClientPlugin {
     const method = (options.method || 'GET').toUpperCase()
     const childOf = store && allowed ? store.span : null
     // TODO delegate to super.startspan
-    const span = this.startSpan('http.request', {
+    const span = this.startSpan(this.operationName(), {
       childOf,
       meta: {
         [COMPONENT]: this.constructor.id,
         'span.kind': 'client',
-        'service.name': getServiceName(this.tracer, this.config, options),
+        'service.name': this.serviceName({ pluginConfig: this.config, sessionDetails: extractSessionDetails(options) }),
         'resource.name': method,
         'span.type': 'http',
         'http.method': method,
@@ -217,25 +217,15 @@ function hasAmazonSignature (options) {
   return search && search.toLowerCase().indexOf('x-amz-signature=') !== -1
 }
 
-function getServiceName (tracer, config, options) {
-  if (config.splitByDomain) {
-    return getHost(options)
-  } else if (config.service) {
-    return config.service
-  }
-
-  return tracer._service
-}
-
-function getHost (options) {
+function extractSessionDetails (options) {
   if (typeof options === 'string') {
-    return url.parse(options).host
+    return new URL(options).host
   }
 
-  const hostname = options.hostname || options.host || 'localhost'
+  const host = options.hostname || options.host || 'localhost'
   const port = options.port
 
-  return [hostname, port].filter(val => val).join(':')
+  return { host, port }
 }
 
 function startsWith (searchString) {

package/packages/datadog-plugin-http/src/server.js

@@ -23,8 +23,16 @@ class HttpServerPlugin extends ServerPlugin {
 
   start ({ req, res, abortController }) {
     const store = storage.getStore()
-    const span = web.startSpan(this.tracer, this.config, req, res, 'web.request')
-
+    const span = web.startSpan(
+      this.tracer,
+      {
+        ...this.config,
+        service: this.config.service || this.serviceName()
+      },
+      req,
+      res,
+      this.operationName()
+    )
     span.setTag(COMPONENT, this.constructor.id)
 
     this._parentStore = store

package/packages/datadog-plugin-http2/src/client.js

@@ -38,12 +38,12 @@ class Http2ClientPlugin extends ClientPlugin {
 
     const store = storage.getStore()
     const childOf = store && allowed ? store.span : null
-    const span = this.startSpan('http.request', {
+    const span = this.startSpan(this.operationName(), {
       childOf,
       meta: {
         [COMPONENT]: this.constructor.id,
         [SPAN_KIND]: CLIENT,
-        'service.name': getServiceName(this.tracer, this.config, sessionDetails),
+        'service.name': this.serviceName({ pluginConfig: this.config, sessionDetails }),
         'resource.name': method,
         'span.type': 'http',
         'http.method': method,
@@ -133,20 +133,6 @@ function extractSessionDetails (authority, options) {
   return { protocol, port, host }
 }
 
-function getFormattedHostString (host, port) {
-  return [host, port].filter(val => val).join(':')
-}
-
-function getServiceName (tracer, config, sessionDetails) {
-  if (config.splitByDomain) {
-    return getFormattedHostString(sessionDetails.host, sessionDetails.port)
-  } else if (config.service) {
-    return config.service
-  }
-
-  return tracer._service
-}
-
 function hasAmazonSignature (headers, path) {
   if (headers) {
     headers = Object.keys(headers)

package/packages/datadog-plugin-http2/src/server.js

@@ -18,7 +18,16 @@ class Http2ServerPlugin extends ServerPlugin {
 
   start ({ req, res }) {
     const store = storage.getStore()
-    const span = web.startSpan(this.tracer, this.config, req, res, 'web.request')
+    const span = web.startSpan(
+      this.tracer,
+      {
+        ...this.config,
+        service: this.config.service || this.serviceName()
+      },
+      req,
+      res,
+      this.operationName()
+    )
 
     span.setTag(COMPONENT, this.constructor.id)
 

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

@@ -10,7 +10,7 @@ class MemcachedPlugin extends CachePlugin {
     const address = getAddress(client, server, query)
 
     this.startSpan({
-      service: this.serviceName(this.config, this.system),
+      service: this.serviceName({ pluginConfig: this.config, system: this.system }),
       resource: query.type,
       type: 'memcached',
       meta: {

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -12,7 +12,7 @@ class MongodbCorePlugin extends DatabasePlugin {
     const query = getQuery(ops)
     const resource = truncate(getResource(this, ns, query, name))
     this.startSpan(this.operationName(), {
-      service: this.serviceName(this.config),
+      service: this.serviceName({ pluginConfig: this.config }),
       resource,
       type: 'mongodb',
       kind: 'client',
@@ -57,7 +57,7 @@ function truncate (input) {
 }
 
 function shouldSimplify (input) {
-  return !isObject(input)
+  return !isObject(input) || typeof input.toJSON === 'function'
 }
 
 function shouldHide (input) {

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

@@ -8,7 +8,7 @@ class MySQLPlugin extends DatabasePlugin {
   static get system () { return 'mysql' }
 
   start (payload) {
-    const service = this.serviceName(this.config, payload.conf, this.system)
+    const service = this.serviceName({ pluginConfig: this.config, dbConfig: payload.conf, system: this.system })
     this.startSpan(this.operationName(), {
       service,
       resource: payload.sql,

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

@@ -19,11 +19,11 @@ class NextPlugin extends ServerPlugin {
   start ({ req, res }) {
     const store = storage.getStore()
     const childOf = store ? store.span : store
-    const span = this.tracer.startSpan('next.request', {
+    const span = this.tracer.startSpan(this.operationName(), {
       childOf,
       tags: {
         [COMPONENT]: this.constructor.id,
-        'service.name': this.config.service || this.tracer._service,
+        'service.name': this.config.service || this.serviceName(),
         'resource.name': req.method,
         'span.type': 'web',
         'span.kind': 'server',

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

@@ -10,7 +10,7 @@ class OracledbPlugin extends DatabasePlugin {
   static get peerServicePrecursors () { return ['db.instance', 'db.hostname'] }
 
   start ({ query, connAttrs }) {
-    const service = this.serviceName(this.config, connAttrs)
+    const service = this.serviceName({ pluginConfig: this.config, params: connAttrs })
     const url = getUrl(connAttrs.connectString)
 
     this.startSpan(this.operationName(), {

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

@@ -9,7 +9,7 @@ class PGPlugin extends DatabasePlugin {
   static get system () { return 'postgres' }
 
   start ({ params = {}, query, processId }) {
-    const service = this.serviceName(this.config, params)
+    const service = this.serviceName({ pluginConfig: this.config, params })
     const originalStatement = query.text
 
     this.startSpan(this.operationName(), {

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

@@ -15,7 +15,7 @@ class RedisPlugin extends CachePlugin {
 
     this.startSpan({
       resource,
-      service: this.serviceName(this.config, this.system, connectionName),
+      service: this.serviceName({ pluginConfig: this.config, system: this.system, connectionName }),
       type: 'redis',
       meta: {
         'db.type': 'redis',

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

@@ -10,7 +10,7 @@ class TediousPlugin extends DatabasePlugin {
 
   start ({ queryOrProcedure, connectionConfig }) {
     this.startSpan(this.operationName(), {
-      service: this.serviceName(this.config, this.system),
+      service: this.serviceName({ pluginConfig: this.config, system: this.system }),
       resource: queryOrProcedure,
       type: 'sql',
       kind: 'client',

package/packages/dd-trace/src/appsec/iast/analyzers/weak-hash-analyzer.js

@@ -2,6 +2,7 @@
 
 const path = require('path')
 
+const { getNodeModulesPaths } = require('../path-line')
 const Analyzer = require('./vulnerability-analyzer')
 const { WEAK_HASH } = require('../vulnerabilities')
 
@@ -11,13 +12,16 @@ const INSECURE_HASH_ALGORITHMS = new Set([
   'RSA-SHA1', 'RSA-SHA1-2', 'sha1', 'md5-sha1', 'sha1WithRSAEncryption', 'ssl3-sha1'
 ].map(algorithm => algorithm.toLowerCase()))
 
-const EXCLUDED_LOCATIONS = [
-  path.join('node_modules', 'etag', 'index.js'),
-  path.join('node_modules', 'redlock', 'dist', 'cjs'),
-  path.join('node_modules', 'ws', 'lib', 'websocket-server.js'),
-  path.join('node_modules', 'mysql2', 'lib', 'auth_41.js'),
-  path.join('node_modules', '@mikro-orm', 'core', 'utils', 'Utils.js')
-]
+const EXCLUDED_LOCATIONS = getNodeModulesPaths(
+  'etag/index.js',
+  '@mikro-orm/core/utils/Utils.js',
+  'mongodb/lib/core/connection/connection.js',
+  'mysql2/lib/auth_41.js',
+  'pusher/lib/utils.js',
+  'redlock/dist/cjs',
+  'sqreen/lib/package-reader/index.js',
+  'ws/lib/websocket-server.js'
+)
 
 const EXCLUDED_PATHS_FROM_STACK = [
   path.join('node_modules', 'object-hash', path.sep)

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

@@ -69,7 +69,7 @@ function parseUser (login, passportUser, mode) {
   if (mode === 'safe') {
     // Remove PII in safe mode
     if (!regexUsername.test(user['usr.id'])) {
-      user['usr.id'] = ' '
+      user['usr.id'] = ''
     }
   }
 

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

@@ -11,6 +11,7 @@ const tagger = require('./tagger')
 const { isTrue, isFalse } = require('./util')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('./plugins/util/tags')
 const { getGitMetadataFromGitProperties } = require('./git_properties')
+const { getIsGCPFunction, getIsAzureFunctionConsumptionPlan } = require('./serverless')
 
 const fromEntries = Object.fromEntries || (entries =>
   entries.reduce((obj, [k, v]) => Object.assign(obj, { [k]: v }), {}))
@@ -189,6 +190,7 @@ class Config {
       process.env.AWS_LAMBDA_FUNCTION_NAME ||
       process.env.FUNCTION_NAME || // Google Cloud Function Name set by deprecated runtimes
       process.env.K_SERVICE || // Google Cloud Function Name set by newer runtimes
+      process.env.WEBSITE_SITE_NAME || // set by Azure Functions
       pkg.name ||
       'node'
     const DD_SERVICE_MAPPING = coalesce(
@@ -227,11 +229,10 @@ class Config {
 
     const inAWSLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined
 
-    const isDeprecatedGCPFunction = process.env.FUNCTION_NAME !== undefined && process.env.GCP_PROJECT !== undefined
-    const isNewerGCPFunction = process.env.K_SERVICE !== undefined && process.env.FUNCTION_TARGET !== undefined
-    const isGCPFunction = isDeprecatedGCPFunction || isNewerGCPFunction
+    const isGCPFunction = getIsGCPFunction()
+    const isAzureFunctionConsumptionPlan = getIsAzureFunctionConsumptionPlan()
 
-    const inServerlessEnvironment = inAWSLambda || isGCPFunction
+    const inServerlessEnvironment = inAWSLambda || isGCPFunction || isAzureFunctionConsumptionPlan
 
     const DD_TRACE_TELEMETRY_ENABLED = coalesce(
       process.env.DD_TRACE_TELEMETRY_ENABLED,
@@ -362,7 +363,7 @@ class Config {
     const DD_TRACE_STATS_COMPUTATION_ENABLED = coalesce(
       options.stats,
       process.env.DD_TRACE_STATS_COMPUTATION_ENABLED,
-      isGCPFunction
+      isGCPFunction || isAzureFunctionConsumptionPlan
     )
 
     const DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED = coalesce(
@@ -678,6 +679,7 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
     this.traceId128BitLoggingEnabled = isTrue(DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED)
 
     this.isGCPFunction = isGCPFunction
+    this.isAzureFunctionConsumptionPlan = isAzureFunctionConsumptionPlan
 
     tagger.add(this.tags, {
       service: this.service,

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

@@ -135,7 +135,8 @@ module.exports = class PluginManager {
       site,
       url,
       dbmPropagationMode,
-      dsmEnabled
+      dsmEnabled,
+      clientIpEnabled
     } = this._tracerConfig
 
     const sharedConfig = {}
@@ -155,6 +156,10 @@ module.exports = class PluginManager {
       sharedConfig.service = serviceMapping[name]
     }
 
+    if (clientIpEnabled !== undefined) {
+      sharedConfig.clientIpEnabled = clientIpEnabled
+    }
+
     sharedConfig.site = site
     sharedConfig.url = url