Closes elastic#79995 by adding new tab in transaction details to show…

… related trace logs. (elastic#85859)
ogupte · Dec 15, 2020 · 053ea42 · 053ea42
1 parent 9b0ec30
commit 053ea42
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 27 deletions.
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
@@ -8,7 +8,8 @@
     "data",
     "licensing",
     "triggersActionsUi",
-    "embeddable"
+    "embeddable",
+    "infra"
   ],
   "optionalPlugins": [
     "cloud",

diff --git a/...ns/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx b/...ns/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx
@@ -9,27 +9,14 @@ import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
+import { LogStream } from '../../../../../../infra/public';
 import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
 import type { IUrlParams } from '../../../../context/url_params_context/types';
 import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
 import { TransactionMetadata } from '../../../shared/MetadataTable/TransactionMetadata';
 import { WaterfallContainer } from './WaterfallContainer';
 import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers';
 
-const timelineTab = {
-  key: 'timeline',
-  label: i18n.translate('xpack.apm.propertiesTable.tabs.timelineLabel', {
-    defaultMessage: 'Timeline',
-  }),
-};
-
-const metadataTab = {
-  key: 'metadata',
-  label: i18n.translate('xpack.apm.propertiesTable.tabs.metadataLabel', {
-    defaultMessage: 'Metadata',
-  }),
-};
-
 interface Props {
   location: Location;
   transaction: Transaction;
@@ -46,9 +33,10 @@ export function TransactionTabs({
   exceedsMax,
 }: Props) {
   const history = useHistory();
-  const tabs = [timelineTab, metadataTab];
+  const tabs = [timelineTab, metadataTab, logsTab];
   const currentTab =
-    urlParams.detailTab === metadataTab.key ? metadataTab : timelineTab;
+    tabs.find(({ key }) => key === urlParams.detailTab) ?? timelineTab;
+  const TabContent = currentTab.component;
 
   return (
     <React.Fragment>
@@ -76,16 +64,77 @@ export function TransactionTabs({
 
       <EuiSpacer />
 
-      {currentTab.key === timelineTab.key ? (
-        <WaterfallContainer
-          location={location}
-          urlParams={urlParams}
-          waterfall={waterfall}
-          exceedsMax={exceedsMax}
-        />
-      ) : (
-        <TransactionMetadata transaction={transaction} />
-      )}
+      <TabContent
+        location={location}
+        urlParams={urlParams}
+        waterfall={waterfall}
+        exceedsMax={exceedsMax}
+        transaction={transaction}
+      />
     </React.Fragment>
   );
 }
+
+const timelineTab = {
+  key: 'timeline',
+  label: i18n.translate('xpack.apm.propertiesTable.tabs.timelineLabel', {
+    defaultMessage: 'Timeline',
+  }),
+  component: TimelineTabContent,
+};
+
+const metadataTab = {
+  key: 'metadata',
+  label: i18n.translate('xpack.apm.propertiesTable.tabs.metadataLabel', {
+    defaultMessage: 'Metadata',
+  }),
+  component: MetadataTabContent,
+};
+
+const logsTab = {
+  key: 'logs',
+  label: i18n.translate('xpack.apm.propertiesTable.tabs.logsLabel', {
+    defaultMessage: 'Logs',
+  }),
+  component: LogsTabContent,
+};
+
+function TimelineTabContent({
+  location,
+  urlParams,
+  waterfall,
+  exceedsMax,
+}: {
+  location: Location<any>;
+  urlParams: IUrlParams;
+  waterfall: IWaterfall;
+  exceedsMax: boolean;
+}) {
+  return (
+    <WaterfallContainer
+      location={location}
+      urlParams={urlParams}
+      waterfall={waterfall}
+      exceedsMax={exceedsMax}
+    />
+  );
+}
+
+function MetadataTabContent({ transaction }: { transaction: Transaction }) {
+  return <TransactionMetadata transaction={transaction} />;
+}
+
+function LogsTabContent({ transaction }: { transaction: Transaction }) {
+  const startTimestamp = Math.floor(transaction.timestamp.us / 1000);
+  const endTimestamp = Math.ceil(
+    startTimestamp + transaction.transaction.duration.us / 1000
+  );
+  const framePaddingMs = 1000 * 60 * 60 * 24; // 24 hours
+  return (
+    <LogStream
+      startTimestamp={startTimestamp - framePaddingMs}
+      endTimestamp={endTimestamp + framePaddingMs}
+      query={`trace.id:"${transaction.trace.id}" OR "${transaction.trace.id}"`}
+    />
+  );
+}