@contrast/agentify 1.27.3 → 1.28.0

package/lib/{log-diagnostic-files.js → diagnostics.js}

@@ -19,28 +19,36 @@ const fs = require('fs/promises');
 const path = require('path');
 
 module.exports = function init(core) {
-  core.logDiagnosticFiles = function logDiagnosticFiles() {
+  async function logDiagnosticFiles() {
     const { config, logger } = core;
 
     if (!config.agent.diagnostics.enable) return;
 
     const { report_path } = config.agent.diagnostics;
 
-    // let these run async so they don't block agent startup.
-    fs.writeFile(
-      path.join(report_path, 'contrast_effective_config.json'),
-      JSON.stringify(config.getReport({ redact: true }), null, 2)
-    ).catch((err) => {
-      logger.warn({ err }, 'unable to write effective config file');
-    });
-
-    fs.writeFile(
-      path.join(report_path, 'contrast_system_info.json'),
-      JSON.stringify(core.getSystemInfo(), null, 2)
-    ).catch((err) => {
-      logger.warn({ err }, 'unable to write system info file');
-    });
+    const effectiveConfig = config.getReport({ redact: true });
+    const systemInfo = await core.getSystemInfo();
+
+    return Promise.all([
+      fs.writeFile(
+        path.join(report_path, 'contrast_effective_config.json'),
+        JSON.stringify(effectiveConfig, null, 2)
+      ).catch((err) => {
+        logger.warn({ err }, 'unable to write effective config file');
+      }),
+      fs.writeFile(
+        path.join(report_path, 'contrast_system_info.json'),
+        JSON.stringify(systemInfo, null, 2)
+      ).catch((err) => {
+        logger.warn({ err }, 'unable to write system info file');
+      }),
+    ]);
+  }
+
+  return core.diagnostics = {
+    install() {
+      // let this run async so it doesn't block agent startup.
+      logDiagnosticFiles();
+    }
   };
-
-  return core.logDiagnosticFiles;
 };

package/lib/index.js

@@ -48,6 +48,7 @@ const DEFAULT_INSTALL_ORDER = [
   'rewriteHooks',
   'functionHooks',
   'esmHooks',
+  'diagnostics',
 ];
 
 /**
@@ -123,8 +124,6 @@ module.exports = function init(core = {}) {
       if (plugin?.install) {
         await plugin.install();
       }
-
-      core.logDiagnosticFiles(); // should this be moved into a separate install side-effect?
     } catch (err) {
       // TODO: Consider proper UNINSTALLATION and normal startup w/o agent
       logger.error({ err }, ERROR_MESSAGE);
@@ -141,8 +140,8 @@ module.exports = function init(core = {}) {
       { name: 'logger', spec: '@contrast/logger', default: true },
       // call all configValidation functions here
       { name: 'agent-info', spec: '@contrast/core/lib/agent-info' },
-      { name: 'system-info', spec: '@contrast/core/lib/system-info' },
       { name: 'app-info', spec: '@contrast/core/lib/app-info' },
+      { name: 'system-info', spec: '@contrast/core/lib/system-info' },
       // was check for appInfo errors length and throw if found
       { name: 'sensitive-data-masking', spec: '@contrast/core/lib/sensitive-data-masking' },
       { name: 'is-agent-path', spec: '@contrast/core/lib/is-agent-path' },
@@ -161,7 +160,7 @@ module.exports = function init(core = {}) {
       { name: 'heap-snapshots', spec: './heap-snapshots' },
       { name: 'sources', spec: './sources' },
       { name: 'function-hooks', spec: './function-hooks' },
-      { name: 'log-diagnostic-files', spec: './log-diagnostic-files' },
+      { name: 'diagnostics', spec: './diagnostics' },
       { name: 'rewrite-hooks', spec: './rewrite-hooks' },
     ];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agentify",
-  "version": "1.27.3",
+  "version": "1.28.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,19 +17,19 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.21.3",
-    "@contrast/config": "1.28.3",
-    "@contrast/core": "1.32.3",
-    "@contrast/deadzones": "1.2.4",
+    "@contrast/common": "1.22.0",
+    "@contrast/config": "1.29.0",
+    "@contrast/core": "1.33.0",
+    "@contrast/deadzones": "1.3.0",
     "@contrast/dep-hooks": "1.3.3",
-    "@contrast/esm-hooks": "2.6.3",
+    "@contrast/esm-hooks": "2.7.0",
     "@contrast/find-package-json": "^1.1.0",
-    "@contrast/instrumentation": "1.10.1",
+    "@contrast/instrumentation": "1.11.0",
     "@contrast/logger": "1.8.4",
-    "@contrast/metrics": "1.8.3",
+    "@contrast/metrics": "1.9.0",
     "@contrast/patcher": "1.7.4",
-    "@contrast/reporter": "1.27.3",
-    "@contrast/rewriter": "1.8.4",
+    "@contrast/reporter": "1.28.0",
+    "@contrast/rewriter": "1.9.0",
     "@contrast/scopes": "1.4.1",
     "semver": "^7.6.0"
   }