Skip to content

Commit 7d3d09b

Browse files
committed
Bug 38231080 - Build: OpenTelemetry intermittent failure in NamedCacheOperationsTracingIT.{listenerFilter, keySetContainsAll} (merge main -> ce/main @ 118269)
[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 118270]
1 parent 55b2a65 commit 7d3d09b

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

prj/test/functional/tracing/opentelemetry/core/src/main/java/opentelemetry/core/NamedCacheOperationsTracingIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,9 +870,10 @@ protected void runTest(CacheOperations body, String sOp, String sFile)
870870
SpanNode spansActual = getSpanTree(span, listAssociatedSpans);
871871
ControlNode expected = ControlNode.loadFrom(loadGolden(sFile), null);
872872

873-
assertThat(String.format("Expected Span tree of\n%s received:\n%s",
873+
assertThat(String.format("Expected Span tree of\n%s received:\n%s; actual spans: %s",
874874
expected.toStringTree(),
875-
spansActual.toStringTree()),
875+
spansActual.toStringTree(),
876+
listAssociatedSpans),
876877
spansActual,
877878
is(expected));
878879
}

prj/test/functional/tracing/opentelemetry/core/src/main/java/opentelemetry/core/TestingUtils.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,10 +606,19 @@ public Node addChild(Node child)
606606
{
607607
super.getChildren().sort((o1, o2) ->
608608
{
609-
SpanNode spanTree = (SpanNode) o1;
610-
SpanNode spanTree2 = (SpanNode) o2;
611-
612-
return Long.compare(spanTree.f_span.getStartTimeUnixNano(), spanTree2.f_span.getStartTimeUnixNano());
609+
SpanNode spanNode1 = (SpanNode) o1;
610+
SpanNode spanNode2 = (SpanNode) o2;
611+
612+
int nComp = Long.compare(spanNode1.f_span.getStartTimeUnixNano(), spanNode2.f_span.getStartTimeUnixNano());
613+
if (nComp == 0)
614+
{
615+
if (spanNode1.getName().endsWith(".post"))
616+
{
617+
return 1;
618+
}
619+
}
620+
621+
return nComp;
613622
});
614623
}
615624

0 commit comments

Comments
 (0)