feat: change code to use url.URL instead of url.parse

Author: yuxizhe

lib/instrumentation/express-utils.js

@@ -1,12 +1,7 @@
 'use strict'
 
-var parseUrl
-try {
-  parseUrl = require('parseurl')
-} catch (e) {
-  const url = require('url')
-  parseUrl = req => url.parse(req.url)
-}
+var url = require('url')
+
 var symbols = require('../symbols')
 
 function normalizeSlash (value) {
@@ -50,7 +45,7 @@ function getPathFromRequest (req, useBase, usePathAsTransactionName) {
   }
 
   if (usePathAsTransactionName) {
-    const parsed = parseUrl(req)
+    const parsed = url.URL ? new url.URL(req.url, 'relative:///') : url.parse(req.url)
     return parsed && parsed.pathname
   }
 }

lib/instrumentation/http-shared.js

@@ -80,15 +80,26 @@ function isRequestBlacklisted (agent, req) {
   return false
 }
 
+function formatURL (item) {
+  return {
+    href: item.href,
+    pathname: item.pathname,
+    protocol: item.protocol,
+    host: item.host,
+    port: item.port,
+    hostname: item.hostname,
+    hash: item.hash,
+    search: item.search
+  }
+}
 // NOTE: This will also stringify and parse URL instances
 // to a format which can be mixed into the options object.
 function ensureUrl (v) {
-  if (typeof v === 'string') {
+  if (url.URL && (v instanceof url.URL || typeof v === 'string')) {
+    const urlObj = new url.URL(v.toString(), 'relative:///')
+    return formatURL(urlObj)
+  } else if (typeof v === 'string') {
     return url.parse(v)
-  } else if (v instanceof url.Url) {
-    return v
-  } else if (url.URL && v instanceof url.URL) { // check for url.URL because it wasn't added until Node.js 6.13.0
-    return url.parse(v.toString())
   } else {
     return v
   }

lib/instrumentation/modules/http2.js

@@ -155,7 +155,8 @@ module.exports = function (http2, agent, { enabled }) {
 
       ins.bindEmitter(req)
 
-      var path = url.parse(headers[':path']).pathname
+      var urlObj = url.URL ? new url.URL(headers[':path'], 'relative:///') : url.parse(headers[':path'])
+      var path = urlObj.pathname
       span.name = headers[':method'] + ' ' + host + path
 
       req.on('end', () => {