[APM] Agent span_frames_min_duration configuration input cannot handle 0 or -1

x-pack/plugins/apm/common/agent_configuration/amount_and_unit.ts

@@ -10,7 +10,8 @@ interface AmountAndUnit {
 }
 
 export function amountAndUnitToObject(value: string): AmountAndUnit {
-  const [, amount = '', unit = ''] = value.match(/(\d+)?(\w+)?/) || [];
+  // matches any postive and negative number and its unit.
+  const [, amount = '', unit = ''] = value.match(/(^-?\d+)?(\w+)?/) || [];
   return { amount, unit };
 }
 

x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts

@@ -10,24 +10,56 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { durationRt } from './duration_rt';
+import { durationRt, getDurationRt } from './duration_rt';
 import { isRight } from 'fp-ts/lib/Either';
 
 describe('durationRt', () => {
   describe('it should not accept', () => {
-    [undefined, null, '', 0, 'foo', true, false, '100', 's', 'm', '0h'].map(
+    [
+      undefined,
+      null,
+      '',
+      0,
+      'foo',
+      true,
+      false,
+      '100',
+      's',
+      'm',
+      '0ms',
+      '-1ms'
+    ].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(durationRt.decode(input))).toBe(false);
+      });
+    });
+  });
+
+  describe('it should accept', () => {
+    ['1000ms', '2s', '3m', '1s'].map(input => {
+      it(`${JSON.stringify(input)}`, () => {
+        expect(isRight(durationRt.decode(input))).toBe(true);
+      });
+    });
+  });
+});
+
+describe('getDurationRt', () => {
+  const customDurationRt = getDurationRt({ min: -1 });
+  describe('it should not accept', () => {
+    [undefined, null, '', 0, 'foo', true, false, '100', 's', 'm', '-2ms'].map(
       input => {
         it(`${JSON.stringify(input)}`, () => {
-          expect(isRight(durationRt.decode(input))).toBe(false);
+          expect(isRight(customDurationRt.decode(input))).toBe(false);
         });
       }
     );
   });
 
-  describe('It should accept', () => {
-    ['1000ms', '2s', '3m'].map(input => {
+  describe('it should accept', () => {
+    ['1000ms', '2s', '3m', '1s', '-1s', '0ms'].map(input => {
       it(`${JSON.stringify(input)}`, () => {
-        expect(isRight(durationRt.decode(input))).toBe(true);
+        expect(isRight(customDurationRt.decode(input))).toBe(true);
       });
     });
   });

x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.ts

@@ -10,24 +10,28 @@ import { amountAndUnitToObject } from '../amount_and_unit';
 
 export const DURATION_UNITS = ['ms', 's', 'm'];
 
-export const durationRt = new t.Type<string, string, unknown>(
-  'durationRt',
-  t.string.is,
-  (input, context) => {
-    return either.chain(t.string.validate(input, context), inputAsString => {
-      const { amount, unit } = amountAndUnitToObject(inputAsString);
-      const amountAsInt = parseInt(amount, 10);
-      const isValidUnit = DURATION_UNITS.includes(unit);
-      const isValid = amountAsInt > 0 && isValidUnit;
+export function getDurationRt({ min }: { min: number }) {
+  return new t.Type<string, string, unknown>(
+    'durationRt',
+    t.string.is,
+    (input, context) => {
+      return either.chain(t.string.validate(input, context), inputAsString => {
+        const { amount, unit } = amountAndUnitToObject(inputAsString);
+        const amountAsInt = parseInt(amount, 10);
+        const isValidUnit = DURATION_UNITS.includes(unit);
+        const isValid = amountAsInt >= min && isValidUnit;
 
-      return isValid
-        ? t.success(inputAsString)
-        : t.failure(
-            input,
-            context,
-            `Must have numeric amount and a valid unit (${DURATION_UNITS})`
-          );
-    });
-  },
-  t.identity
-);
+        return isValid
+          ? t.success(inputAsString)
+          : t.failure(
+              input,
+              context,
+              `Must have numeric amount and a valid unit (${DURATION_UNITS})`
+            );
+      });
+    },
+    t.identity
+  );
+}
+
+export const durationRt = getDurationRt({ min: 1 });

x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts

@@ -8,6 +8,7 @@ import { i18n } from '@kbn/i18n';
 import { getIntegerRt } from '../runtime_types/integer_rt';
 import { captureBodyRt } from '../runtime_types/capture_body_rt';
 import { RawSettingDefinition } from './types';
+import { getDurationRt } from '../runtime_types/duration_rt';
 
 /*
  * Settings added here will show up in the UI and will be validated on the client and server
@@ -143,6 +144,7 @@ export const generalSettings: RawSettingDefinition[] = [
   {
     key: 'span_frames_min_duration',
     type: 'duration',
+    validation: getDurationRt({ min: -1 }),
     defaultValue: '5ms',
     label: i18n.translate('xpack.apm.agentConfig.spanFramesMinDuration.label', {
       defaultMessage: 'Span frames minimum duration'
@@ -154,7 +156,8 @@ export const generalSettings: RawSettingDefinition[] = [
           'In its default settings, the APM agent will collect a stack trace with every recorded span.\nWhile this is very helpful to find the exact place in your code that causes the span, collecting this stack trace does have some overhead. \nWhen setting this option to a negative value, like `-1ms`, stack traces will be collected for all spans. Setting it to a positive value, e.g. `5ms`, will limit stack trace collection to spans with durations equal to or longer than the given value, e.g. 5 milliseconds.\n\nTo disable stack trace collection for spans completely, set the value to `0ms`.'
       }
     ),
-    excludeAgents: ['js-base', 'rum-js', 'nodejs']
+    excludeAgents: ['js-base', 'rum-js', 'nodejs'],
+    min: -1
   },
 
   // STACK_TRACE_LIMIT

x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts

@@ -91,6 +91,7 @@ interface BytesSetting extends BaseSetting {
 interface DurationSetting extends BaseSetting {
   type: 'duration';
   units?: string[];
+  min?: number;
 }
 
 export type RawSettingDefinition =