@contrast/config 1.46.0 → 1.48.0

package/lib/common.js

@@ -97,6 +97,7 @@ const mappings = {
   // server features
   'assess.enable': (remoteData) => remoteData.assess?.enable,
   'assess.probabilistic_sampling.enable': (remoteData) => remoteData.assess?.sampling?.enable,
+  'assess.probabilistic_sampling.baseline': (remoteData) => remoteData.assess?.sampling?.baseline,
   'assess.probabilistic_sampling.base_probability': (remoteData) => {
     const request_frequency = remoteData.assess?.sampling?.request_frequency;
     if (request_frequency > 0) {
@@ -104,6 +105,7 @@ const mappings = {
       if (!isNaN(baseProbability)) return baseProbability;
     }
   },
+  'assess.probabilistic_sampling.window_ms': (remoteData) => remoteData.assess?.sampling?.window_ms,
   'assess.stacktraces': (remoteData) => remoteData.assess?.report_stacktraces,
   'agent.logger.level': coerceLowerCase('logger.level'),
   'agent.logger.path': (remoteData) => remoteData.logger?.path,

package/lib/config.js

@@ -248,27 +248,31 @@ module.exports = class Config {
   }
 
   getReport({ redact = true }) {
+    const report = {
+      report_create: new Date(),
+      config: {
+        status: this._status
+      }
+    };
     const effective_config = [], environment_variable = [], contrast_ui = [];
 
     Array.from(this._effectiveMap.values()).forEach((v) => {
-      let { value } = v;
-      if (redact) value = this._redact(v.name, v.value);
+      let { value, name, canonical_name, source } = v;
+      if (value === null) return;
+      if (redact) value = this._redact(name, value);
+      value = String(value);
+
+      effective_config.push({ value, name, canonical_name, source });
 
-      const redacted = { ...v, value: value !== null ? String(value) : null };
-      effective_config.push(redacted);
-      if (v.source === ENVIRONMENT_VARIABLE) environment_variable.push(redacted);
-      if (v.source === CONTRAST_UI) contrast_ui.push(redacted);
+      if (source === ENVIRONMENT_VARIABLE) environment_variable.push({ value, name, canonical_name });
+      if (source === CONTRAST_UI) contrast_ui.push({ value, name, canonical_name });
     });
 
-    return {
-      report_create: new Date(),
-      config: {
-        status: this._status,
-        effective_config,
-        environment_variable,
-        contrast_ui,
-      }
-    };
+    report.config['effective_config'] = effective_config;
+    if (contrast_ui.length) report.config['contrast_ui'] = contrast_ui;
+    if (environment_variable.length) report.config['environment_variable'] = environment_variable;
+
+    return report;
   }
 
   getEffectiveSource(canonicalName) {

package/lib/options.js

@@ -578,6 +578,13 @@ Example - \`/opt/Contrast/contrast.log\` creates a log in the \`/opt/Contrast\`
     fn: castBoolean,
     desc: 'Set to true to enable sampling of requests for dataflow and other Assess features',
   },
+  {
+    name: 'assess.probabilistic_sampling.baseline',
+    arg: '<baseline>',
+    default: 5,
+    fn: parseNum,
+    desc: 'This property indicates the number of requests to analyze in each window before sampling begins.',
+  },
   {
     // effective based on local config and 'assess.sampling' TeamServer DTM
     name: 'assess.probabilistic_sampling.base_probability',
@@ -596,6 +603,13 @@ Example - \`/opt/Contrast/contrast.log\` creates a log in the \`/opt/Contrast\`
     default: 0.05,
     desc: 'A value p within the range [0, 1]. Each request will share same probability p of being sampled.',
   },
+  {
+    name: 'assess.probabilistic_sampling.window_ms',
+    arg: '<window_ms>',
+    default: 180_000,
+    fn: parseNum,
+    desc: 'This property indicates the duration for which a sample set is valid.',
+  },
   {
     name: 'assess.probabilistic_sampling.event_detail',
     arg: '<level>',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/config",
-  "version": "1.46.0",
+  "version": "1.48.0",
   "description": "An API for discovering Contrast agent configuration data",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -17,11 +17,11 @@
     "node": ">= 16.9.1"
   },
   "scripts": {
-    "test": "../scripts/test.sh"
+    "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.32.0",
-    "@contrast/core": "1.51.0",
+    "@contrast/common": "1.33.0",
+    "@contrast/core": "1.53.0",
     "yaml": "^2.2.2"
   }
 }