[APM] Remove rate aggregations

x-pack/plugins/apm/common/utils/formatters/duration.ts

@@ -9,7 +9,12 @@ import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import { memoize } from 'lodash';
 import { NOT_AVAILABLE_LABEL } from '../../../common/i18n';
-import { asDecimalOrInteger, asInteger, asDecimal } from './formatters';
+import {
+  asDecimalOrInteger,
+  asInteger,
+  asDecimal,
+  asPreciseDecimal,
+} from './formatters';
 import { TimeUnit } from './datetime';
 import { Maybe } from '../../../typings/common';
 import { isFiniteNumber } from '../is_finite_number';
@@ -185,7 +190,10 @@ export function asTransactionRate(value: Maybe<number>) {
 export function asExactTransactionRate(value: number, unit: ThroughputUnit) {
   return i18n.translate('xpack.apm.exactTransactionRateLabel', {
     defaultMessage: `{value} { unit, select, minute {tpm} other {tps} }`,
-    values: { value: asDecimalOrInteger(value), unit },
+    values: {
+      value: value >= 1 ? asDecimalOrInteger(value) : asPreciseDecimal(value),
+      unit,
+    },
   });
 }
 

x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts

@@ -5,16 +5,14 @@
  * 2.0.
  */
 
-import {
-  SPAN_DESTINATION_SERVICE_RESOURCE,
-  SPAN_DESTINATION_SERVICE_RESPONSE_TIME_COUNT,
-} from '../../../common/elasticsearch_fieldnames';
+import { SPAN_DESTINATION_SERVICE_RESOURCE } from '../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../common/utils/environment_query';
 import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../helpers/setup_request';
 import { getMetricsDateHistogramParams } from '../helpers/metrics';
 import { getOffsetInMs } from '../../../common/utils/get_offset_in_ms';
+import { calculateThroughput } from '../helpers/calculate_throughput';
 
 export async function getThroughputChartsForBackend({
   backendName,
@@ -64,14 +62,6 @@ export async function getThroughputChartsForBackend({
             end: endWithOffset,
             metricsInterval: 60,
           }),
-          aggs: {
-            throughput: {
-              rate: {
-                field: SPAN_DESTINATION_SERVICE_RESPONSE_TIME_COUNT,
-                unit: 'minute',
-              },
-            },
-          },
         },
       },
     },
@@ -81,7 +71,7 @@ export async function getThroughputChartsForBackend({
     response.aggregations?.timeseries.buckets.map((bucket) => {
       return {
         x: bucket.key + offsetInMs,
-        y: bucket.throughput.value,
+        y: calculateThroughput({ start, end, value: bucket.doc_count }),
       };
     }) ?? []
   );

x-pack/plugins/apm/server/lib/connections/get_connection_stats/index.ts

@@ -131,10 +131,7 @@ export function getConnectionStats({
               : null,
           timeseries: mergedStats.timeseries.map((point) => ({
             x: point.x,
-            y:
-              point.count > 0
-                ? calculateThroughput({ start, end, value: point.count })
-                : null,
+            y: point.count, // sparklines only shows trend (no axis)
           })),
         },
         errorRate: {

x-pack/plugins/apm/server/lib/helpers/calculate_throughput.ts

@@ -7,13 +7,40 @@
 
 import { SetupTimeRange } from './setup_request';
 
+function getThroughputValue({
+  durationAsSeconds,
+  unit,
+  value,
+}: {
+  durationAsSeconds: number;
+  unit: ThroughputUnit;
+  value: number;
+}) {
+  const duration =
+    unit === 'minute' ? durationAsSeconds / 60 : durationAsSeconds;
+  return value / duration;
+}
+
 export function calculateThroughput({
   start,
   end,
   value,
-}: SetupTimeRange & { value: number }) {
-  const durationAsMinutes = (end - start) / 1000 / 60;
-  return value / durationAsMinutes;
+  unit = 'minute',
+}: SetupTimeRange & { value: number; unit?: ThroughputUnit }) {
+  const durationAsSeconds = (end - start) / 1000;
+  return getThroughputValue({ durationAsSeconds, unit, value });
+}
+
+export function calculateThroughputWithInterval({
+  durationAsSeconds,
+  value,
+  unit = 'minute',
+}: {
+  durationAsSeconds: number;
+  value: number;
+  unit?: ThroughputUnit;
+}) {
+  return getThroughputValue({ durationAsSeconds, unit, value });
 }
 
 export type ThroughputUnit = 'minute' | 'second';

x-pack/plugins/apm/server/lib/observability_overview/get_transactions_per_minute.ts

@@ -63,9 +63,6 @@ export async function getTransactionsPerMinute({
                   fixed_interval: bucketSize,
                   min_doc_count: 0,
                 },
-                aggs: {
-                  throughput: { rate: { unit: 'minute' as const } },
-                },
               },
             },
           },
