@contrast/agentify 1.39.0 → 1.41.0

package/lib/index.d.ts

@@ -15,7 +15,7 @@
 
 import { Installable } from '@contrast/common';
 import { Config } from '@contrast/config';
-import { Perf } from '@contrast/perf';
+import Perf from '@contrast/perf';
 import { Core as _Core } from '@contrast/core';
 import { Deadzones } from '@contrast/deadzones';
 import { DepHooks } from '@contrast/dep-hooks';
@@ -54,7 +54,7 @@ declare module 'node:module' {
 
 export interface Core extends _Core {
   config: Config;
-  Perf: Perf;
+  Perf: typeof Perf;
   logger: Logger;
   depHooks: DepHooks;
   patcher: Patcher

package/lib/index.js

@@ -83,7 +83,7 @@ module.exports = function init(core = {}) {
 
   let _callback;
   let _opts;
-  const _perf = new core.Perf('agentify');
+  const _perfAgentify = new core.Perf('agentify');
 
   core.agentify = async function agentify(callback, opts = {}) {
     // options are hardcoded, so if this throws it's going to be in testing/dev situation
@@ -165,6 +165,7 @@ module.exports = function init(core = {}) {
       { name: 'agent-info', spec: '@contrast/core/lib/agent-info' },
       { name: 'app-info', spec: '@contrast/core/lib/app-info' },
       { name: 'system-info', spec: '@contrast/core/lib/system-info' },
+      { name: 'build-id', spec: '@contrast/core/lib/build-id' },
       // was check for appInfo errors length and throw if found
       { name: 'telemetry', spec: '@contrast/telemetry' },
       { name: 'sensitive-data-masking', spec: '@contrast/core/lib/sensitive-data-masking' },
@@ -217,7 +218,7 @@ module.exports = function init(core = {}) {
         mod = mod.default;
       }
 
-      _perf.wrapInit(mod, spec)(core);
+      _perfAgentify.wrapInit(mod, spec)(core);
 
       // perform any validations that can take place now that this module is loaded.
       if (name === 'logger') {

package/lib/sources.js

@@ -16,7 +16,8 @@
 'use strict';
 
 const { EventEmitter } = require('events');
-const { Event } = require('@contrast/common');
+const onFinished = require('on-finished');
+const { Event, primordials: { StringPrototypeToLowerCase } } = require('@contrast/common');
 
 module.exports = function(core) {
   const {
@@ -48,6 +49,7 @@ module.exports = function(core) {
           protocol: serverType === 'http' ? 'http' : 'https',
           serverType,
           time: Date.now(),
+          method: StringPrototypeToLowerCase.call(req.method),
         }
       };
 
@@ -61,7 +63,7 @@ module.exports = function(core) {
         });
       }
 
-      res.on('finish', () => {
+      onFinished(res, (/* err, req */) => {
         messages.emit(Event.RESPONSE_FINISH, store);
       });
 

package/lib/sources.test.js

@@ -4,6 +4,7 @@ const EventEmitter = require('events');
 const { expect } = require('chai');
 const sinon = require('sinon');
 const { initProtectFixture } = require('@contrast/test/fixtures');
+const proxyquire = require('proxyquire');
 
 describe('agentify sources', function () {
   [
@@ -51,7 +52,7 @@ describe('agentify sources', function () {
     }
   ].forEach(({ name, method, expected }) => {
     describe(`${name} sources using ${method || 'Server'}()`, function () {
-      let core, api, ServerMock, reqMock, resMock;
+      let core, api, ServerMock, reqMock, resMock, onFinishedMock;
 
       beforeEach(function () {
         ({ core } = initProtectFixture());
@@ -83,9 +84,12 @@ describe('agentify sources', function () {
           url: 'http://localhost',
         };
         resMock = new EventEmitter();
+        onFinishedMock = sinon.stub();
 
         core.depHooks.resolve.withArgs(sinon.match({ name: 'http' })).yields(api);
-        require('./sources')(core).install();
+        proxyquire('./sources', {
+          'on-finished': onFinishedMock,
+        })(core).install();
       });
 
       it('"request" events run in scope with correct sourceInfo', function () {
@@ -103,7 +107,8 @@ describe('agentify sources', function () {
           protocol: 'http',
           serverType: 'http',
         });
-        expect(resMock._events.finish).to.be.a('function');
+
+        expect(onFinishedMock).to.have.been.calledWith(resMock);
       });
 
       it('non-"request" events do not run in scope', function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agentify",
-  "version": "1.39.0",
+  "version": "1.41.0",
   "description": "Configures Contrast agent services and instrumentation within an application",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -17,21 +17,22 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.27.0",
-    "@contrast/config": "1.37.0",
-    "@contrast/core": "1.42.0",
-    "@contrast/deadzones": "1.14.0",
-    "@contrast/dep-hooks": "1.11.0",
-    "@contrast/esm-hooks": "2.16.0",
+    "@contrast/common": "1.29.0",
+    "@contrast/config": "1.39.0",
+    "@contrast/core": "1.44.0",
+    "@contrast/deadzones": "1.16.0",
+    "@contrast/dep-hooks": "1.13.0",
+    "@contrast/esm-hooks": "2.18.0",
     "@contrast/find-package-json": "^1.1.0",
-    "@contrast/instrumentation": "1.21.0",
-    "@contrast/logger": "1.15.0",
-    "@contrast/metrics": "1.19.0",
-    "@contrast/patcher": "1.14.0",
-    "@contrast/perf": "1.2.2",
-    "@contrast/reporter": "1.38.0",
-    "@contrast/rewriter": "1.18.0",
-    "@contrast/scopes": "1.12.0",
+    "@contrast/instrumentation": "1.23.0",
+    "@contrast/logger": "1.17.0",
+    "@contrast/metrics": "1.21.0",
+    "@contrast/patcher": "1.16.0",
+    "@contrast/perf": "1.3.0",
+    "@contrast/reporter": "1.40.0",
+    "@contrast/rewriter": "1.20.0",
+    "@contrast/scopes": "1.14.0",
+    "on-finished": "^2.4.1",
     "semver": "^7.6.0"
   }
 }