Support traceIds

mock/trace.js

@@ -16,11 +16,11 @@ export default {
         data: {
           queryBasicTraces: {
             'traces|10': [{
-              operationName: '@url',
+              key: '@url',
               duration: '@natural(100, 1000)',
               start: '@datetime',
               'isError|1': true,
-              traceId: '@guid',
+              'traceIds|1-3': ['@guid'],
             }],
             total: '@natural(5, 50)',
           },

src/components/TraceTable/index.js

@@ -10,7 +10,7 @@ class TraceTable extends PureComponent {
     const columns = [
       {
         title: 'OperationName',
-        dataIndex: 'operationName',
+        dataIndex: 'key',
       },
       {
         title: 'Duration',
@@ -33,15 +33,23 @@ class TraceTable extends PureComponent {
       },
       {
         title: 'GlobalTraceId',
-        dataIndex: 'traceId',
+        render: (text, record) => {
+          const { traceIds = [] } = record;
+          if (traceIds.length < 1) {
+            return 'Nan';
+          }
+          if (traceIds.length > 1) {
+            return `${traceIds[0]} ...`;
+          } else {
+            return traceIds[0];
+          }
+        },
       },
     ];
-
     return (
       <div className={styles.standardTable}>
         <Table
           loading={loading}
-          rowKey={record => record.traceId}
           dataSource={traces}
           columns={columns}
           pagination={pagination}

src/models/trace.js

@@ -14,11 +14,11 @@ const dataQuery = `
   query BasicTraces($condition: TraceQueryCondition) {
     queryBasicTraces(condition: $condition) {
       traces {
-        operationName
+        key: operationName
         duration
         start
         isError
-        traceId
+        traceIds
   }
       total
     }
@@ -82,16 +82,16 @@ export default generateModal({
       yield put({
         type: 'saveSpans',
         payload: response,
-        traceId: payload.variables.traceId,
+        key: payload.key,
       });
     },
   },
   reducers: {
     saveSpans(state, action) {
-      const { traceId } = action;
+      const { key } = action;
       const { queryTrace: { spans } } = action.payload.data;
       const { data: { queryBasicTraces: { traces } } } = state;
-      const trace = traces.find(t => t.traceId === traceId);
+      const trace = traces.find(t => t.key === key);
       trace.spans = spans;
       return {
         ...state,

src/routes/Trace/Trace.js

@@ -96,11 +96,14 @@ export default class Trace extends PureComponent {
   }
   handleTableExpand = (expanded, record) => {
     const { dispatch } = this.props;
-    if (expanded && !record.spans) {
-      dispatch({
-        type: 'trace/fetchSpans',
-        payload: { variables: { traceId: record.traceId } },
-      });
+    if (expanded) {
+      const { traceIds = [] } = record;
+      if (traceIds.length > 0) {
+        dispatch({
+          type: 'trace/fetchSpans',
+          payload: { variables: { traceId: traceIds[0] }, key: record.key },
+        });
+      }
     }
   }
   renderForm() {