From 0ea2d7b8d85220e5a2246d6539453ff620cbbe56 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Thu, 1 Jun 2023 18:23:21 +0300
Subject: [PATCH] Fix flaky spring rabbit test (#8631)

---
 .../src/test/groovy/ContextPropagationTest.groovy          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/groovy/ContextPropagationTest.groovy b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/groovy/ContextPropagationTest.groovy
index 57c2b866eb..5724ea40ce 100644
--- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/groovy/ContextPropagationTest.groovy
+++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/groovy/ContextPropagationTest.groovy
@@ -91,7 +91,12 @@ class ContextPropagationTest extends AgentInstrumentationSpecification {
     then:
     assertTraces(2) {
       trace(0, 5) {
-        spans.subList(2, 4).sort {
+        spans.subList(2, 5).sort {
+          // sort "consumer" span after "testQueue process" spans
+          if (it.name == "consumer") {
+            return 2
+          }
+          // order "testQueue process" spans
           def destination = it.attributes.get(SemanticAttributes.MESSAGING_DESTINATION_NAME)
           return destination == "<default>" ? 0 : 1
         }