Repository: honeycombio/beeline-nodejs
Pull request #291 (2021-01-18 05:03:42)

Bump fastify from 3.7.0 to 3.10.1
Bumps [fastify](https://github.com/fastify/fastify) from 3.7.0 to 3.10.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/fastify/fastify/releases">fastify's releases</a>.</em></p>
<blockquote>
<h2>v3.10.1</h2>
<p>📚 PR:</p>
<ul>
<li>avoid warning with exposeHeadRoute route option (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2797">#2797</a>)</li>
<li>docs(ecosystem): add fastify-doc (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2795">#2795</a>)</li>
</ul>
<h2>v3.10.0</h2>
<p>📚 PR:</p>
<ul>
<li>Correct small typo (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2741">#2741</a>)</li>
<li>updated deps (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2740">#2740</a>)</li>
<li>fix: setSerializerCompiler types (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2722">#2722</a>) (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2745">#2745</a>)</li>
<li>Update Ecosystem.md (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2751">#2751</a>)</li>
<li>deph: rename fluent-schema to fluent-json-schema (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2750">#2750</a>)</li>
<li>docs(readme): normalize all necessary code snippets to sh (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2754">#2754</a>)</li>
<li>build(deps-dev): bump undici from 2.2.1 to 3.0.0 (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2747">#2747</a>)</li>
<li>docs: fix a few typos (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2756">#2756</a>)</li>
<li>remove events.once dev dep (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2757">#2757</a>)</li>
<li>docs: fix a few typos (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2758">#2758</a>)</li>
<li>build(deps-dev): bump frameguard from 3.1.0 to 4.0.0 (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2759">#2759</a>)</li>
<li>Add fastify-awilix to Ecosystem.md (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2762">#2762</a>)</li>
<li>docs: upgrade all http links to https (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2763">#2763</a>)</li>
<li>move validation type to core (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2749">#2749</a>)</li>
<li>Added (probably) missing line for http2 server (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2681">#2681</a>)</li>
<li>Add comment explaining the role of SMI (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2766">#2766</a>)</li>
<li>feat: Set HEAD routes automatically for each GET route (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2700">#2700</a>)</li>
<li>Add fastify-openapi-docs and fastify-print-routes to the Ecosystem. (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2772">#2772</a>)</li>
<li>fix: Do not trigger errorHandler when reply.sent === true for async handlers (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2774">#2774</a>)</li>
<li>Update Encapsulation.md (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2777">#2777</a>)</li>
<li>add support for running preSerialization hooks for custom reply serializers (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2773">#2773</a>)</li>
<li>feat: add hint which plugin is requesting specific decorator (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2778">#2778</a>)</li>
<li>docs(ecosystem): add fastify-traps (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2783">#2783</a>)</li>
<li>chore: rename next to done (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2786">#2786</a>)</li>
<li>docs(ecosystem): add fastify-disablecache plugin (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2789">#2789</a>)</li>
<li>build(deps-dev): bump @sinonjs/fake-timers from 6.0.1 to 7.0.0 (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2791">#2791</a>)</li>
<li>Grammar and spelling corrections in documentation (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2793">#2793</a>)</li>
<li>fix(2767): prevent calling onRoute while prefixing (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2782">#2782</a>)</li>
<li>docs(ecosystem): add fastify-autoload to core list (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2796">#2796</a>)</li>
</ul>
<h2>v3.9.2</h2>
<p>📚 PR:</p>
<ul>
<li>Update the type definition of querystringParser (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2717">#2717</a>)</li>
<li>build(deps-dev): bump tsd from 0.13.1 to 0.14.0 (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2720">#2720</a>)</li>
<li>build(deps-dev): bump yup from 0.31.1 to 0.32.0 (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2721">#2721</a>)</li>
<li>Add encapsulation reference doc (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2724">#2724</a>)</li>
<li>Fix typo in encapsulation svg (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2725">#2725</a>)</li>
<li>Fix language (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2726">#2726</a>)</li>
<li>Add fastify-funky to Ecosystem.md (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2730">#2730</a>)</li>
<li>chore: update plugins team (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2732">#2732</a>)</li>
<li>Correct typo in type declaration file: factory function (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2737">#2737</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/fastify/fastify/commit/8abfd250b1542315bb7f9304f0296f98cac29c63"><code>8abfd25</code></a> Bumped v3.10.1</li>
<li><a href="https://github.com/fastify/fastify/commit/c3ff6d67470b4cd2792d87e4f462e464c9c40e21"><code>c3ff6d6</code></a> docs(ecosystem): add fastify-doc (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2795">#2795</a>)</li>
<li><a href="https://github.com/fastify/fastify/commit/047429eb832d7a631531a559231cfeacc1d682e7"><code>047429e</code></a> avoid warning with exposeHeadRoute route option (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2797">#2797</a>)</li>
<li><a href="https://github.com/fastify/fastify/commit/237d5346b45272d0dd851f04799c090a7b3a9700"><code>237d534</code></a> Bumped v3.10.0</li>
<li><a href="https://github.com/fastify/fastify/commit/e34d1eded110635c49a9e1b99040e22c316e288c"><code>e34d1ed</code></a> docs(ecosystem): add fastify-autoload to core list (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2796">#2796</a>)</li>
<li><a href="https://github.com/fastify/fastify/commit/5a6aa29a113704448433b6cc19f6e33032aae77f"><code>5a6aa29</code></a> fix(2767): prevent calling onRoute while prefixing (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2782">#2782</a>)</li>
<li><a href="https://github.com/fastify/fastify/commit/9135e8e79a03e02063b1e6b96115ac6abca5ccf0"><code>9135e8e</code></a> Grammar and spelling corrections in documentation (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2793">#2793</a>)</li>
<li><a href="https://github.com/fastify/fastify/commit/926b6bc339ca14c2cd812a7e11657685e6fa0020"><code>926b6bc</code></a> build(deps-dev): bump @sinonjs/fake-timers from 6.0.1 to 7.0.0 (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2791">#2791</a>)</li>
<li><a href="https://github.com/fastify/fastify/commit/bed540a5eb96b6ecb6cba15b7dc5fd22c153b96d"><code>bed540a</code></a> docs(ecosystem): add fastify-disablecache plugin (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2789">#2789</a>)</li>
<li><a href="https://github.com/fastify/fastify/commit/7edf5000ba1aab6f3f4ddd94300edf6b27eaccb8"><code>7edf500</code></a> chore: rename next to done (<a href="https://github-redirect.dependabot.com/fastify/fastify/issues/2786">#2786</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/fastify/fastify/compare/v3.7.0...v3.10.1">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=fastify&package-manager=npm_and_yarn&previous-version=3.7.0&new-version=3.10.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>


Patch:
diff --git a/.circleci/config.yml b/.circleci/config.yml
index b7d088c..acd4293 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,7 +19,7 @@ filters_publish: &filters_publish
 matrix_nodeversions: &matrix_nodeversions
   matrix:
     parameters:
-      nodeversion: ["9", "10", "11", "12", "14"]
+      nodeversion: ["9", "10", "11", "12", "14", "15"]
 
 # Default version of node to use for lint and publishing
 default_nodeversion: &default_nodeversion "12"
diff --git a/lib/instrumentation/http.js b/lib/instrumentation/http.js
index 7d3cb08..367c563 100644
--- a/lib/instrumentation/http.js
+++ b/lib/instrumentation/http.js
@@ -50,7 +50,7 @@ let instrumentHTTP = (http, opts = {}) => {
       // make sure options is populated enough for url.format to give us reasonable results.  these are all defaults from nodejs docs.
       combinedOptions.protocol = combinedOptions.protocol || "http:";
       combinedOptions.port = combinedOptions.port !== 80 ? combinedOptions.port : null;
-      combinedOptions.pathname = combinedOptions.path || "/";
+      combinedOptions.pathname = combinedOptions.pathname || combinedOptions.path || "/";
       if (!combinedOptions.hostname && !combinedOptions.host) {
         combinedOptions.hostname = "localhost";
       }
diff --git a/lib/instrumentation/https.js b/lib/instrumentation/https.js
index eb0e0e0..ee9da7d 100644
--- a/lib/instrumentation/https.js
+++ b/lib/instrumentation/https.js
@@ -51,7 +51,7 @@ let instrumentHTTPS = (https, opts = {}) => {
       // make sure options is populated enough for url.format to give us reasonable results.  these are all defaults from nodejs docs.
       combinedOptions.protocol = combinedOptions.protocol || "https:";
       combinedOptions.port = combinedOptions.port !== 443 ? combinedOptions.port : null;
-      combinedOptions.pathname = combinedOptions.path || "/";
+      combinedOptions.pathname = combinedOptions.pathname || combinedOptions.path || "/";
       if (!combinedOptions.hostname && !combinedOptions.host) {
         combinedOptions.hostname = "localhost";
       }
diff --git a/package-lock.json b/package-lock.json
index f701e8d..7c88014 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -395,9 +395,9 @@
       }
     },
     "@eslint/eslintrc": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz",
-      "integrity": "sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz",
+      "integrity": "sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -407,9 +407,17 @@
         "ignore": "^4.0.6",
         "import-fresh": "^3.2.1",
         "js-yaml": "^3.13.1",
-        "lodash": "^4.17.19",
+        "lodash": "^4.17.20",
         "minimatch": "^3.0.4",
         "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "dev": true
+        }
       }
     },
     "@istanbuljs/load-nyc-config": {
@@ -2586,13 +2594,13 @@
       }
     },
     "eslint": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz",
-      "integrity": "sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.18.0.tgz",
+      "integrity": "sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@eslint/eslintrc": "^0.2.2",
+        "@eslint/eslintrc": "^0.3.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -2616,7 +2624,7 @@
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
-        "lodash": "^4.17.19",
+        "lodash": "^4.17.20",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
@@ -2697,6 +2705,12 @@
             "type-check": "~0.4.0"
           }
         },
+        "lodash": {
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+          "dev": true
+        },
         "optionator": {
           "version": "0.9.1",
           "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -3200,34 +3214,14 @@
       "dev": true
     },
     "fast-json-stringify": {
-      "version": "2.2.9",
-      "resolved": "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-2.2.9.tgz",
-      "integrity": "sha512-O8YmNoc7LnfSafVaTfa1yXVFT4UMsi/N7cYcNZw6w5D5tltyu6XGXvH45mvWfsrcFoSK+H0q0exGXsUqC18z/g==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-2.4.1.tgz",
+      "integrity": "sha512-Nzqv9yf0JDIhWwA6GcSPKMPhHJYIexOLEw7psxZhPjnYlLuJ/SGEAihVC1whQu5bKJWE2VMmoGTcspv/6AGLVQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.11.0",
         "deepmerge": "^4.2.2",
         "string-similarity": "^4.0.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        }
       }
     },
     "fast-levenshtein": {
@@ -3248,18 +3242,18 @@
       "dev": true
     },
     "fastify": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/fastify/-/fastify-3.7.0.tgz",
-      "integrity": "sha512-xmiR1TOSNXXNHfEvBwhWlyj158q59vZkPLIKQ71f7qJG5QMPqCbeYUUFRaDKTaLFhRqmLLFprBpJsO5nbSMiPQ==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/fastify/-/fastify-3.10.1.tgz",
+      "integrity": "sha512-ChjHCXbCFzftVzQ1sDD8f8Ou1uDObkcVXBJmDkzVoZSNTxDrIapg63HIy3tPwScTNyMdmikA+QbP6zkGP+cFzw==",
       "dev": true,
       "requires": {
         "abstract-logging": "^2.0.0",
         "ajv": "^6.12.2",
         "avvio": "^7.1.2",
         "fast-json-stringify": "^2.2.1",
-        "fastify-error": "^0.2.0",
+        "fastify-error": "^0.3.0",
         "fastify-warning": "^0.2.0",
-        "find-my-way": "^3.0.0",
+        "find-my-way": "^3.0.5",
         "flatstr": "^1.0.12",
         "light-my-request": "^4.2.0",
         "pino": "^6.2.1",
@@ -3271,24 +3265,6 @@
         "tiny-lru": "^7.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -3318,9 +3294,9 @@
       }
     },
     "fastify-error": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/fastify-error/-/fastify-error-0.2.0.tgz",
-      "integrity": "sha512-zabxsBatj59ROG0fhP36zNdc5Q1/eYeH9oSF9uvfrurZf8/JKfrJbMcIGrLpLWcf89rS6L91RHWm20A/X85hcA==",
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/fastify-error/-/fastify-error-0.3.0.tgz",
+      "integrity": "sha512-Jm2LMTB5rsJqlS1+cmgqqM9tTs0UrlgYR7TvDT3ZgXsUI5ib1NjQlqZHf+tDK5tVPdFGwyq02wAoJtyYIRSiFA==",
       "dev": true
     },
     "fastify-warning": {
@@ -3330,9 +3306,9 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz",
-      "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz",
+      "integrity": "sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -4008,9 +3984,9 @@
       "dev": true
     },
     "husky": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.7.tgz",
-      "integrity": "sha512-0fQlcCDq/xypoyYSJvEuzbDPHFf8ZF9IXKJxlrnvxABTSzK1VPT2RKYQKrcgJ+YD39swgoB6sbzywUqFxUiqjw==",
+      "version": "4.3.8",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.8.tgz",
+      "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
@@ -6235,9 +6211,9 @@
       }
     },
     "light-my-request": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-4.2.1.tgz",
-      "integrity": "sha512-33FZvX/418IEy0sXldsLiJifbS/ruttcVveTbbZ8sQVR2VSFPA39hBu/iF/hVkt/1V0N7CdTQg4jiiVPdGgW8A==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-4.4.1.tgz",
+      "integrity": "sha512-FDNRF2mYjthIRWE7O8d/X7AzDx4otQHl4/QXbu3Q/FRwBFcgb+ZoDaUd5HwN53uQXLAiw76osN+Va0NEaOW6rQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.2",
@@ -6247,24 +6223,6 @@
         "set-cookie-parser": "^2.4.1"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -7341,23 +7299,23 @@
       }
     },
     "pino": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/pino/-/pino-6.7.0.tgz",
-      "integrity": "sha512-vPXJ4P9rWCwzlTJt+f0Ni4THc3DWyt8iDDCO4edQ8narTu6hnpzdXu8FqeSJCGndl1W6lfbYQUQihUO54y66Lw==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/pino/-/pino-6.11.0.tgz",
+      "integrity": "sha512-VPqEE2sU1z6wqkTtr7DdTktayTNE/JgeuWjfXh9g/TI6X7venzv4gaoU24/jSywf6bBeDfZRHWEeO/6f8bNppA==",
       "dev": true,
       "requires": {
         "fast-redact": "^3.0.0",
         "fast-safe-stringify": "^2.0.7",
         "flatstr": "^1.0.12",
-        "pino-std-serializers": "^2.4.2",
+        "pino-std-serializers": "^3.1.0",
         "quick-format-unescaped": "^4.0.1",
         "sonic-boom": "^1.0.2"
       }
     },
     "pino-std-serializers": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.5.0.tgz",
-      "integrity": "sha512-wXqbqSrIhE58TdrxxlfLwU9eDhrzppQDvGhBEr1gYbzzM4KKo3Y63gSjiDXRKLVS2UOXdPNR2v+KnQgNrs+xUg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-3.1.1.tgz",
+      "integrity": "sha512-Ud4+WzgEr/swOlfQdkxqKP2hlwuQlIqQ5YwYpo9MczNg2mpsKKyKgwQXW5KnP5tgH3/Cy9QRhAhLM8k1K+gfnA==",
       "dev": true
     },
     "pirates": {
@@ -7560,9 +7518,9 @@
       "integrity": "sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA=="
     },
     "queue-microtask": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.0.tgz",
-      "integrity": "sha512-J95OVUiS4b8qqmpqhCodN8yPpHG2mpZUPQ8tDGyIY0VhM+kBHszOuvsMJVGNQ1OH2BnTFbqz45i+2jGpDw9H0w==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz",
+      "integrity": "sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==",
       "dev": true
     },
     "quick-format-unescaped": {
@@ -7929,9 +7887,9 @@
       "dev": true
     },
     "rfdc": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
-      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.2.0.tgz",
+      "integrity": "sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA==",
       "dev": true
     },
     "rimraf": {
@@ -8052,9 +8010,9 @@
       }
     },
     "secure-json-parse": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.1.0.tgz",
-      "integrity": "sha512-GckO+MS/wT4UogDyoI/H/S1L0MCcKS1XX/vp48wfmU7Nw4woBmb8mIpu4zPBQjKlRT88/bt9xdoV4111jPpNJA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.2.0.tgz",
+      "integrity": "sha512-OYpk8nU1g9+5u6HZ+OOMZVpD037Jo5E9QzdDdQRe6b9ZPWOoB85AenHz5Rd90UwG8zdef69dO0axSosdBsDK9Q==",
       "dev": true
     },
     "semver": {
@@ -8163,9 +8121,9 @@
       "dev": true
     },
     "set-cookie-parser": {
-      "version": "2.4.6",
-      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.6.tgz",
-      "integrity": "sha512-mNCnTUF0OYPwYzSHbdRdCfNNHqrne+HS5tS5xNb6yJbdP9wInV0q5xPLE0EyfV/Q3tImo3y/OXpD8Jn0Jtnjrg==",
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.7.tgz",
+      "integrity": "sha512-VaSdYN1DlYuKOzBKqhYJnwaPeirZdNNUNmYdnp9/6Umr9s8amidctYitrX2Gk8wCqiBuiG5mpOYCiVhG5o4iMQ==",
       "dev": true
     },
     "set-value": {
@@ -8688,9 +8646,9 @@
       }
     },
     "string-similarity": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-similarity/-/string-similarity-4.0.2.tgz",
-      "integrity": "sha512-eCsPPyoQBgY4TMpVD6DVfO7pLrimUONriaO4Xjp3WPUW0YnNLqdHgRj23xotLlqrL90eJhBeq3zdAJf2mQgfBQ==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/string-similarity/-/string-similarity-4.0.4.tgz",
+      "integrity": "sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==",
       "dev": true
     },
     "string-width": {


Test patch:
diff --git a/lib/instrumentation/http.test.js b/lib/instrumentation/http.test.js
index f6efeb8..6255b84 100644
--- a/lib/instrumentation/http.test.js
+++ b/lib/instrumentation/http.test.js
@@ -82,6 +82,33 @@ test("url as options", (done) => {
   );
 });
 
+test("url as options with pathname and query", done => {
+  tracker.setTracked(newMockContext());
+
+  http.get(
+    {
+      hostname: "localhost",
+      port: 9009,
+      path: "/test?something=true",
+      pathname: "/test",
+      search: "?something=true",
+    },
+    res => {
+      expect(res.headers[api.TRACE_HTTP_HEADER.toLowerCase()]).toBe(
+        "1;trace_id=0,parent_id=51001,context=e30="
+      );
+      expect(api._apiForTesting().sentEvents).toEqual([
+        expect.objectContaining({
+          [schema.EVENT_TYPE]: "http",
+          name: "GET",
+          url: "http://localhost:9009/test?something=true",
+        }),
+      ]);
+      done();
+    }
+  );
+});
+
 test("correct response context", (done) => {
   tracker.setTracked(newMockContext());
 
diff --git a/lib/instrumentation/https.test.js b/lib/instrumentation/https.test.js
index 5b85512..2619dab 100644
--- a/lib/instrumentation/https.test.js
+++ b/lib/instrumentation/https.test.js
@@ -89,6 +89,44 @@ test("url as options", (done) => {
   );
 });
 
+test("url as options with pathname and query", done => {
+  tracker.setTracked(newMockContext());
+
+  https.get(
+    {
+      hostname: "google.com",
+      path: "/search?q=honeycomb.io",
+      pathname: "/search",
+      search: "?q=honeycomb.io",
+    },
+    _res => {
+      expect(api._apiForTesting().sentEvents).toMatchObject(
+        semver.lt(process.version, "9.0.0")
+          ? [
+              {
+                [schema.EVENT_TYPE]: "http",
+                [schema.TRACE_SPAN_NAME]: "GET",
+                url: "http://google.com:443/search?q=honeycomb.io",
+              },
+              {
+                [schema.EVENT_TYPE]: "https",
+                [schema.TRACE_SPAN_NAME]: "GET",
+                url: "https://google.com/search?q=honeycomb.io",
+              },
+            ]
+          : [
+              {
+                [schema.EVENT_TYPE]: "https",
+                [schema.TRACE_SPAN_NAME]: "GET",
+                url: "https://google.com/search?q=honeycomb.io",
+              },
+            ]
+      );
+      done();
+    }
+  );
+});
+
 test("correct response context", (done) => {
   tracker.setTracked(newMockContext());