instrumentation-http: Parse URL instead of relying on pathname (#169)

* instrumentation-http: Parse URL instead of relying on pathname * Run gts * Only parse .path * http: Added more failsafe to pathname detection
census-instrumentation · Nov 16, 2018 · d4b3d80 · d4b3d80
1 parent 55e0dbe
commit d4b3d80
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/opencensus-instrumentation-http/src/http.ts b/packages/opencensus-instrumentation-http/src/http.ts
@@ -198,9 +198,11 @@ export class HttpPlugin extends BasePlugin {
         }
 
         // Makes sure the url is an url object
+        let pathname = '';
         if (typeof (options) === 'string') {
           options = url.parse(options);
           arguments[0] = options;
+          pathname = options.pathname;
         } else {
           // Do not trace ourselves
           if (options.headers &&
@@ -209,6 +211,11 @@ export class HttpPlugin extends BasePlugin {
                 'header with "x-opencensus-outgoing-request" - do not trace');
             return original.apply(this, arguments);
           }
+
+          try {
+            pathname = options.pathname || url.parse(options.path).pathname;
+          } catch (e) {
+          }
         }
 
         const request = original.apply(this, arguments);
@@ -217,8 +224,7 @@ export class HttpPlugin extends BasePlugin {
 
         plugin.logger.debug('%s plugin outgoingRequest', plugin.moduleName);
         const traceOptions = {
-          name:
-              `${request.method ? request.method : 'GET'} ${options.pathname}`,
+          name: `${request.method ? request.method : 'GET'} ${pathname}`,
           kind: 'CLIENT',
         };