process spans

src/views/dashboard/related/trace/components/D3Graph/Index.vue

@@ -77,11 +77,18 @@ limitations under the License. -->
     d3.selectAll(".d3-tip").remove();
     if (props.type === "List") {
       tree.value = new ListGraph(traceGraph.value, handleSelectSpan);
-      tree.value.init({ label: "TRACE_ROOT", children: segmentId.value }, props.data, fixSpansSize.value);
+      tree.value.init(
+        { label: "TRACE_ROOT", children: segmentId.value },
+        getRefsAllNodes({ label: "TRACE_ROOT", children: segmentId.value }),
+        fixSpansSize.value,
+      );
       tree.value.draw();
     } else {
       tree.value = new TreeGraph(traceGraph.value, handleSelectSpan);
-      tree.value.init({ label: `${props.traceId}`, children: segmentId.value }, props.data);
+      tree.value.init(
+        { label: `${props.traceId}`, children: segmentId.value },
+        getRefsAllNodes({ label: "TRACE_ROOT", children: segmentId.value }),
+      );
     }
   }
   function handleSelectSpan(i: Recordable) {
@@ -272,24 +279,23 @@ limitations under the License. -->
       }
     }
     for (const i in segmentGroup) {
-      if (segmentGroup[i].refs.length) {
-        let exit = null;
       for (const ref of segmentGroup[i].refs) {
-          const e = props.data.find(
-            (i: Recordable) =>
-              ref.traceId === i.traceId && ref.parentSegmentId === i.segmentId && ref.parentSpanId === i.spanId,
-          );
-          if (e) {
-            exit = e;
+        if (segmentGroup[ref.parentSegmentId]) {
+          segmentGroup[ref.parentSegmentId].children.push(segmentGroup[i]);
         }
       }
-        if (exit) {
-          segmentId.value.push(segmentGroup[i]);
     }
-      } else {
+    for (const i in segmentGroup) {
+      for (const ref of segmentGroup[i].refs) {
+        if (!segmentGroup[ref.parentSegmentId]) {
           segmentId.value.push(segmentGroup[i]);
         }
       }
+      if (!segmentGroup[i].refs.length && segmentGroup[i].parentSpanId === -1) {
+        segmentId.value.push(segmentGroup[i]);
+      }
+    }
+    console.log(segmentId.value);
     for (const i of segmentId.value) {
       collapse(i);
     }
@@ -310,6 +316,23 @@ limitations under the License. -->
       }
     }
   }
+  function getRefsAllNodes(tree: Recordable) {
+    let nodes = [];
+    let stack = [tree];
+
+    while (stack.length > 0) {
+      const node = stack.pop();
+      nodes.push(node);
+
+      if (node?.children && node.children.length > 0) {
+        for (let i = node.children.length - 1; i >= 0; i--) {
+          stack.push(node.children[i]);
+        }
+      }
+    }
+
+    return nodes;
+  }
   function compare(p: string) {
     return (m: Recordable, n: Recordable) => {
       const a = m[p];

src/views/dashboard/related/trace/utils/d3-trace-list.ts

@@ -47,7 +47,7 @@ export default class ListGraph {
     this.el = el;
     this.width = el.getBoundingClientRect().width - 10;
     this.height = el.getBoundingClientRect().height - 10;
-    d3.select(".trace-list-dowanload").remove();
+    d3.select(`.${this.el?.className} .trace-list-dowanload`).remove();
     this.svg = d3
       .select(this.el)
       .append("svg")
@@ -85,7 +85,7 @@ export default class ListGraph {
     L${d.target.y} ${d.target.x - 5}`;
   }
   init(data: Recordable, row: Recordable[], fixSpansSize: number) {
-    d3.select(".trace-xaxis").remove();
+    d3.select(`.${this.el?.className} .trace-xaxis`).remove();
     this.row = row;
     this.data = data;
     this.min = d3.min(this.row.map((i) => i.startTime));

src/views/dashboard/related/trace/utils/d3-trace-tree.ts

@@ -55,7 +55,7 @@ export default class TraceMap {
     this.topChild = [];
     this.width = el.clientWidth - 20;
     this.height = el.clientHeight - 30;
-    d3.select(".d3-trace-tree").remove();
+    d3.select(`.${this.el?.className} .d3-trace-tree`).remove();
     this.body = d3
       .select(this.el)
       .append("svg")