dd-trace 5.83.0 → 5.84.0

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

@@ -6,45 +6,45 @@ const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 const {
-  TEST_STATUS,
   finishAllTraceSpans,
-  getTestSuitePath,
   getTestSuiteCommonTags,
-  TEST_SOURCE_START,
+  getTestSuitePath,
+  isModifiedTest,
+  TEST_BROWSER_NAME,
+  TEST_BROWSER_VERSION,
   TEST_CODE_OWNERS,
-  TEST_SOURCE_FILE,
-  TEST_PARAMETERS,
+  TEST_COMMAND,
+  TEST_EARLY_FLAKE_ABORT_REASON,
+  TEST_EARLY_FLAKE_ENABLED,
+  TEST_HAS_FAILED_ALL_RETRIES,
+  TEST_IS_MODIFIED,
   TEST_IS_NEW,
   TEST_IS_RETRY,
-  TEST_EARLY_FLAKE_ENABLED,
-  TEST_EARLY_FLAKE_ABORT_REASON,
-  TELEMETRY_TEST_SESSION,
-  TEST_RETRY_REASON,
-  TEST_MANAGEMENT_IS_QUARANTINED,
+  TEST_IS_RUM_ACTIVE,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_MANAGEMENT_ENABLED,
-  TEST_BROWSER_NAME,
-  TEST_MANAGEMENT_IS_DISABLED,
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
-  TEST_HAS_FAILED_ALL_RETRIES,
-  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
-  TEST_SESSION_ID,
+  TEST_MANAGEMENT_IS_DISABLED,
+  TEST_MANAGEMENT_IS_QUARANTINED,
   TEST_MODULE_ID,
-  TEST_COMMAND,
   TEST_MODULE,
-  TEST_SUITE,
-  TEST_SUITE_ID,
   TEST_NAME,
-  TEST_IS_RUM_ACTIVE,
-  TEST_BROWSER_VERSION,
+  TEST_PARAMETERS,
   TEST_RETRY_REASON_TYPES,
-  TEST_IS_MODIFIED,
-  isModifiedTest
+  TEST_RETRY_REASON,
+  TEST_SESSION_ID,
+  TEST_SOURCE_FILE,
+  TEST_SOURCE_START,
+  TEST_STATUS,
+  TEST_SUITE_ID,
+  TEST_SUITE,
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
   TELEMETRY_EVENT_CREATED,
-  TELEMETRY_EVENT_FINISHED
+  TELEMETRY_EVENT_FINISHED,
+  TELEMETRY_TEST_SESSION,
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 const log = require('../../dd-trace/src/log')

package/packages/datadog-shimmer/src/shimmer.js

@@ -76,11 +76,8 @@ function wrapFunction (original, wrapper) {
   if (typeof original !== 'function') return original
 
   const wrapped = wrapper(original)
-
-  if (typeof original === 'function') {
-    assertNotClass(original)
-    copyProperties(original, wrapped)
-  }
+  assertNotClass(original)
+  copyProperties(original, wrapped)
 
   return wrapped
 }

package/packages/dd-trace/src/agent/info.js

@@ -0,0 +1,57 @@
+'use strict'
+
+const request = require('../exporters/common/request')
+
+const CACHE_TTL_MS = 60_000 // 1 minute
+
+let cachedUrl = null
+let cachedData = null
+let cachedTimestamp = 0
+
+module.exports = {
+  fetchAgentInfo,
+  clearCache // For testing purposes only
+}
+
+/**
+ * Fetches agent information from the /info endpoint
+ * @param {URL} url - The agent URL
+ * @param {Function} callback - Callback function with signature (err, agentInfo)
+ */
+function fetchAgentInfo (url, callback) {
+  const urlKey = url.href
+
+  if (cachedUrl !== null && cachedUrl !== urlKey) {
+    // Clear cache if URL changes
+    clearCache()
+  } else if (cachedData !== null && (Date.now() - cachedTimestamp) < CACHE_TTL_MS) {
+    // Return cached result if still valid
+    return process.nextTick(callback, null, cachedData)
+  }
+
+  request('', {
+    path: '/info',
+    url
+  }, (err, res) => {
+    if (err) {
+      return callback(err)
+    }
+
+    try {
+      cachedData = JSON.parse(res)
+    } catch (e) {
+      return callback(e)
+    }
+
+    cachedUrl = urlKey
+    cachedTimestamp = Date.now()
+
+    callback(null, cachedData)
+  })
+}
+
+function clearCache () {
+  cachedUrl = null
+  cachedData = null
+  cachedTimestamp = 0
+}

package/packages/dd-trace/src/agent/url.js

@@ -0,0 +1,28 @@
+'use strict'
+
+const { URL, format } = require('url')
+const defaults = require('../config/defaults')
+
+module.exports = { getAgentUrl }
+
+// TODO: Investigate merging with the getAgentUrl function in config/index.js which has
+// additional logic for unix socket auto-detection on Linux. The config version is only used
+// during config initialization, while this one is used throughout the codebase. Consider if
+// the unix socket detection should be part of this general helper or remain config-specific.
+
+/**
+ * Gets the agent URL from config, constructing it from hostname/port if needed
+ * @param {ReturnType<import('../config')>} config - Tracer configuration object
+ * @returns {URL} The agent URL
+ */
+function getAgentUrl (config) {
+  const { url, hostname, port } = config
+  if (url) {
+    return url instanceof URL ? url : new URL(url)
+  }
+  return new URL(format({
+    protocol: 'http:',
+    hostname: hostname || defaults.hostname,
+    port: port || defaults.port
+  }))
+}

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

@@ -104,6 +104,8 @@ function enable (_config) {
   }
 }
 
