@@ -921,7 +921,10 @@ export class TraceTree extends TraceTreeEventDispatcher {
921
921
while ( queue . length > 0 ) {
922
922
const node = queue . pop ( ) ! ;
923
923
924
- if ( ( ! isSpanNode ( node ) && ! isEAPSpanNode ( node ) ) || node . children . length > 1 ) {
924
+ if (
925
+ ( ! isSpanNode ( node ) && ! isNonTransactionEAPSpanNode ( node ) ) ||
926
+ node . children . length > 1
927
+ ) {
925
928
for ( const child of node . children ) {
926
929
queue . push ( child ) ;
927
930
}
@@ -941,7 +944,8 @@ export class TraceTree extends TraceTreeEventDispatcher {
941
944
while (
942
945
tail &&
943
946
tail . children . length === 1 &&
944
- ( isSpanNode ( tail . children [ 0 ] ! ) || isEAPSpanNode ( tail . children [ 0 ] ! ) ) &&
947
+ ( isSpanNode ( tail . children [ 0 ] ! ) ||
948
+ isNonTransactionEAPSpanNode ( tail . children [ 0 ] ! ) ) &&
945
949
// skip `op: default` spans as `default` is added to op-less spans:
946
950
tail . children [ 0 ] . value . op !== 'default' &&
947
951
tail . children [ 0 ] . value . op === head . value . op
@@ -963,7 +967,9 @@ export class TraceTree extends TraceTreeEventDispatcher {
963
967
continue ;
964
968
}
965
969
966
- const spanId = isEAPSpanNode ( head ) ? head . value . event_id : head . value . span_id ;
970
+ const spanId = isNonTransactionEAPSpanNode ( head )
971
+ ? head . value . event_id
972
+ : head . value . span_id ;
967
973
const autoGroupedNode = new ParentAutogroupNode (
968
974
node . parent ,
969
975
{
@@ -1076,7 +1082,10 @@ export class TraceTree extends TraceTreeEventDispatcher {
1076
1082
1077
1083
while ( index < node . children . length ) {
1078
1084
// Skip until we find a span candidate
1079
- if ( ! isSpanNode ( node . children [ index ] ! ) && ! isEAPSpanNode ( node . children [ index ] ! ) ) {
1085
+ if (
1086
+ ! isSpanNode ( node . children [ index ] ! ) &&
1087
+ ! isNonTransactionEAPSpanNode ( node . children [ index ] ! )
1088
+ ) {
1080
1089
index ++ ;
1081
1090
matchCount = 0 ;
1082
1091
continue ;
@@ -1091,7 +1100,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
1091
1100
1092
1101
if (
1093
1102
next &&
1094
- ( isSpanNode ( next ) || isEAPSpanNode ( next ) ) &&
1103
+ ( isSpanNode ( next ) || isNonTransactionEAPSpanNode ( next ) ) &&
1095
1104
next . children . length === 0 &&
1096
1105
current . children . length === 0 &&
1097
1106
// skip `op: default` spans as `default` is added to op-less spans
@@ -1111,7 +1120,7 @@ export class TraceTree extends TraceTreeEventDispatcher {
1111
1120
const autoGroupedNode = new SiblingAutogroupNode (
1112
1121
node ,
1113
1122
{
1114
- span_id : isEAPSpanNode ( current )
1123
+ span_id : isNonTransactionEAPSpanNode ( current )
1115
1124
? current . value . event_id
1116
1125
: current . value . span_id ,
1117
1126
op : current . value . op ?? '' ,
0 commit comments