@@ -94,7 +91,7 @@ export async function getTransactionsPerMinute({
     timeseries:
       topTransactionTypeBucket?.timeseries.buckets.map((bucket) => ({
         x: bucket.key,
-        y: bucket.throughput.value,
+        y: calculateThroughput({ start, end, value: bucket.doc_count }),
       })) || [],
   };
 }

x-pack/plugins/apm/server/lib/services/get_service_transaction_group_detailed_statistics.ts

@@ -6,6 +6,7 @@
  */
 
 import { keyBy } from 'lodash';
+import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import {
   EVENT_OUTCOME,
   SERVICE_NAME,
@@ -14,9 +15,8 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { EventOutcome } from '../../../common/event_outcome';
 import { LatencyAggregationType } from '../../../common/latency_aggregation_types';
-import { offsetPreviousPeriodCoordinates } from '../../../common/utils/offset_previous_period_coordinate';
-import { kqlQuery, rangeQuery } from '../../../../observability/server';
 import { environmentQuery } from '../../../common/utils/environment_query';
+import { offsetPreviousPeriodCoordinates } from '../../../common/utils/offset_previous_period_coordinate';
 import { Coordinate } from '../../../typings/timeseries';
 import {
   getDocumentTypeFilterForAggregatedTransactions,
@@ -125,11 +125,6 @@ export async function getServiceTransactionGroupDetailedStatistics({
                   },
                 },
                 aggs: {
-                  throughput_rate: {
-                    rate: {
-                      unit: 'minute',
-                    },
-                  },
                   ...getLatencyAggregation(latencyAggregationType, field),
                   [EVENT_OUTCOME]: {
                     terms: {
@@ -160,7 +155,7 @@ export async function getServiceTransactionGroupDetailedStatistics({
     }));
     const throughput = bucket.timeseries.buckets.map((timeseriesBucket) => ({
       x: timeseriesBucket.key,
-      y: timeseriesBucket.throughput_rate.value,
+      y: timeseriesBucket.doc_count, // sparklines only shows trend (no axis)
     }));
     const errorRate = bucket.timeseries.buckets.map((timeseriesBucket) => ({
       x: timeseriesBucket.key,

x-pack/plugins/apm/server/lib/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts

@@ -22,7 +22,6 @@ import {
   getProcessorEventForAggregatedTransactions,
   getTransactionDurationFieldForAggregatedTransactions,
 } from '../../helpers/aggregated_transactions';
-import { calculateThroughput } from '../../helpers/calculate_throughput';
 import { getBucketSizeForAggregatedTransactions } from '../../helpers/get_bucket_size_for_aggregated_transactions';
 import { Setup, SetupTimeRange } from '../../helpers/setup_request';
 import {
@@ -154,11 +153,7 @@ export async function getServiceTransactionDetailedStatistics({
         throughput: topTransactionTypeBucket.timeseries.buckets.map(
           (dateBucket) => ({
             x: dateBucket.key + offsetInMs,
-            y: calculateThroughput({
-              start,
-              end,
-              value: dateBucket.doc_count,
-            }),
+            y: dateBucket.doc_count, // sparklines only shows trend (no axis)
           })
         ),
       };

x-pack/plugins/apm/server/lib/services/get_throughput.ts

@@ -17,6 +17,10 @@ import {
   getProcessorEventForAggregatedTransactions,
 } from '../helpers/aggregated_transactions';
 import { Setup } from '../helpers/setup_request';
+import {
+  calculateThroughputWithInterval,
+  ThroughputUnit,
+} from '../helpers/calculate_throughput';
 
 interface Options {
   environment: string;
@@ -28,7 +32,8 @@ interface Options {
   start: number;
   end: number;
   intervalString: string;
-  throughputUnit: 'minute' | 'second';
+  bucketSize: number;
+  throughputUnit: ThroughputUnit;
 }
 
 export async function getThroughput({
@@ -41,6 +46,7 @@ export async function getThroughput({
   start,
   end,
   intervalString,
+  bucketSize,
   throughputUnit,
 }: Options) {
   const { apmEventClient } = setup;
@@ -75,13 +81,6 @@ export async function getThroughput({
             min_doc_count: 0,
             extended_bounds: { min: start, max: end },
           },
-          aggs: {
-            throughput: {
-              rate: {
-                unit: throughputUnit,
-              },
-            },
-          },
         },
       },
     },
@@ -96,7 +95,11 @@ export async function getThroughput({
     response.aggregations?.timeseries.buckets.map((bucket) => {
       return {
         x: bucket.key,
-        y: bucket.throughput.value,
+        y: calculateThroughputWithInterval({
+          durationAsSeconds: bucketSize,
+          value: bucket.doc_count,
+          unit: throughputUnit,
+        }),
       };
     }) ?? []
   );

x-pack/plugins/apm/server/routes/services.ts

@@ -12,7 +12,6 @@ import { uniq } from 'lodash';
 import { latencyAggregationTypeRt } from '../../common/latency_aggregation_types';
 import { ProfilingValueType } from '../../common/profiling';
 import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions';
-import { getThroughputUnit } from '../lib/helpers/calculate_throughput';
 import { setupRequest } from '../lib/helpers/setup_request';
 import { getServiceAnnotations } from '../lib/services/annotations';
 import { getServices } from '../lib/services/get_services';
@@ -46,6 +45,7 @@ import { offsetPreviousPeriodCoordinates } from '../../common/utils/offset_previ
 import { getServicesDetailedStatistics } from '../lib/services/get_services_detailed_statistics';
 import { getServiceDependenciesBreakdown } from '../lib/services/get_service_dependencies_breakdown';
 import { getBucketSizeForAggregatedTransactions } from '../lib/helpers/get_bucket_size_for_aggregated_transactions';
+import { getThroughputUnit } from '../lib/helpers/calculate_throughput';
 
 const servicesRoute = createApmServerRoute({
   endpoint: 'GET /api/apm/services',
@@ -476,8 +476,8 @@ const serviceThroughputRoute = createApmServerRoute({
 
     const { start, end } = setup;
     const {
-      bucketSize,
       intervalString,
+      bucketSize,
     } = getBucketSizeForAggregatedTransactions({
       start,
       end,
@@ -493,8 +493,9 @@ const serviceThroughputRoute = createApmServerRoute({
       serviceName,
       setup,
       transactionType,
-      throughputUnit,
       intervalString,
+      bucketSize,
+      throughputUnit,
     };
 
     const [currentPeriod, previousPeriod] = await Promise.all([

x-pack/plugins/translations/translations/ja-JP.json

@@ -7081,9 +7081,6 @@
     "xpack.apm.serviceOverview.mlNudgeMessage.learnMoreButton": "使ってみる",
     "xpack.apm.serviceOverview.throughtputChart.previousPeriodLabel": "前の期間",
     "xpack.apm.serviceOverview.throughtputChartTitle": "スループット",
-    "xpack.apm.serviceOverview.throughtputPerSecondChartTitle": " （秒単位）",
-    "xpack.apm.serviceOverview.tpmHelp": "スループットは1分あたりのトランザクション数（tpm）で測定されます",
-    "xpack.apm.serviceOverview.tpsHelp": "スループットは1秒あたりのトランザクション数（tps）で測定されます",
     "xpack.apm.serviceOverview.transactionsTableColumnErrorRate": "失敗したトランザクション率",
     "xpack.apm.serviceOverview.transactionsTableColumnImpact": "インパクト",
     "xpack.apm.serviceOverview.transactionsTableColumnName": "名前",

x-pack/plugins/translations/translations/zh-CN.json

@@ -7136,9 +7136,6 @@
     "xpack.apm.serviceOverview.mlNudgeMessage.learnMoreButton": "开始使用",
     "xpack.apm.serviceOverview.throughtputChart.previousPeriodLabel": "上一时段",
     "xpack.apm.serviceOverview.throughtputChartTitle": "吞吐量",
-    "xpack.apm.serviceOverview.throughtputPerSecondChartTitle": " （每秒）",
-    "xpack.apm.serviceOverview.tpmHelp": "吞吐量按每分钟事务数 (tpm) 来度量",
-    "xpack.apm.serviceOverview.tpsHelp": "吞吐量按每秒事务数 (tps) 来度量",
     "xpack.apm.serviceOverview.transactionsTableColumnErrorRate": "失败事务率",
     "xpack.apm.serviceOverview.transactionsTableColumnImpact": "影响",
     "xpack.apm.serviceOverview.transactionsTableColumnName": "名称",

x-pack/test/apm_api_integration/tests/observability_overview/observability_overview.ts

@@ -71,23 +71,23 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           Array [
             Object {
               "x": "2021-08-03T06:50:00.000Z",
-              "y": 51,
+              "y": 1.7,
             },
             Object {
               "x": "2021-08-03T06:51:00.000Z",
-              "y": 62,
+              "y": 2.06666666666667,
             },
             Object {
               "x": "2021-08-03T06:52:00.000Z",
-              "y": 56,
+              "y": 1.86666666666667,
             },
             Object {
               "x": "2021-08-03T06:53:00.000Z",
-              "y": 50,
+              "y": 1.66666666666667,
             },
             Object {
               "x": "2021-08-03T06:54:00.000Z",
-              "y": 77,
+              "y": 2.56666666666667,
             },
           ]
         `);