@contrast/agentify 1.11.0 → 1.13.0

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright: 2022 Contrast Security, Inc
+Copyright: 2023 Contrast Security, Inc
 Contact: support@contrastsecurity.com
 License: Commercial
 

package/lib/function-hooks.js

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
 

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
 

package/lib/index.js

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
 
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const fs = require('fs');
+const fs = require('fs').promises;
 const path = require('path');
 const Module = require('module');
 
@@ -38,7 +38,7 @@ const defaultOpts = {
   ]
 };
 
-module.exports = function(core) {
+module.exports = function (core) {
   // compose add'l local services
   require('./sources')(core);
   require('./function-hooks')(core);
@@ -88,8 +88,12 @@ class Agent {
      * This is one side effect that will always occur, even with `install: false`.
      * The act of calling `agentify()` is enough to cause this side effect, by design.
      */
-    Module.runMain = async function(...args) {
+    Module.runMain = async function (...args) {
       try {
+        for (const err of config._errors) {
+          throw err;
+        }
+
         logger.info('Starting the Contrast agent');
         logger.debug({ config }, 'Agent configuration');
 
@@ -99,7 +103,7 @@ class Agent {
           await self.install();
         }
 
-        if (plugin && plugin.install) {
+        if (plugin?.install) {
           await plugin.install();
         }
       } catch (err) {
@@ -128,7 +132,7 @@ class Agent {
   async install() {
     for (const svcName of this.opts.svcList) {
       const svc = this.core[svcName];
-      if (svc && svc.install) {
+      if (svc?.install) {
         this.core.logger.trace('installing service: %s', svcName);
         await svc.install();
       }
@@ -136,35 +140,26 @@ class Agent {
   }
 
   logDiagnosticFiles() {
-    const { config, getEffectiveConfig, getSystemInfo } = this.core;
-
-    if (config.agent.diagnostics.enable !== false) {
-      const effectiveConfig = JSON.stringify(getEffectiveConfig(), null, 2);
-      const systemInfo = JSON.stringify(getSystemInfo(), null, 2);
-
-      if (!config.agent.diagnostics.quiet) {
-        fs.writeFileSync(1, effectiveConfig, 'utf8');
-        fs.writeFileSync(1, systemInfo, 'utf8');
-      }
-
-      let outputDir = config.agent.diagnostics.report_path;
-      if (!outputDir && config.agent.logger.path) {
-        outputDir = path.join(config.agent.logger.path, '..');
-      }
-
-      try {
-        fs.writeFileSync(path.join(outputDir, 'contrast_effective_config.json'), effectiveConfig, 'utf-8');
-        fs.writeFileSync(path.join(outputDir, 'contrast_system_info.json'), systemInfo, 'utf-8');
-      } catch (err) {
-        outputDir = path.join(process.cwd());
-        try {
-          fs.writeFileSync(path.join(outputDir, 'contrast_effective_config.json'), effectiveConfig, 'utf-8');
-          fs.writeFileSync(path.join(outputDir, 'contrast_system_info.json'), systemInfo, 'utf-8');
-        } catch (err) {
-          fs.writeFileSync(1, `Couldn't create the diagnostic files: ${err}`, 'utf-8');
-        }
-      }
-    }
+    const { config, logger } = this.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(this.core.getSystemInfo(), null, 2)
+    ).catch((err) => {
+      logger.warn({ err }, 'unable to write system info file');
+    });
   }
 }
 

package/lib/rewrite-hooks.js

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
 

package/lib/sources.js

@@ -1,5 +1,5 @@
 /*
- * Copyright: 2022 Contrast Security, Inc
+ * Copyright: 2023 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
  * License: Commercial
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agentify",
-  "version": "1.11.0",
+  "version": "1.13.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,6 +17,6 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.13.0"
+    "@contrast/common": "1.15.0"
   }
-}
+}