Skip to content

Commit 5935bd1

Browse files
Improve names
Signed-off-by: Damian Maslanka <[email protected]>
1 parent 7b7286d commit 5935bd1

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

packages/jaeger-ui/src/components/TracePage/TraceStatistics/tableValues.tsx

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,61 +42,61 @@ function getChildOfSpans(parentID: string, allSpans: Span[]): Span[] {
4242
return memoizedParentChildOfMap(allSpans)[parentID] || [];
4343
}
4444

45-
function computeSelfTime(span: Span, allSpans: Span[]): number {
46-
if (!span.hasChildren) return span.duration;
45+
function computeSelfTime(parentSpan: Span, allSpans: Span[]): number {
46+
if (!parentSpan.hasChildren) return parentSpan.duration;
4747

48-
let spanSelfTime = span.duration;
49-
let previousSpanEndTime = span.startTime;
48+
let parentSpanSelfTime = parentSpan.duration;
49+
let previousChildEndTime = parentSpan.startTime;
5050

51-
const children = getChildOfSpans(span.spanID, allSpans).sort((a, b) => a.startTime - b.startTime);
51+
const children = getChildOfSpans(parentSpan.spanID, allSpans).sort((a, b) => a.startTime - b.startTime);
5252

53-
const parentSpanEndTime = span.startTime + span.duration;
53+
const parentSpanEndTime = parentSpan.startTime + parentSpan.duration;
5454

5555
for (let index = 0; index < children.length; index++) {
5656
const child = children[index];
5757

58-
const spanEndTime = child.startTime + child.duration;
59-
const spanStartsAfterParentEnded = child.startTime > parentSpanEndTime;
60-
const spanEndsBeforePreviousSpan = spanEndTime < previousSpanEndTime;
58+
const childEndTime = child.startTime + child.duration;
59+
const childStartsAfterParentEnded = child.startTime > parentSpanEndTime;
60+
const childEndsBeforePreviousChild = childEndTime < previousChildEndTime;
6161

6262
// parent |..................|
6363
// child |.......|
64-
// child |.....| - spanEndsBeforePreviousSpan is true, skipped
65-
// child |......| - spanStartsAfterParentEnded is true, skipped
66-
if (spanStartsAfterParentEnded || spanEndsBeforePreviousSpan) {
64+
// child |.....| - childEndsBeforePreviousChild is true, skipped
65+
// child |......| - childStartsAfterParentEnded is true, skipped
66+
if (childStartsAfterParentEnded || childEndsBeforePreviousChild) {
6767
continue;
6868
}
6969

7070
let nonOverlappingStartTime = child.startTime;
7171
let nonOverlappingDuration = child.duration;
72-
const spanStartsBeforePreviousSpanEnds = child.startTime < previousSpanEndTime;
72+
const childStartsBeforePreviousChildEnds = child.startTime < previousChildEndTime;
7373

7474
// parent |.....................|
7575
// child |.......|
76-
// child |.....| - spanStartsBeforePreviousSpanEnds is true
77-
// child |.....| - spanStartsBeforePreviousSpanEnds is false
78-
if (spanStartsBeforePreviousSpanEnds) {
79-
const diff = previousSpanEndTime - child.startTime;
76+
// child |.....| - childStartsBeforePreviousChildEnds is true
77+
// child |.....| - childStartsBeforePreviousChildEnds is false
78+
if (childStartsBeforePreviousChildEnds) {
79+
const diff = previousChildEndTime - child.startTime;
8080
nonOverlappingDuration = child.duration - diff;
81-
nonOverlappingStartTime = previousSpanEndTime;
81+
nonOverlappingStartTime = previousChildEndTime;
8282
}
8383
// last span which can be included in self time calculation, because it ends after parent span ends
8484
// parent |......................|
8585
// child |.....| - last span included in self time calculation
8686
// child |.........| - skipped
87-
else if (spanEndTime > parentSpanEndTime) {
88-
const diff = spanEndTime - parentSpanEndTime;
87+
else if (childEndTime > parentSpanEndTime) {
88+
const diff = childEndTime - parentSpanEndTime;
8989

9090
nonOverlappingDuration = child.duration - diff;
91-
spanSelfTime -= nonOverlappingDuration;
91+
parentSpanSelfTime -= nonOverlappingDuration;
9292
break;
9393
}
9494

95-
spanSelfTime -= nonOverlappingDuration;
96-
previousSpanEndTime = nonOverlappingStartTime + nonOverlappingDuration;
95+
parentSpanSelfTime -= nonOverlappingDuration;
96+
previousChildEndTime = nonOverlappingStartTime + nonOverlappingDuration;
9797
}
9898

99-
return spanSelfTime;
99+
return parentSpanSelfTime;
100100
}
101101

102102
function computeColumnValues(trace: Trace, span: Span, allSpans: Span[], resultValue: StatsPerTag) {

0 commit comments

Comments
 (0)