fix: fix https tracing breakage in node <9 and rewrite http tests (#717)

PR-URL: #717
googleapis · Apr 5, 2018 · a3ea16d · a3ea16d
1 parent c66b041
commit a3ea16d
Show file tree

Hide file tree

Showing 5 changed files with 397 additions and 343 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -179,7 +179,6 @@ export const defaultConfig = {
     'hapi': path.join(pluginDirectory, 'plugin-hapi.js'),
     'http': path.join(pluginDirectory, 'plugin-http.js'),
     'http2': path.join(pluginDirectory, 'plugin-http2.js'),
-    'https': path.join(pluginDirectory, 'plugin-https.js'),
     'knex': path.join(pluginDirectory, 'plugin-knex.js'),
     'koa': path.join(pluginDirectory, 'plugin-koa.js'),
     'mongodb-core': path.join(pluginDirectory, 'plugin-mongodb-core.js'),

diff --git a/src/plugins/plugin-http.ts b/src/plugins/plugin-http.ts
@@ -183,7 +183,8 @@ function patchHttp(http: HttpModule, api: TraceAgent) {
   }
 }
 
-// https.get depends on https.request in <8.9 and >=8.9.1
+// https.get depends on Node http internals in 8.9.0 and 9+ instead of the
+// public http module.
 function patchHttps(https: HttpsModule, api: TraceAgent) {
   shimmer.wrap(https, 'request', (request) => {
     return makeRequestTrace('https:', request, api);
@@ -215,6 +216,13 @@ const plugin: Plugin = [
     patch: patchHttp,
     unpatch: unpatchHttp,
   },
+  {
+    file: 'https',
+    versions: '<8.9.0 || ^8.9.1',
+    // require http if it wasn't patched yet, because the https client uses
+    // the public 'http' module.
+    patch: () => require('http')
+  },
   {
     file: 'https',
     versions: '=8.9.0 || >=9.0.0',

diff --git a/src/plugins/plugin-https.ts b/src/plugins/plugin-https.ts