+const analyzedBodies = new WeakSet()
+
 function onRequestBodyParsed ({ req, res, body, abortController }) {
   if (body === undefined || body === null) return
 
@@ -120,6 +122,12 @@ function onRequestBodyParsed ({ req, res, body, abortController }) {
     storedBodies.set(req, body)
   }
 
+  // eslint-disable-next-line eslint-rules/eslint-safe-typeof-object
+  if (typeof body === 'object') {
+    if (isEmptyObject(body)) return
+    analyzedBodies.add(body)
+  }
+
   const results = waf.run({
     persistent: {
       [addresses.HTTP_INCOMING_BODY]: body
@@ -129,12 +137,17 @@ function onRequestBodyParsed ({ req, res, body, abortController }) {
   handleResults(results?.actions, req, res, rootSpan, abortController)
 }
 
+const analyzedCookies = new WeakSet()
+
 function onRequestCookieParser ({ req, res, abortController, cookies }) {
   if (!cookies || typeof cookies !== 'object') return
 
   const rootSpan = web.root(req)
   if (!rootSpan) return
 
+  if (isEmptyObject(cookies)) return
+  analyzedCookies.add(cookies)
+
   const results = waf.run({
     persistent: {
       [addresses.HTTP_INCOMING_COOKIES]: cookies
@@ -178,19 +191,34 @@ function incomingHttpEndTranslator ({ req, res }) {
   const persistent = {}
 
   // we need to keep this to support other body parsers
-  // TODO: no need to analyze it if it was already done by the body-parser hook
   if (req.body !== undefined && req.body !== null) {
-    persistent[addresses.HTTP_INCOMING_BODY] = req.body
+    // eslint-disable-next-line eslint-rules/eslint-safe-typeof-object
+    if (typeof req.body === 'object') {
+      if (!isEmptyObject(req.body) && !analyzedBodies.has(req.body)) {
+        persistent[addresses.HTTP_INCOMING_BODY] = req.body
+      }
+    } else {
+      persistent[addresses.HTTP_INCOMING_BODY] = req.body
+    }
   }
 
   // we need to keep this to support other cookie parsers
-  if (req.cookies !== null && typeof req.cookies === 'object') {
+  if (
+    req.cookies !== null &&
+    typeof req.cookies === 'object' &&
+    !isEmptyObject(req.cookies) &&
+    !analyzedCookies.has(req.cookies)
+  ) {
     persistent[addresses.HTTP_INCOMING_COOKIES] = req.cookies
   }
 
   // we need to keep this to support nextjs
   const query = req.query
-  if (query !== null && typeof query === 'object') {
+  if (
+    query !== null &&
+    typeof query === 'object' &&
+    !isEmptyObject(query)
+  ) {
     persistent[addresses.HTTP_INCOMING_QUERY] = query
   }
 
@@ -198,7 +226,7 @@ function incomingHttpEndTranslator ({ req, res }) {
     persistent[addresses.WAF_CONTEXT_PROCESSOR] = { 'extract-schema': true }
   }
 
-  if (Object.keys(persistent).length) {
+  if (!isEmptyObject(persistent)) {
     waf.run({ persistent }, req)
   }
 
@@ -273,6 +301,8 @@ function onRequestQueryParsed ({ req, res, query, abortController }) {
   const rootSpan = web.root(req)
   if (!rootSpan) return
 
+  if (isEmptyObject(query)) return
+
   const results = waf.run({
     persistent: {
       [addresses.HTTP_INCOMING_QUERY]: query
@@ -286,7 +316,7 @@ function onRequestProcessParams ({ req, res, abortController, params }) {
   const rootSpan = web.root(req)
   if (!rootSpan) return
 
-  if (!params || typeof params !== 'object' || !Object.keys(params).length) return
+  if (!params || typeof params !== 'object' || isEmptyObject(params)) return
 
   const results = waf.run({
     persistent: {
@@ -310,7 +340,7 @@ function onResponseBody ({ req, res, body }) {
 }
 
 function onResponseWriteHead ({ req, res, abortController, statusCode, responseHeaders }) {
-  if (Object.keys(responseHeaders).length) {
+  if (!isEmptyObject(responseHeaders)) {
     storedResponseHeaders.set(req, responseHeaders)
   }
 
@@ -401,6 +431,16 @@ function disable () {
   if (responseSetHeader.hasSubscribers) responseSetHeader.unsubscribe(onResponseSetHeader)
 }
 
+// this is faster than Object.keys().length === 0
+function isEmptyObject (obj) {
+  // eslint-disable-next-line no-unreachable-loop
+  for (const _ in obj) {
+    return false
+  }
+
+  return true
+}
+
 module.exports = {
   enable,
   disable,

package/packages/dd-trace/src/ci-visibility/exporters/agent-proxy/index.js

@@ -4,6 +4,7 @@ const AgentWriter = require('../../../exporters/agent/writer')
 const AgentlessWriter = require('../agentless/writer')
 const CoverageWriter = require('../agentless/coverage-writer')
 const CiVisibilityExporter = require('../ci-visibility-exporter')
+const { fetchAgentInfo } = require('../../../agent/info')
 
 const AGENT_EVP_PROXY_PATH_PREFIX = '/evp_proxy/v'
 const AGENT_EVP_PROXY_PATH_REGEX = /\/evp_proxy\/v(\d+)\/?/
@@ -42,11 +43,11 @@ class AgentProxyCiVisibilityExporter extends CiVisibilityExporter {
       isTestDynamicInstrumentationEnabled
     } = config
 
-    this.getAgentInfo((err, agentInfo) => {
+    fetchAgentInfo(this._url, (err, agentInfo) => {
       this._isInitialized = true
       let latestEvpProxyVersion = getLatestEvpProxyVersion(err, agentInfo)
       const isEvpCompatible = latestEvpProxyVersion >= 2
-      const isGzipCompatible = latestEvpProxyVersion >= 4
+      this._isGzipCompatible = latestEvpProxyVersion >= 4
 
       // v3 does not work well citestcycle, so we downgrade to v2
       if (latestEvpProxyVersion === 3) {
@@ -72,7 +73,6 @@ class AgentProxyCiVisibilityExporter extends CiVisibilityExporter {
             const DynamicInstrumentationLogsWriter = require('../agentless/di-logs-writer')
             this._logsWriter = new DynamicInstrumentationLogsWriter({
               url: this._url,
-              tags,
               isAgentProxy: true
             })
             this._canForwardLogs = true
@@ -92,7 +92,6 @@ class AgentProxyCiVisibilityExporter extends CiVisibilityExporter {
       this._resolveCanUseCiVisProtocol(isEvpCompatible)
       this.exportUncodedTraces()
       this.exportUncodedCoverages()
-      this._isGzipCompatible = isGzipCompatible
     })
   }
 

package/packages/dd-trace/src/ci-visibility/exporters/agentless/di-logs-writer.js

@@ -11,7 +11,8 @@ const BaseWriter = require('../../../exporters/common/writer')
 // It is used to encode and send logs to both the logs intake directly and the
 // `/debugger/v1/input` endpoint in the agent, which is a proxy to the logs intake.
 class DynamicInstrumentationLogsWriter extends BaseWriter {
-  constructor ({ url, timeout, isAgentProxy = false }) {
+  // TODO: what's a good value for timeout for the logs intake?
+  constructor ({ url, timeout = 15_000, isAgentProxy = false }) {
     super(...arguments)
     this._url = url
     this._encoder = new JSONEncoder()
@@ -27,8 +28,7 @@ class DynamicInstrumentationLogsWriter extends BaseWriter {
         'dd-api-key': getValueFromEnvSources('DD_API_KEY'),
         'Content-Type': 'application/json'
       },
-      // TODO: what's a good value for timeout for the logs intake?
-      timeout: this.timeout || 15_000,
+      timeout: this.timeout,
       url: this._url
     }
 

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

@@ -8,7 +8,7 @@ const { getKnownTests: getKnownTestsRequest } = require('../early-flake-detectio
 const { getTestManagementTests: getTestManagementTestsRequest } =
   require('../test-management/get-test-management-tests')
 const log = require('../../log')
-const AgentInfoExporter = require('../../exporters/common/agent-info-exporter')
+const BufferingExporter = require('../../exporters/common/buffering-exporter')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../../plugins/util/tags')
 const { sendGitMetadata: sendGitMetadataRequest } = require('./git/git_metadata')
 
@@ -34,7 +34,7 @@ function getIsTestSessionTrace (trace) {
 const GIT_UPLOAD_TIMEOUT = 60_000 // 60 seconds
 const CAN_USE_CI_VIS_PROTOCOL_TIMEOUT = GIT_UPLOAD_TIMEOUT
 
-class CiVisibilityExporter extends AgentInfoExporter {
+class CiVisibilityExporter extends BufferingExporter {
   constructor (config) {
     super(config)
     this._timer = undefined
@@ -103,10 +103,6 @@ class CiVisibilityExporter extends AgentInfoExporter {
     )
   }
 
-  shouldRequestLibraryConfiguration () {
-    return this._config.isIntelligentTestRunnerEnabled
-  }
-
   canReportSessionTraces () {
     return this._canUseCiVisProtocol
   }
@@ -163,9 +159,6 @@ class CiVisibilityExporter extends AgentInfoExporter {
   getLibraryConfiguration (testConfiguration, callback) {
     const { repositoryUrl } = testConfiguration
     this.sendGitMetadata(repositoryUrl)
-    if (!this.shouldRequestLibraryConfiguration()) {
-      return callback(null, {})
-    }
     this._canUseCiVisProtocolPromise.then((canUseCiVisProtocol) => {
       if (!canUseCiVisProtocol) {
         return callback(null, {})

package/packages/dd-trace/src/ci-visibility/telemetry.js

@@ -21,8 +21,12 @@ const formattedTags = {
 
 // Transform tags dictionary to array of strings.
 // If tag value is true, then only tag key is added to the array.
+/**
+ * @param {Record<string, unknown>} tagsDictionary
+ * @returns {string[]}
+ */
 function formatMetricTags (tagsDictionary) {
-  return Object.keys(tagsDictionary).reduce((acc, tagKey) => {
+  return Object.keys(tagsDictionary).reduce((/** @type {string[]} */ acc, tagKey) => {
     if (tagKey === 'statusCode') {
       const statusCode = tagsDictionary[tagKey]
       if (isStatusCode400(statusCode)) {
@@ -31,7 +35,7 @@ function formatMetricTags (tagsDictionary) {
       acc.push(`error_type:${getErrorTypeFromStatusCode(statusCode)}`)
       return acc
     }
-    const formattedTagKey = formattedTags[tagKey] || tagKey
+    const formattedTagKey = /** @type {string} */(formattedTags[tagKey] || tagKey)
     if (tagsDictionary[tagKey] === true) {
       acc.push(formattedTagKey)
     } else if (tagsDictionary[tagKey] !== undefined && tagsDictionary[tagKey] !== null) {

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

@@ -600,6 +600,7 @@ class Config {
       OTEL_TRACES_SAMPLER,
       OTEL_TRACES_SAMPLER_ARG,
       DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED,
+      DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS,
       OTEL_EXPORTER_OTLP_LOGS_ENDPOINT,
       OTEL_EXPORTER_OTLP_LOGS_HEADERS,
       OTEL_EXPORTER_OTLP_LOGS_PROTOCOL,
@@ -776,7 +777,15 @@ class Config {
       maybeFloat(DD_DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS)
     unprocessedTarget['dynamicInstrumentation.uploadInterval'] = DD_DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS
     this.#setString(target, 'env', DD_ENV || tags.env)
-    this.#setBoolean(target, 'experimental.flaggingProvider.enabled', DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED)
+    this.#setBoolean(
+      target,
+      'experimental.flaggingProvider.enabled',
+      DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED
+    )
+    if (DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS != null) {
+      target['experimental.flaggingProvider.initializationTimeoutMs'] =
+        maybeInt(DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS)
+    }
     this.#setBoolean(target, 'traceEnabled', DD_TRACE_ENABLED)
     this.#setBoolean(target, 'experimental.aiguard.enabled', DD_AI_GUARD_ENABLED)
     this.#setString(target, 'experimental.aiguard.endpoint', DD_AI_GUARD_ENDPOINT)
@@ -1112,6 +1121,11 @@ class Config {
     this.#setBoolean(opts, 'experimental.enableGetRumData', options.experimental?.enableGetRumData)
     this.#setString(opts, 'experimental.exporter', options.experimental?.exporter)
     this.#setBoolean(opts, 'experimental.flaggingProvider.enabled', options.experimental?.flaggingProvider?.enabled)
+    opts['experimental.flaggingProvider.initializationTimeoutMs'] = maybeInt(
+      options.experimental?.flaggingProvider?.initializationTimeoutMs
+    )
+    this.#optsUnprocessed['experimental.flaggingProvider.initializationTimeoutMs'] =
+      options.experimental?.flaggingProvider?.initializationTimeoutMs
     opts.flushInterval = maybeInt(options.flushInterval)
     this.#optsUnprocessed.flushInterval = options.flushInterval
     opts.flushMinSpans = maybeInt(options.flushMinSpans)

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

@@ -169,6 +169,7 @@ function enable (rc, config, onConfigUpdated) {
 
   // Debugger
   rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_ENABLE_DYNAMIC_INSTRUMENTATION, true)
+  rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_ENABLE_LIVE_DEBUGGING, true)
 
   // Code Origin
   rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_ENABLE_CODE_ORIGIN, true)

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

@@ -73,11 +73,11 @@
     "DD_ENV": ["A"],
     "DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED": ["A"],
     "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED": ["A"],
+    "DD_EXPERIMENTAL_FLAGGING_PROVIDER_INITIALIZATION_TIMEOUT_MS": ["A"],
     "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": ["A"],
     "DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_ENABLED": ["A"],
     "DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR": ["A"],
     "DD_EXTERNAL_ENV": ["A"],
-    "DD_FLAGGING_PROVIDER_ENABLED": ["A"],
     "DD_GIT_BRANCH": ["A"],
     "DD_GIT_COMMIT_AUTHOR_DATE": ["A"],
     "DD_GIT_COMMIT_AUTHOR_EMAIL": ["A"],

package/packages/dd-trace/src/crashtracking/crashtracker.js

@@ -1,13 +1,11 @@
 'use strict'
 
-const { URL } = require('url')
-
 // Load binding first to not import other modules if it throws
 const libdatadog = require('@datadog/libdatadog')
 const binding = libdatadog.load('crashtracker')
 
 const log = require('../log')
-const defaults = require('../config/defaults')
+const { getAgentUrl } = require('../agent/url')
 const pkg = require('../../../../package.json')
 const processTags = require('../process-tags')
 
@@ -52,8 +50,7 @@ class Crashtracker {
 
   // TODO: Send only configured values when defaults are fixed.
   #getConfig (config) {
-    const { hostname = defaults.hostname, port = defaults.port } = config
-    const url = config.url || new URL(`http://${hostname}:${port}`)
+    const url = getAgentUrl(config)
 
     return {
       additional_files: [],

package/packages/dd-trace/src/datastreams/writer.js

@@ -1,12 +1,11 @@
 'use strict'
 
-const { URL, format } = require('url')
 const zlib = require('zlib')
 const pkg = require('../../../../package.json')
 const log = require('../log')
 const request = require('../exporters/common/request')
 const { MsgpackEncoder } = require('../msgpack')
-const defaults = require('../config/defaults')
+const { getAgentUrl } = require('../agent/url')
 
 const msgpack = new MsgpackEncoder()
 
@@ -32,12 +31,7 @@ function makeRequest (data, url, cb) {
 
 class DataStreamsWriter {
   constructor (config) {
-    const { hostname = defaults.hostname, port = defaults.port, url } = config
-    this._url = url || new URL(format({
-      protocol: 'http:',
-      hostname,
-      port
-    }))
+    this._url = getAgentUrl(config)
   }
 
   flush (payload) {

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

@@ -1,8 +1,7 @@
 'use strict'
 
 const { workerData: { config: parentConfig, parentThreadId, configPort } } = require('node:worker_threads')
-const { format } = require('node:url')
-const defaults = require('../../config/defaults')
+const { getAgentUrl } = require('../../agent/url')
 const log = require('./log')
 
 const config = module.exports = {
@@ -19,11 +18,7 @@ configPort.on('messageerror', (err) =>
 )
 
 function updateUrl (updates) {
-  config.url = updates.url || format({
-    protocol: 'http:',
-    hostname: updates.hostname || defaults.hostname,
-    port: updates.port
-  })
+  config.url = getAgentUrl(updates)
 
   config.dynamicInstrumentation.captureTimeoutNs = BigInt(updates.dynamicInstrumentation.captureTimeoutMs) * 1_000_000n
 }

package/packages/dd-trace/src/debugger/devtools_client/json-buffer.js

@@ -11,26 +11,25 @@ class JSONBuffer {
     this.#maxSize = size
     this.#timeout = timeout
     this.#onFlush = onFlush
-    this.#reset()
-  }
-
-  #reset () {
-    clearTimeout(this.#timer)
-    this.#timer = undefined
-    this.#partialJson = undefined
   }
 
   #flush () {
     const json = `${this.#partialJson}]`
-    this.#reset()
+    this.#partialJson = undefined
     this.#onFlush(json)
   }
 
   write (str, size = Buffer.byteLength(str)) {
-    if (this.#timer === undefined) {
+    if (this.#partialJson === undefined) {
       this.#partialJson = `[${str}`
-      this.#timer = setTimeout(() => this.#flush(), this.#timeout)
-    } else if (Buffer.byteLength(/** @type {string} */ (this.#partialJson)) + size + 2 > this.#maxSize) {
+      if (this.#timer === undefined) {
+        this.#timer = setTimeout(() => this.#flush(), this.#timeout)
+      } else {
+        this.#timer.refresh()
+      }
+    } else if (Buffer.byteLength(this.#partialJson) + size + 2 > this.#maxSize) {
+      clearTimeout(this.#timer)
+      this.#timer = undefined
       this.#flush()
       this.write(str, size)
     } else {

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

@@ -3,12 +3,12 @@
 const lookup = require('dns').lookup // cache to avoid instrumentation
 const dgram = require('dgram')
 const isIP = require('net').isIP
-const { URL, format } = require('url')
 
 const request = require('./exporters/common/request')
 const log = require('./log')
 const Histogram = require('./histogram')
 const defaults = require('./config/defaults')
+const { getAgentUrl } = require('./agent/url')
 
 const MAX_BUFFER_SIZE = 1024 // limit from the agent
 
@@ -179,14 +179,8 @@ class DogStatsDClient {
       tags
     }
 
-    if (config.url) {
-      clientConfig.metricsProxyUrl = config.url
-    } else if (config.port) {
-      clientConfig.metricsProxyUrl = new URL(format({
-        protocol: 'http:',
-        hostname: config.hostname || defaults.hostname,
-        port: config.port
-      }))
+    if (config.url || config.port) {
+      clientConfig.metricsProxyUrl = getAgentUrl(config)
     }
 
     return clientConfig

package/packages/dd-trace/src/exporters/agent/index.js

@@ -1,8 +1,8 @@
 'use strict'
 
-const { URL, format } = require('url')
+const { URL } = require('url')
 const log = require('../../log')
-const defaults = require('../../config/defaults')
+const { getAgentUrl } = require('../../agent/url')
 const Writer = require('./writer')
 
 class AgentExporter {
@@ -10,12 +10,8 @@ class AgentExporter {
 
   constructor (config, prioritySampler) {
     this._config = config
-    const { url, hostname = defaults.hostname, port, lookup, protocolVersion, stats = {}, apmTracingEnabled } = config
-    this._url = url || new URL(format({
-      protocol: 'http:',
-      hostname,
-      port
-    }))
+    const { lookup, protocolVersion, stats = {}, apmTracingEnabled } = config
+    this._url = getAgentUrl(config)
 
     const headers = {}
     if (stats.enabled || apmTracingEnabled === false) {

package/packages/dd-trace/src/exporters/agent/writer.js

@@ -12,8 +12,9 @@ const BaseWriter = require('../common/writer')
 const METRIC_PREFIX = 'datadog.tracer.node.exporter.agent'
 
 class AgentWriter extends BaseWriter {
-  constructor ({ prioritySampler, lookup, protocolVersion, headers, config = {} }) {
-    super(...arguments)
+  constructor (...args) {
+    super(...args)
+    const { prioritySampler, lookup, protocolVersion, headers, config = {} } = args[0]
     const AgentEncoder = getEncoder(protocolVersion)
 
     this._prioritySampler = prioritySampler