mirror of
https://github.com/apache/skywalking-booster-ui.git
synced 2025-04-30 14:43:58 +00:00
build: remove lodash library (#454)
This commit is contained in:
Fine0830
GitHub
parent
012ae1db6c
commit
1fe58f5f6c
6
package-lock.json
generated
6
package-lock.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "skywalking-booster-ui",
|
||||
"version": "9.4.0",
|
||||
"version": "10.2.0",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "skywalking-booster-ui",
|
||||
"version": "9.4.0",
|
||||
"version": "10.2.0",
|
||||
"dependencies": {
|
||||
"axios": "^1.7.5",
|
||||
"d3": "^7.3.0",
|
||||
@ -14,7 +14,6 @@
|
||||
"d3-tip": "^0.9.1",
|
||||
"echarts": "^5.2.2",
|
||||
"element-plus": "^2.9.4",
|
||||
"lodash": "^4.17.21",
|
||||
"monaco-editor": "^0.34.1",
|
||||
"pinia": "^2.0.28",
|
||||
"vis-timeline": "^7.5.1",
|
||||
@ -32,7 +31,6 @@
|
||||
"@types/d3-tip": "^3.5.5",
|
||||
"@types/echarts": "^4.9.12",
|
||||
"@types/jsdom": "^20.0.1",
|
||||
"@types/lodash": "^4.14.179",
|
||||
"@types/node": "^18.11.12",
|
||||
"@types/three": "^0.131.0",
|
||||
"@vitejs/plugin-vue": "^5.2.1",
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
"d3-tip": "^0.9.1",
|
||||
"echarts": "^5.2.2",
|
||||
"element-plus": "^2.9.4",
|
||||
"lodash": "^4.17.21",
|
||||
"monaco-editor": "^0.34.1",
|
||||
"pinia": "^2.0.28",
|
||||
"vis-timeline": "^7.5.1",
|
||||
@ -42,7 +41,6 @@
|
||||
"@types/d3-tip": "^3.5.5",
|
||||
"@types/echarts": "^4.9.12",
|
||||
"@types/jsdom": "^20.0.1",
|
||||
"@types/lodash": "^4.14.179",
|
||||
"@types/node": "^18.11.12",
|
||||
"@types/three": "^0.131.0",
|
||||
"@vitejs/plugin-vue": "^5.2.1",
|
||||
|
||||
@ -22,7 +22,6 @@ limitations under the License. -->
|
||||
<script lang="ts" setup>
|
||||
import { ref, watch, onBeforeUnmount, onMounted } from "vue";
|
||||
import type { PropType } from "vue";
|
||||
import _ from "lodash";
|
||||
import * as d3 from "d3";
|
||||
import ListGraph from "../../utils/d3-trace-list";
|
||||
import TreeGraph from "../../utils/d3-trace-tree";
|
||||
@ -120,15 +119,19 @@ limitations under the License. -->
|
||||
const item = props.data.find(
|
||||
(i: Span) => i.traceId === span.traceId && i.segmentId === span.segmentId && i.spanId === span.spanId - 1,
|
||||
);
|
||||
const fixSpanKeyContent = {
|
||||
traceId: span.traceId,
|
||||
segmentId: span.segmentId,
|
||||
spanId: span.spanId - 1,
|
||||
parentSpanId: span.spanId - 2,
|
||||
};
|
||||
if (!item && !_.find(fixSpans, fixSpanKeyContent)) {
|
||||
const content = fixSpans.find(
|
||||
(i: Span) =>
|
||||
i.traceId === span.traceId &&
|
||||
i.segmentId === span.segmentId &&
|
||||
i.spanId === span.spanId - 1 &&
|
||||
i.parentSpanId === span.spanId - 2,
|
||||
);
|
||||
if (!item && !content) {
|
||||
fixSpans.push({
|
||||
...fixSpanKeyContent,
|
||||
traceId: span.traceId,
|
||||
segmentId: span.segmentId,
|
||||
spanId: span.spanId - 1,
|
||||
parentSpanId: span.spanId - 2,
|
||||
refs: [],
|
||||
endpointName: `VNode: ${span.segmentId}`,
|
||||
serviceCode: "VirtualNode",
|
||||
@ -161,22 +164,26 @@ limitations under the License. -->
|
||||
if (!exit) {
|
||||
const ref = span.refs[0];
|
||||
// create a known broken node.
|
||||
const i = ref.parentSpanId;
|
||||
const fixSpanKeyContent = {
|
||||
traceId: ref.traceId,
|
||||
segmentId: ref.parentSegmentId,
|
||||
spanId: i,
|
||||
parentSpanId: i > -1 ? 0 : -1,
|
||||
};
|
||||
if (!_.find(fixSpans, fixSpanKeyContent)) {
|
||||
const parentSpanId = ref.parentSpanId > -1 ? 0 : -1;
|
||||
const content = fixSpans.find(
|
||||
(i: Span) =>
|
||||
i.traceId === ref.traceId &&
|
||||
i.segmentId === ref.parentSegmentId &&
|
||||
i.spanId === ref.parentSpanId &&
|
||||
i.parentSpanId === parentSpanId,
|
||||
);
|
||||
if (!content) {
|
||||
fixSpans.push({
|
||||
...fixSpanKeyContent,
|
||||
traceId: ref.traceId,
|
||||
segmentId: ref.parentSegmentId,
|
||||
spanId: ref.parentSpanId,
|
||||
parentSpanId,
|
||||
refs: [],
|
||||
endpointName: `VNode: ${ref.parentSegmentId}`,
|
||||
serviceCode: "VirtualNode",
|
||||
type: `[Broken] ${ref.type}`,
|
||||
peer: "",
|
||||
component: `VirtualNode: #${i}`,
|
||||
component: `VirtualNode: #${ref.parentSpanId}`,
|
||||
isError: true,
|
||||
isBroken: true,
|
||||
layer: "Broken",
|
||||
@ -187,16 +194,20 @@ limitations under the License. -->
|
||||
});
|
||||
}
|
||||
// if root broken node is not exist, create a root broken node.
|
||||
if (fixSpanKeyContent.parentSpanId > -1) {
|
||||
const fixRootSpanKeyContent = {
|
||||
traceId: ref.traceId,
|
||||
segmentId: ref.parentSegmentId,
|
||||
spanId: 0,
|
||||
parentSpanId: -1,
|
||||
};
|
||||
if (!_.find(fixSpans, fixRootSpanKeyContent)) {
|
||||
if (parentSpanId > -1) {
|
||||
const content = fixSpans.find(
|
||||
(i: Span) =>
|
||||
i.traceId === ref.traceId &&
|
||||
i.segmentId === ref.parentSegmentId &&
|
||||
i.spanId === 0 &&
|
||||
i.parentSpanId === -1,
|
||||
);
|
||||
if (!content) {
|
||||
fixSpans.push({
|
||||
...fixRootSpanKeyContent,
|
||||
traceId: ref.traceId,
|
||||
segmentId: ref.parentSegmentId,
|
||||
spanId: 0,
|
||||
parentSpanId: -1,
|
||||
refs: [],
|
||||
endpointName: `VNode: ${ref.parentSegmentId}`,
|
||||
serviceCode: "VirtualNode",
|
||||
@ -241,14 +252,12 @@ limitations under the License. -->
|
||||
}
|
||||
}
|
||||
if (s.isBroken) {
|
||||
const children = _.filter(props.data, (span: Span) => {
|
||||
return _.find(span.refs, {
|
||||
traceId: s.traceId,
|
||||
parentSegmentId: s.segmentId,
|
||||
parentSpanId: s.spanId,
|
||||
});
|
||||
});
|
||||
if (children.length > 0) {
|
||||
const children = props.data.filter((span: Span) =>
|
||||
span.refs.find(
|
||||
(d) => d.traceId === s.traceId && d.parentSegmentId === s.segmentId && d.parentSpanId === s.spanId,
|
||||
),
|
||||
);
|
||||
if (children.length) {
|
||||
s.children.push(...children);
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
*/
|
||||
|
||||
import type { Ref, Span, StatisticsSpan, StatisticsGroupRef, TraceTreeRef } from "@/types/trace";
|
||||
import lodash from "lodash";
|
||||
|
||||
export default class TraceUtil {
|
||||
public static buildTraceDataList(data: Span[]): string[] {
|
||||
@ -91,15 +90,19 @@ export default class TraceUtil {
|
||||
const index = data.findIndex((patchSpan: Span) => {
|
||||
return patchSpan.segmentId === span.segmentId && patchSpan.spanId === span.spanId - 1;
|
||||
});
|
||||
const fixSpanKeyContent = {
|
||||
traceId: span.traceId,
|
||||
segmentId: span.segmentId,
|
||||
spanId: span.spanId - 1,
|
||||
parentSpanId: span.spanId - 2,
|
||||
};
|
||||
if (index === -1 && !lodash.find(fixSpans, fixSpanKeyContent)) {
|
||||
const content = fixSpans.find(
|
||||
(i: Span) =>
|
||||
i.traceId === span.traceId &&
|
||||
i.segmentId === span.segmentId &&
|
||||
i.spanId === span.spanId - 1 &&
|
||||
i.parentSpanId === span.spanId - 2,
|
||||
);
|
||||
if (index === -1 && !content) {
|
||||
fixSpans.push({
|
||||
...fixSpanKeyContent,
|
||||
traceId: span.traceId,
|
||||
segmentId: span.segmentId,
|
||||
spanId: span.spanId - 1,
|
||||
parentSpanId: span.spanId - 2,
|
||||
refs: [],
|
||||
endpointName: `VNode: ${span.segmentId}`,
|
||||
serviceCode: "VirtualNode",
|
||||
@ -125,16 +128,20 @@ export default class TraceUtil {
|
||||
});
|
||||
if (index === -1) {
|
||||
// create a known broken node.
|
||||
const parentSpanId: number = ref.parentSpanId;
|
||||
const fixSpanKeyContent = {
|
||||
traceId: ref.traceId,
|
||||
segmentId: ref.parentSegmentId,
|
||||
spanId: parentSpanId,
|
||||
parentSpanId: parentSpanId > -1 ? 0 : -1,
|
||||
};
|
||||
if (!lodash.find(fixSpans, fixSpanKeyContent)) {
|
||||
const parentSpanId = ref.parentSpanId > -1 ? 0 : -1;
|
||||
const item = fixSpans.find(
|
||||
(i: Span) =>
|
||||
i.traceId === ref.traceId &&
|
||||
i.segmentId === ref.parentSegmentId &&
|
||||
i.spanId === ref.parentSpanId &&
|
||||
i.parentSpanId === parentSpanId,
|
||||
);
|
||||
if (!item) {
|
||||
fixSpans.push({
|
||||
...fixSpanKeyContent,
|
||||
traceId: ref.traceId,
|
||||
segmentId: ref.parentSegmentId,
|
||||
spanId: ref.parentSpanId,
|
||||
parentSpanId: parentSpanId,
|
||||
refs: [],
|
||||
endpointName: `VNode: ${ref.parentSegmentId}`,
|
||||
serviceCode: "VirtualNode",
|
||||
@ -151,16 +158,20 @@ export default class TraceUtil {
|
||||
});
|
||||
}
|
||||
// if root broken node is not exist, create a root broken node.
|
||||
if (fixSpanKeyContent.parentSpanId > -1) {
|
||||
const fixRootSpanKeyContent = {
|
||||
traceId: ref.traceId,
|
||||
segmentId: ref.parentSegmentId,
|
||||
spanId: 0,
|
||||
parentSpanId: -1,
|
||||
};
|
||||
if (!lodash.find(fixSpans, fixRootSpanKeyContent)) {
|
||||
if (parentSpanId > -1) {
|
||||
const item = fixSpans.find(
|
||||
(i: Span) =>
|
||||
i.traceId === ref.traceId &&
|
||||
i.segmentId === ref.parentSegmentId &&
|
||||
i.spanId === 0 &&
|
||||
i.parentSpanId === -1,
|
||||
);
|
||||
if (!item) {
|
||||
fixSpans.push({
|
||||
...fixRootSpanKeyContent,
|
||||
traceId: ref.traceId,
|
||||
segmentId: ref.parentSegmentId,
|
||||
spanId: 0,
|
||||
parentSpanId: -1,
|
||||
refs: [],
|
||||
endpointName: `VNode: ${ref.parentSegmentId}`,
|
||||
serviceCode: "VirtualNode",
|
||||
@ -210,13 +221,14 @@ export default class TraceUtil {
|
||||
}
|
||||
}
|
||||
if (curSegment.isBroken) {
|
||||
const children = lodash.filter(data, (span: Span) => {
|
||||
return lodash.find(span.refs, {
|
||||
traceId: curSegment.traceId,
|
||||
parentSegmentId: curSegment.segmentId,
|
||||
parentSpanId: curSegment.spanId,
|
||||
});
|
||||
}) as Span[];
|
||||
const children = data.filter((span: Span) =>
|
||||
span.refs.find(
|
||||
(d) =>
|
||||
d.traceId === curSegment.traceId &&
|
||||
d.parentSegmentId === curSegment.segmentId &&
|
||||
d.parentSpanId === curSegment.spanId,
|
||||
),
|
||||
);
|
||||
if (children.length) {
|
||||
curSegment.children = curSegment.children || [];
|
||||
curSegment.children.push(...children);
|
||||
|
||||
@ -90,9 +90,6 @@ export default ({ mode }: ConfigEnv): UserConfig => {
|
||||
assetFileNames: "static/[ext]/[name]-[hash].[ext]",
|
||||
manualChunks(id) {
|
||||
if (id.includes("node_modules")) {
|
||||
if (id.includes("lodash")) {
|
||||
return "lodash";
|
||||
}
|
||||
if (id.includes("echarts")) {
|
||||
return "echarts";
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user