fix: don't throw on invalid URL (#1771)

Fixes #1769 Co-authored-by: Vignesh Shanmugam <vignesh.shanmugam22@gmail.com>
elastic · Jul 22, 2020 · ec61513 · ec61513
1 parent 94acd33
commit ec61513
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/instrumentation/http-shared.js b/lib/instrumentation/http-shared.js
@@ -209,7 +209,16 @@ exports.traceOutgoingRequest = function (agent, moduleName, method) {
             url
           })
 
-          span.setDestinationContext(getHTTPDestination(url, span.type))
+          // The `getHTTPDestination` function might throw in case an
+          // invalid URL is given to the `URL()` function. Until we can
+          // be 100% sure this doesn't happen, we better catch it here.
+          // For details, see:
+          // https://github.com/elastic/apm-agent-nodejs/issues/1769
+          try {
+            span.setDestinationContext(getHTTPDestination(url, span.type))
+          } catch (e) {
+            agent.logger.error('Could not set destination context:', e.message)
+          }
 
           span.end()
         }

diff --git a/lib/instrumentation/modules/http2.js b/lib/instrumentation/modules/http2.js
@@ -179,7 +179,16 @@ module.exports = function (http2, agent, { enabled }) {
           url
         })
 
-        span.setDestinationContext(getHTTPDestination(url, span.type))
+        // The `getHTTPDestination` function might throw in case an
+        // invalid URL is given to the `URL()` function. Until we can
+        // be 100% sure this doesn't happen, we better catch it here.
+        // For details, see:
+        // https://github.com/elastic/apm-agent-nodejs/issues/1769
+        try {
+          span.setDestinationContext(getHTTPDestination(url, span.type))
+        } catch (e) {
+          agent.logger.error('Could not set destination context:', e.message)
+        }
 
         span.end()
       })