@contrast/agent-bundle 5.39.1 → 5.41.0

package/node_modules/@contrast/route-coverage/lib/index.js

@@ -16,7 +16,6 @@
 'use strict';
 
 const { callChildComponentMethodsSync, Event } = require('@contrast/common');
-const NormalizedUrlMapper = require('./normalized-url-mapper');
 
 /**
  * @param {import('.').Core & {
@@ -36,18 +35,14 @@ module.exports = function init(core) {
   const routeQueue = new Map();
 
   const routeIdentifier = (method, signature) => `${method}.${signature}`;
-  const routeCoverage = core.routeCoverage = {
-    _normalizedUrlMapper: new NormalizedUrlMapper(),
-
-    uriPathToNormalizedUrl(uriPath) {
-      return this._normalizedUrlMapper.map(uriPath);
-    },
 
+  const routeCoverage = core.routeCoverage = {
     discover(info) {
-      logger.trace({ info }, 'Discovered new route:');
-      routeInfo.set(routeIdentifier(info.method, info.signature), info);
-      this._normalizedUrlMapper.handleDiscover(info);
+      const id = routeIdentifier(info.method, info.signature);
+      if (routeInfo.get(id)) return;
 
+      logger.trace({ info }, 'Discovered new route:');
+      routeInfo.set(id, info);
     },
 
     discoveryFinished() {
@@ -67,7 +62,7 @@ module.exports = function init(core) {
       if (routeQueue.size === 1) {
         setTimeout(() => {
           this.discoveryFinished();
-        }, 10000);
+        }, 10_000);
       }
     },
 
@@ -99,16 +94,12 @@ module.exports = function init(core) {
       route.method = info.method;
       route.url = info.url;
       const store = scopes.sources.getStore();
-      if (store && !store.route) {
-        store.route = route;
-      }
 
+      if (store) store.route = route;
       if (recentlyObserved.has(route.signature)) return;
 
       recentlyObserved.add(route.signature);
-
       logger.trace({ info }, 'Observed route:');
-
       // these events need source correlation
       messages.emit(Event.ROUTE_COVERAGE_OBSERVATION, {
         ...route,
@@ -122,7 +113,6 @@ module.exports = function init(core) {
     },
   };
 
-  require('./install/http')(core);
   require('./install/express')(core);
   require('./install/fastify')(core);
   require('./install/graphql')(core);
@@ -130,5 +120,13 @@ module.exports = function init(core) {
   require('./install/koa')(core);
   require('./install/restify')(core);
 
+  messages.on(Event.SERVER_LISTENING, () => {
+    // we wait to report in timers event loop phase, this way we can
+    // have components respond to this synchronously to finalize discovery
+    setImmediate(() => {
+      core.routeCoverage.discoveryFinished();
+    });
+  });
+
   return routeCoverage;
 };