Fix counter rate metric and remove unused comments

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/counter_rate.test.ts

@@ -10,8 +10,8 @@ import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.st
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 import type { Metric } from '../../../../common/types';
 import { createSeries } from '../__mocks__';
-import { convertToCounterRateFormulaColumn } from './counter_rate';
-import { CommonColumnsConverterArgs, FormulaColumn } from './types';
+import { convertToCounterRateColumn } from './counter_rate';
+import { CommonColumnsConverterArgs, CounterRateColumn, MaxColumn } from './types';
 
 describe('convertToCounterRateFormulaColumn', () => {
   const dataView = stubLogstashDataView;
@@ -21,33 +21,32 @@ describe('convertToCounterRateFormulaColumn', () => {
     type: TSVB_METRIC_TYPES.POSITIVE_RATE,
   };
 
-  test.each<[string, CommonColumnsConverterArgs, Partial<FormulaColumn> | null]>([
+  test.each<
+    [string, CommonColumnsConverterArgs, [Partial<MaxColumn>, Partial<CounterRateColumn>] | null]
+  >([
     ['null if metric contains empty field param', { series, metrics: [metric], dataView }, null],
     [
-      'formula column if metric contains field param',
+      'max and cpunter rate columns if metric contains field param',
       { series, metrics: [{ ...metric, field: dataView.fields[0].name }], dataView },
-      {
-        operationType: 'formula',
-        params: { formula: 'pick_max(differences(max(bytes)), 0)' },
-        meta: { metricId: 'some-id' },
-      },
-    ],
-    [
-      'differences formula with shift if metric contains unit',
-      { series, metrics: [{ ...metric, field: dataView.fields[0].name, unit: '1h' }], dataView },
-      {
-        operationType: 'formula',
-        params: {
-          formula: 'pick_max(differences(max(bytes), shift=1h), 0)',
+      [
+        {
+          operationType: 'max',
+          sourceField: dataView.fields[0].name,
+        },
+        {
+          operationType: 'counter_rate',
         },
-        meta: { metricId: 'some-id' },
-      },
+      ],
     ],
   ])('should return %s', (_, input, expected) => {
     if (expected === null) {
-      expect(convertToCounterRateFormulaColumn(input)).toBeNull();
+      expect(convertToCounterRateColumn(input)).toBeNull();
+    } else if (Array.isArray(expected)) {
+      const results = convertToCounterRateColumn(input);
+      expect(results).toEqual(expected.map(expect.objectContaining));
+      expect(results?.[1].references[0]).toEqual(results?.[0].columnId);
     } else {
-      expect(convertToCounterRateFormulaColumn(input)).toEqual(expect.objectContaining(expected));
+      expect(convertToCounterRateColumn(input)).toEqual(expect.objectContaining(expected));
     }
   });
 });

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/counter_rate.ts

@@ -6,22 +6,36 @@
  * Side Public License, v 1.
  */
 
-import { buildCounterRateFormula } from '../metrics';
-import { createFormulaColumn } from './formula';
-import { CommonColumnsConverterArgs, FormulaColumn } from './types';
+import { Operations } from '@kbn/visualizations-plugin/common/convert_to_lens';
+import { createColumn, getFormat } from './column';
+import { CommonColumnsConverterArgs, CounterRateColumn, MaxColumn } from './types';
 
-export const convertToCounterRateFormulaColumn = ({
+export const convertToCounterRateColumn = ({
   series,
   metrics,
   dataView,
-}: CommonColumnsConverterArgs): FormulaColumn | null => {
+}: CommonColumnsConverterArgs): [MaxColumn, CounterRateColumn] | null => {
   const metric = metrics[metrics.length - 1];
 
   const field = metric.field ? dataView.getFieldByName(metric.field) : undefined;
   if (!field) {
     return null;
   }
 
-  const formula = buildCounterRateFormula(metric, field.name);
-  return createFormulaColumn(formula, { series, metric, dataView });
+  const maxColumn = {
+    operationType: Operations.MAX,
+    sourceField: field.name,
+    ...createColumn(series, metric, field),
+    params: { ...getFormat(series) },
+  };
+
+  return [
+    maxColumn,
+    {
+      operationType: Operations.COUNTER_RATE,
+      references: [maxColumn.columnId],
+      ...createColumn(series, metric, field),
+      params: { ...getFormat(series) },
+    },
+  ];
 };

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/date_histogram.ts

@@ -6,14 +6,6 @@
  * Side Public License, v 1.
  */
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
 import type { DataView } from '@kbn/data-views-plugin/common';
 import uuid from 'uuid';
 import { DateHistogramParams, DataType } from '@kbn/visualizations-plugin/common/convert_to_lens';

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/index.ts

@@ -21,7 +21,7 @@ export { convertToStaticValueColumn } from './static_value';
 export { convertToFiltersColumn } from './filters';
 export { convertToDateHistogramColumn } from './date_histogram';
 export { converToTermsColumn } from './terms';
-export { convertToCounterRateFormulaColumn } from './counter_rate';
+export { convertToCounterRateColumn } from './counter_rate';
 export { convertToStandartDeviationColumn } from './std_deviation';
 
 export * from './types';

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/parent_pipeline.test.ts

@@ -268,26 +268,6 @@ describe('convertMetricAggregationToColumn', () => {
         reducedTimeRange: '10m',
       },
     ],
-    [
-      'null for counter rate if field in metric is empty',
-      [
-        SUPPORTED_METRICS.positive_rate,
-        { series, metric: { id, type: TSVB_METRIC_TYPES.POSITIVE_RATE }, dataView },
-      ],
-      null,
-    ],
-    [
-      'formula column for counter rate',
-      [
-        SUPPORTED_METRICS.positive_rate,
-        { series, metric: { id, field, type: TSVB_METRIC_TYPES.POSITIVE_RATE }, dataView },
-      ],
-      {
-        meta: { metricId: 'some-id' },
-        operationType: 'formula',
-        params: { formula: 'pick_max(differences(max(bytes)), 0)' },
-      },
-    ],
     [
       'null for last value (unsupported)',
       [

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/parent_pipeline.ts

@@ -40,7 +40,6 @@ import { createFormulaColumn } from './formula';
 import { convertToMovingAverageParams } from './moving_average';
 import { convertToPercentileColumn } from './percentile';
 import { convertToPercentileRankColumn } from './percentile_rank';
-import { convertToCounterRateFormulaColumn } from './counter_rate';
 
 type MetricAggregationWithoutParams =
   | typeof Operations.AVERAGE
@@ -92,6 +91,7 @@ const SUPPORTED_METRICS_AGGS_WITHOUT_PARAMS: MetricAggregationWithoutParams[] =
   Operations.MIN,
   Operations.SUM,
   Operations.STANDARD_DEVIATION,
+  Operations.COUNTER_RATE,
 ];
 
 const SUPPORTED_METRIC_AGGS: MetricAggregation[] = [
@@ -159,9 +159,6 @@ export const convertMetricAggregationToColumn = (
       reducedTimeRange,
     });
   }
-  if (aggregation.name === Operations.COUNTER_RATE) {
-    return convertToCounterRateFormulaColumn({ series, metrics: [metric], dataView });
-  }
 
   if (aggregation.name === Operations.LAST_VALUE) {
     return null;
@@ -237,7 +234,7 @@ const convertMovingAvgOrDerivativeToColumns = (
   const [nestedFieldId, _] = subMetricField?.split('[') ?? [];
   // support nested aggs with formula
   const additionalSubFunction = metrics.find(({ id }) => id === nestedFieldId);
-  if (additionalSubFunction) {
+  if (additionalSubFunction || pipelineAgg.name === 'counter_rate') {
     const formula = getParentPipelineSeriesFormula(
       metrics,
       subFunctionMetric,

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/counter_rate_formula.test.ts

@@ -10,6 +10,7 @@ import { stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.st
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 import { Metric } from '../../../../common/types';
 import { buildCounterRateFormula } from './counter_rate_formula';
+import { SUPPORTED_METRICS } from './supported_metrics';
 
 describe('buildCounterRateFormula', () => {
   test('should return correct formula for counter rate', () => {
@@ -20,7 +21,10 @@ describe('buildCounterRateFormula', () => {
       unit: '1h',
     };
 
-    const formula = buildCounterRateFormula(metric, dataView.fields[0].name);
-    expect(formula).toStrictEqual('pick_max(differences(max(bytes), shift=1h), 0)');
+    const formula = buildCounterRateFormula(
+      SUPPORTED_METRICS[metric.type]!.name,
+      dataView.fields[0].name
+    );
+    expect(formula).toStrictEqual('counter_rate(max(bytes))');
   });
 });

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/counter_rate_formula.ts

@@ -6,27 +6,17 @@
  * Side Public License, v 1.
  */
 
-import type { Metric } from '../../../../common/types';
-import { TimeScaleValue, isTimeScaleValue } from './metrics_helpers';
-
 const buildMaxFormula = (selector: string) => {
   return `max(${selector})`;
 };
 
-const buildPickMaxPositiveFormula = (selector: string) => {
-  return `pick_max(${selector}, 0)`;
-};
-
-const buildDifferencesFormula = (selector: string, shift?: TimeScaleValue) => {
-  return `differences(${selector}${shift ? `, shift=${shift}` : ''})`;
+const buildСounterRateFormula = (aggFormula: string, selector: string) => {
+  return `${aggFormula}(${selector})`;
 };
 
-export const buildCounterRateFormula = (metric: Metric, fieldName: string) => {
+export const buildCounterRateFormula = (aggFormula: string, fieldName: string) => {
   const maxFormula = buildMaxFormula(fieldName);
 
-  const unit = metric.unit && isTimeScaleValue(metric.unit) ? metric.unit : undefined;
-  const diffOfMaxFormula = buildDifferencesFormula(maxFormula, unit);
-
-  const counterRateFormula = buildPickMaxPositiveFormula(diffOfMaxFormula);
+  const counterRateFormula = buildСounterRateFormula(aggFormula, maxFormula);
   return counterRateFormula;
 };

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/metrics_helpers.test.ts

@@ -6,14 +6,6 @@
  * Side Public License, v 1.
  */
 
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
 import { TimeRange } from '@kbn/data-plugin/common';
 import { METRIC_TYPES } from '@kbn/data-plugin/public';
 import type { Metric, Series, Panel } from '../../../../common/types';

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/metrics_helpers.ts

@@ -131,7 +131,7 @@ export const getFormulaEquivalent = (
       );
     }
     case 'positive_rate': {
-      return buildCounterRateFormula(currentMetric, currentMetric.field!);
+      return buildCounterRateFormula(aggFormula, currentMetric.field!);
     }
     case 'filter_ratio': {
       return getFilterRatioFormula(currentMetric, reducedTimeRange);

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/series/metrics_columns.test.ts

@@ -17,7 +17,7 @@ const mockConvertMathToFormulaColumn = jest.fn();
 const mockConvertParentPipelineAggToColumns = jest.fn();
 const mockConvertToCumulativeSumColumns = jest.fn();
 const mockConvertFilterRatioToFormulaColumn = jest.fn();
-const mockConvertToCounterRateFormulaColumn = jest.fn();
+const mockConvertToCounterRateColumn = jest.fn();
 const mockConvertOtherAggsToFormulaColumn = jest.fn();
 const mockConvertToLastValueColumn = jest.fn();
 const mockConvertToStaticValueColumn = jest.fn();
@@ -30,7 +30,7 @@ jest.mock('../convert', () => ({
   convertParentPipelineAggToColumns: jest.fn(() => mockConvertParentPipelineAggToColumns()),
   convertToCumulativeSumColumns: jest.fn(() => mockConvertToCumulativeSumColumns()),
   convertFilterRatioToFormulaColumn: jest.fn(() => mockConvertFilterRatioToFormulaColumn()),
-  convertToCounterRateFormulaColumn: jest.fn(() => mockConvertToCounterRateFormulaColumn()),
+  convertToCounterRateColumn: jest.fn(() => mockConvertToCounterRateColumn()),
   convertOtherAggsToFormulaColumn: jest.fn(() => mockConvertOtherAggsToFormulaColumn()),
   convertToLastValueColumn: jest.fn(() => mockConvertToLastValueColumn()),
   convertToStaticValueColumn: jest.fn(() => mockConvertToStaticValueColumn()),
@@ -111,13 +111,13 @@ describe('getMetricsColumns', () => {
       mockConvertFilterRatioToFormulaColumn,
     ],
     [
-      'call convertToCounterRateFormulaColumn if metric type is positive rate',
+      'call convertToCounterRateColumn if metric type is positive rate',
       [
         createSeries({ metrics: [{ type: TSVB_METRIC_TYPES.POSITIVE_RATE, id: '1' }] }),
         dataView,
         1,
       ],
-      mockConvertToCounterRateFormulaColumn,
+      mockConvertToCounterRateColumn,
     ],
     [
       'call convertOtherAggsToFormulaColumn if metric type is positive only',

src/plugins/vis_types/timeseries/public/convert_to_lens/lib/series/metrics_columns.ts

@@ -23,7 +23,7 @@ import {
   convertToLastValueColumn,
   convertToStaticValueColumn,
   convertMetricAggregationColumnWithoutSpecialParams,
-  convertToCounterRateFormulaColumn,
+  convertToCounterRateColumn,
   convertToStandartDeviationColumn,
 } from '../convert';
 import { getValidColumns } from './columns';
@@ -98,7 +98,7 @@ export const getMetricsColumns = (
       return getValidColumns(formulaColumn);
     }
     case 'positive_rate': {
-      const formulaColumn = convertToCounterRateFormulaColumn(columnsConverterArgs);
+      const formulaColumn = convertToCounterRateColumn(columnsConverterArgs);
       return getValidColumns(formulaColumn);
     }
     case 'positive_only':