[APM] closes elastic#29563 by rendering related errors link with erro…

…r count in transaction flyout
ogupte · Feb 8, 2019 · deb8e2b · deb8e2b
1 parent 37b5ba9
commit deb8e2b
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 13 deletions.
diff --git a/...p/TransactionDetails/Transaction/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx b/...p/TransactionDetails/Transaction/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx
@@ -104,6 +104,8 @@ export function TransactionFlyout({
     return null;
   }
 
+  const waterfallItem = waterfall.itemsById[transactionDoc.transaction.id];
+
   return (
     <EuiPortal>
       <ResponsiveFlyout onClose={onClose} ownFocus={true} maxWidth={false}>
@@ -134,6 +136,11 @@ export function TransactionFlyout({
           <FlyoutTopLevelProperties transaction={transactionDoc} />
           <EuiHorizontalRule />
           <StickyTransactionProperties
+            errorCount={
+              waterfallItem.docType === 'transaction'
+                ? waterfallItem.errorCount
+                : undefined
+            }
             transaction={transactionDoc}
             totalDuration={waterfall.traceRootDuration}
           />

diff --git a/...terfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap b/...terfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
@@ -33,6 +33,7 @@ Array [
     ],
     "docType": "transaction",
     "duration": 9480,
+    "errorCount": 0,
     "id": "a",
     "name": "APIRestController#products",
     "offset": 0,
@@ -83,6 +84,7 @@ Array [
     ],
     "docType": "transaction",
     "duration": 3581,
+    "errorCount": 0,
     "id": "c",
     "name": "APIRestController#productsRemote",
     "offset": 3000,

diff --git a/...ails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts b/...ails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
@@ -75,7 +75,8 @@ describe('waterfall_helpers', () => {
           offset: 0,
           skew: 0,
           docType: 'transaction',
-          transaction: {} as Transaction
+          transaction: {} as Transaction,
+          errorCount: 0
         },
         {
           id: 'a',
@@ -86,7 +87,8 @@ describe('waterfall_helpers', () => {
           offset: 0,
           skew: 0,
           docType: 'transaction',
-          transaction: {} as Transaction
+          transaction: {} as Transaction,
+          errorCount: 0
         }
       ];
 

diff --git a/...onDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts b/...onDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
@@ -15,6 +15,7 @@ import {
   uniq,
   zipObject
 } from 'lodash';
+import { TraceAPIResponse } from 'x-pack/plugins/apm/server/lib/traces/get_trace';
 import { StringMap } from 'x-pack/plugins/apm/typings/common';
 import { Span } from '../../../../../../../../typings/es_schemas/Span';
 import { Transaction } from '../../../../../../../../typings/es_schemas/Transaction';
@@ -73,6 +74,7 @@ interface IWaterfallItemBase {
 interface IWaterfallItemTransaction extends IWaterfallItemBase {
   transaction: Transaction;
   docType: 'transaction';
+  errorCount: number;
 }
 
 interface IWaterfallItemSpan extends IWaterfallItemBase {
@@ -83,7 +85,8 @@ interface IWaterfallItemSpan extends IWaterfallItemBase {
 export type IWaterfallItem = IWaterfallItemSpan | IWaterfallItemTransaction;
 
 function getTransactionItem(
-  transaction: Transaction
+  transaction: Transaction,
+  transactionErrorCounts: TraceAPIResponse['transactionErrorCounts']
 ): IWaterfallItemTransaction {
   return {
     id: transaction.transaction.id,
@@ -95,7 +98,8 @@ function getTransactionItem(
     offset: 0,
     skew: 0,
     docType: 'transaction',
-    transaction
+    transaction,
+    errorCount: transactionErrorCounts[transaction.transaction.id] || 0
   };
 }
 
@@ -230,8 +234,9 @@ function createGetTransactionById(itemsById: IWaterfallIndex) {
 }
 
 export function getWaterfall(
-  hits: Array<Span | Transaction>,
-  entryTransaction: Transaction
+  hits: TraceAPIResponse['trace'],
+  entryTransaction: Transaction,
+  transactionErrorCounts: TraceAPIResponse['transactionErrorCounts']
 ): IWaterfall {
   if (isEmpty(hits)) {
     return {
@@ -255,7 +260,7 @@ export function getWaterfall(
         case 'span':
           return getSpanItem(hit as Span);
         case 'transaction':
-          return getTransactionItem(hit as Transaction);
+          return getTransactionItem(hit as Transaction, transactionErrorCounts);
         default:
           throw new Error(`Unknown type ${docType}`);
       }
@@ -264,7 +269,10 @@ export function getWaterfall(
   const childrenByParentId = groupBy(filteredHits, hit =>
     hit.parentId ? hit.parentId : 'root'
   );
-  const entryTransactionItem = getTransactionItem(entryTransaction);
+  const entryTransactionItem = getTransactionItem(
+    entryTransaction,
+    transactionErrorCounts
+  );
   const itemsById: IWaterfallIndex = indexBy(filteredHits, 'id');
   const items = getWaterfallItems(childrenByParentId, entryTransactionItem);
   const traceRoot = getTraceRoot(childrenByParentId);

diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/waterfall.tsx b/x-pack/plugins/apm/public/store/reactReduxRequest/waterfall.tsx
@@ -39,8 +39,16 @@ export function WaterfallRequest({ urlParams, transaction, render }: Props) {
       id={ID}
       fn={loadTrace}
       args={[{ traceId, start, end }]}
-      render={({ args, data = [], status }) => {
-        const waterfall = getWaterfall(data, transaction);
+      render={({
+        args,
+        data = { trace: [], transactionErrorCounts: {} },
+        status
+      }) => {
+        const waterfall = getWaterfall(
+          data.trace,
+          transaction,
+          data.transactionErrorCounts
+        );
         return render({ args, data: waterfall, status });
       }}
     />

diff --git a/x-pack/plugins/apm/server/lib/traces/get_trace.ts b/x-pack/plugins/apm/server/lib/traces/get_trace.ts
@@ -10,7 +10,27 @@ import { Span } from '../../../typings/es_schemas/Span';
 import { Transaction } from '../../../typings/es_schemas/Transaction';
 import { Setup } from '../helpers/setup_request';
 
-export type TraceAPIResponse = Array<Transaction | Span>;
+export interface TransactionErrorCounts {
+  [transactionId: string]: number;
+}
+export type TraceItems = Array<Transaction | Span>;
+export interface TraceAPIResponse {
+  trace: TraceItems;
+  transactionErrorCounts: TransactionErrorCounts;
+}
+
+interface TraceErrorsAggregationBucket {
+  key: string;
+  errors: {
+    doc_count: number;
+  };
+}
+
+interface TraceAggregationResponse {
+  transactions: {
+    buckets: TraceErrorsAggregationBucket[];
+  };
+}
 
 export async function getTrace(
   traceId: string,
@@ -37,10 +57,46 @@ export async function getTrace(
             }
           ]
         }
+      },
+      aggs: {
+        transactions: {
+          terms: {
+            field: 'transaction.id'
+          },
+          aggs: {
+            errors: {
+              filter: {
+                term: {
+                  'processor.event': 'error'
+                }
+              }
+            }
+          }
+        }
       }
     }
   };
 
-  const resp = await client<Span | Transaction>('search', params);
-  return resp.hits.hits.map(hit => hit._source);
+  const resp = await client<Span | Transaction, TraceAggregationResponse>(
+    'search',
+    params
+  );
+  const trace = resp.hits.hits.map(hit => hit._source);
+  const transactionErrorCounts = resp.aggregations.transactions.buckets.reduce(
+    (
+      acc: object,
+      { key, errors: { doc_count } }: TraceErrorsAggregationBucket
+    ) => {
+      return {
+        ...acc,
+        [key]: doc_count
+      };
+    },
+    {}
+  );
+
+  return {
+    trace,
+    transactionErrorCounts
+  };
 }