Change config.url to be a string instead of a URL object

DataDog · Sep 11, 2024 · 80565db · 80565db
1 parent 14ebf97
commit 80565db
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/packages/dd-trace/src/appsec/remote_config/manager.js b/packages/dd-trace/src/appsec/remote_config/manager.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { URL, format } = require('url')
+const { format } = require('url')
 const uuid = require('crypto-randomuuid')
 const { EventEmitter } = require('events')
 const tracerVersion = require('../../../../../package.json').version
@@ -27,11 +27,11 @@ class RemoteConfigManager extends EventEmitter {
 
     const pollInterval = Math.floor(config.remoteConfig.pollInterval * 1000)
 
-    this.url = config.url || new URL(format({
+    this.url = config.url || format({
       protocol: 'http:',
       hostname: config.hostname || 'localhost',
       port: config.port
-    }))
+    })
 
     this._handlers = new Map()
     const appliedConfigs = this.appliedConfigs = new Map()

diff --git a/packages/dd-trace/src/config.js b/packages/dd-trace/src/config.js
@@ -1226,7 +1226,10 @@ function maybeFloat (number) {
 }
 
 function getAgentUrl (url, options) {
-  if (url) return new URL(url)
+  if (url) {
+    if (typeof url === 'string') return url
+    if (url instanceof URL) return url.toString()
+  }
 
   if (os.type() === 'Windows_NT') return
 
@@ -1238,7 +1241,7 @@ function getAgentUrl (url, options) {
     !process.env.DD_TRACE_AGENT_PORT &&
     fs.existsSync('/var/run/datadog/apm.socket')
   ) {
-    return new URL('unix:///var/run/datadog/apm.socket')
+    return 'unix:///var/run/datadog/apm.socket'
   }
 }
 

diff --git a/packages/dd-trace/src/dogstatsd.js b/packages/dd-trace/src/dogstatsd.js
@@ -174,11 +174,11 @@ class DogStatsDClient {
     if (config.url) {
       clientConfig.metricsProxyUrl = config.url
     } else if (config.port) {
-      clientConfig.metricsProxyUrl = new URL(format({
+      clientConfig.metricsProxyUrl = format({
         protocol: 'http:',
         hostname: config.hostname || 'localhost',
         port: config.port
-      }))
+      })
     }
 
     return clientConfig

diff --git a/packages/dd-trace/src/startup-log.js b/packages/dd-trace/src/startup-log.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const { format } = require('url')
 const { info, warn } = require('./log/writer')
 
 const os = require('os')
@@ -54,7 +55,11 @@ function startupLog ({ agentError } = {}) {
 }
 
 function tracerInfo () {
-  const url = config.url || `http://${config.hostname || 'localhost'}:${config.port}`
+  const url = config.url || format({
+    protocol: 'http:',
+    hostname: config.hostname || 'localhost',
+    port: config.port
+  })
 
   const out = {
     [inspect.custom] () {