@contrast/agentify 1.52.1 → 1.53.0

package/lib/index.js

@@ -12,7 +12,6 @@
  * engineered, modified, repackaged, sold, redistributed or otherwise used in a
  * way not consistent with the End User License Agreement.
  */
-/*eslint node/no-unsupported-features/es-syntax: ["error", {version: >=10.0.0}]*/
 'use strict';
 
 const Module = require('module');
@@ -137,6 +136,7 @@ module.exports = function init(core = {}) {
 
       logger.info('Starting %s v%s', core.agentName, core.agentVersion);
       logger.info({ config }, 'Agent configuration');
+      logger.debug({ effectiveConfig: config.getReport({ redact: true }) }, 'Effective configuration');
 
       const plugin = await _callback?.(core);
 
@@ -191,9 +191,9 @@ module.exports = function init(core = {}) {
       { name: 'reporter', spec: '@contrast/reporter', default: true },
       { name: 'instrumentation', spec: '@contrast/instrumentation' },
       { name: 'metrics', spec: '@contrast/metrics' },
+      { name: 'sources', spec: '@contrast/sources' },
       // compose additional local services
       { name: 'heap-snapshots', spec: './heap-snapshots' },
-      { name: 'sources', spec: './sources' },
       { name: 'function-hooks', spec: './function-hooks' },
       { name: 'diagnostics', spec: './diagnostics' },
       { name: 'rewrite-hooks', spec: './rewrite-hooks' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agentify",
-  "version": "1.52.1",
+  "version": "1.53.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)",
@@ -20,21 +20,22 @@
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.34.1",
-    "@contrast/config": "1.49.1",
-    "@contrast/core": "1.54.1",
-    "@contrast/deadzones": "1.26.1",
-    "@contrast/dep-hooks": "1.23.1",
-    "@contrast/esm-hooks": "2.28.1",
+    "@contrast/common": "1.35.0",
+    "@contrast/config": "1.50.0",
+    "@contrast/core": "1.55.0",
+    "@contrast/deadzones": "1.27.0",
+    "@contrast/dep-hooks": "1.24.0",
+    "@contrast/esm-hooks": "2.29.0",
     "@contrast/find-package-json": "^1.1.0",
-    "@contrast/instrumentation": "1.33.1",
-    "@contrast/logger": "1.27.1",
-    "@contrast/metrics": "1.31.1",
-    "@contrast/patcher": "1.26.1",
+    "@contrast/instrumentation": "1.34.0",
+    "@contrast/logger": "1.28.0",
+    "@contrast/metrics": "1.32.0",
+    "@contrast/patcher": "1.27.0",
     "@contrast/perf": "1.3.1",
-    "@contrast/reporter": "1.51.1",
-    "@contrast/rewriter": "1.30.1",
-    "@contrast/scopes": "1.24.1",
+    "@contrast/reporter": "1.52.0",
+    "@contrast/rewriter": "1.31.0",
+    "@contrast/scopes": "1.25.0",
+    "@contrast/sources": "1.1.0",
     "on-finished": "^2.4.1",
     "semver": "^7.6.0"
   }

package/lib/sources.js

@@ -1,94 +0,0 @@
-/*
- * Copyright: 2025 Contrast Security, Inc
- * Contact: support@contrastsecurity.com
- * License: Commercial
-
- * NOTICE: This Software and the patented inventions embodied within may only be
- * used as part of Contrast Security’s commercial offerings. Even though it is
- * made available through public repositories, use of this Software is subject to
- * the applicable End User Licensing Agreement found at
- * https://www.contrastsecurity.com/enduser-terms-0317a or as otherwise agreed
- * between Contrast Security and the End User. The Software may not be reverse
- * engineered, modified, repackaged, sold, redistributed or otherwise used in a
- * way not consistent with the End User License Agreement.
- */
-
-'use strict';
-
-const { EventEmitter } = require('events');
-const onFinished = require('on-finished');
-const { Event, primordials: { StringPrototypeToLowerCase } } = require('@contrast/common');
-
-module.exports = function(core) {
-  const {
-    messages,
-    instrumentation: { instrument },
-    scopes: { sources: sourcesStorage }
-  } = core;
-
-  const _hooks = new EventEmitter();
-
-  function aroundHook(serverType) {
-    return function around(next, data) {
-      const { args: [event, req, res] } = data;
-
-      if (event !== 'request') {
-        if (event === 'listening') {
-          // take a snapshot of Perf.all at this point. this will get logged
-          // at some point on the perf interval timer.
-          core.Perf.mark('listening');
-        }
-        return next();
-      }
-      // let's count requests.
-      core.Perf.requestCount += 1;
-
-      const store = {
-        sourceInfo: {
-          port: req.socket.address?.()?.port || 0,
-          protocol: serverType === 'http' ? 'http' : 'https',
-          serverType,
-          time: Date.now(),
-          method: StringPrototypeToLowerCase.call(req.method),
-        }
-      };
-
-      if (_hooks._events.onSource) {
-        _hooks.emit('onSource', {
-          // future: non-http sources will have their own type
-          sourceType: 'HTTP',
-          store,
-          incomingMessage: req,
-          serverResponse: res,
-        });
-      }
-
-      onFinished(res, (/* err, req */) => {
-        messages.emit(Event.RESPONSE_FINISH, store);
-      });
-
-      return sourcesStorage.run(store, next);
-    };
-  }
-
-  function install() {
-    ['http', 'https', 'spdy', 'http2'].forEach((moduleName) => {
-      instrument({
-        moduleName,
-        patchObjects: [{
-          name: 'Server.prototype',
-          methods: ['emit'],
-          patchType: 'sources',
-          around: aroundHook(moduleName)
-        }]
-      });
-    });
-  }
-  return core.sources = {
-    install,
-    addHook(name, handler) {
-      if (name === 'onSource') _hooks.on(name, handler);
-    },
-    aroundHook
-  };
-};