This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ed9eb9674b5a CAMEL-23709: Update micrometer-observability tests for
EndpointSending span reduction
ed9eb9674b5a is described below
commit ed9eb9674b5a653231b01f9b2b99ea6bea576e4e
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Jun 8 19:32:50 2026 +0200
CAMEL-23709: Update micrometer-observability tests for EndpointSending span
reduction
Co-Authored-By: Claude <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
---
.../camel/micrometer/observability/BaggageInjectionTest.java | 7 ++-----
.../apache/camel/micrometer/observability/BaggageSettingTest.java | 5 ++---
.../camel/micrometer/observability/EnableProcessorsTest.java | 7 ++-----
.../org/apache/camel/micrometer/observability/SpanBeanTest.java | 7 ++-----
.../camel/micrometer/observability/SpanCustomizationTest.java | 7 ++-----
.../apache/camel/micrometer/observability/SpanInjectionTest.java | 7 ++-----
6 files changed, 12 insertions(+), 28 deletions(-)
diff --git
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/BaggageInjectionTest.java
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/BaggageInjectionTest.java
index c83666f608d0..44cdaea32bda 100644
---
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/BaggageInjectionTest.java
+++
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/BaggageInjectionTest.java
@@ -101,7 +101,8 @@ public class BaggageInjectionTest extends
MicrometerObservabilityTracerPropagati
private void checkTrace(OtelTrace trace, String parentTrace, String
parentSpan) {
List<SpanData> spans = trace.getSpans();
- assertEquals(7, spans.size());
+ // to("log:info") no longer produces a processor span (SendProcessor
implements EndpointSending)
+ assertEquals(6, spans.size());
SpanData mySpan = spans.get(0);
SpanData testProducer = spans.get(1);
@@ -109,7 +110,6 @@ public class BaggageInjectionTest extends
MicrometerObservabilityTracerPropagati
SpanData innerLog = spans.get(3);
SpanData innerProcessor = spans.get(4);
SpanData log = spans.get(5);
- SpanData innerToLog = spans.get(6);
// Validate span completion
assertTrue(mySpan.hasEnded());
@@ -118,7 +118,6 @@ public class BaggageInjectionTest extends
MicrometerObservabilityTracerPropagati
assertTrue(innerLog.hasEnded());
assertTrue(innerProcessor.hasEnded());
assertTrue(log.hasEnded());
- assertTrue(innerToLog.hasEnded());
// MySpan validation
assertEquals("mySpan", mySpan.getName());
@@ -129,7 +128,6 @@ public class BaggageInjectionTest extends
MicrometerObservabilityTracerPropagati
assertEquals(testProducer.getSpanContext().getTraceId(),
innerLog.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
innerProcessor.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
log.getSpanContext().getTraceId());
- assertEquals(testProducer.getSpanContext().getTraceId(),
innerToLog.getSpanContext().getTraceId());
// Validate operations
assertEquals(Op.EVENT_RECEIVED.toString(),
direct.getAttributes().get(AttributeKey.stringKey("op")));
@@ -144,7 +142,6 @@ public class BaggageInjectionTest extends
MicrometerObservabilityTracerPropagati
assertEquals(direct.getSpanContext().getSpanId(),
innerLog.getParentSpanContext().getSpanId());
assertEquals(direct.getSpanContext().getSpanId(),
innerProcessor.getParentSpanContext().getSpanId());
assertEquals(direct.getSpanContext().getSpanId(),
log.getParentSpanContext().getSpanId());
- assertEquals(log.getSpanContext().getSpanId(),
innerToLog.getParentSpanContext().getSpanId());
}
@Override
diff --git
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/BaggageSettingTest.java
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/BaggageSettingTest.java
index a4042f1b340e..6c7150297520 100644
---
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/BaggageSettingTest.java
+++
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/BaggageSettingTest.java
@@ -53,14 +53,14 @@ public class BaggageSettingTest extends
MicrometerObservabilityTracerPropagation
private void checkTrace(OtelTrace trace) {
List<SpanData> spans = trace.getSpans();
- assertEquals(7, spans.size());
+ // to("log:info") no longer produces a processor span (SendProcessor
implements EndpointSending)
+ assertEquals(6, spans.size());
SpanData testProducer = spans.get(0);
SpanData direct = spans.get(1);
SpanData setHeaders = spans.get(2);
SpanData innerLog = spans.get(3);
SpanData innerProcessor = spans.get(4);
SpanData log = spans.get(5);
- SpanData innerToLog = spans.get(6);
// Validate span completion
assertTrue(testProducer.hasEnded());
@@ -69,7 +69,6 @@ public class BaggageSettingTest extends
MicrometerObservabilityTracerPropagation
assertTrue(innerLog.hasEnded());
assertTrue(innerProcessor.hasEnded());
assertTrue(log.hasEnded());
- assertTrue(innerToLog.hasEnded());
}
@Override
diff --git
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/EnableProcessorsTest.java
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/EnableProcessorsTest.java
index 13b42a399b8b..71e8df0bccf0 100644
---
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/EnableProcessorsTest.java
+++
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/EnableProcessorsTest.java
@@ -56,14 +56,14 @@ public class EnableProcessorsTest extends
MicrometerObservabilityTracerPropagati
private void checkTrace(OtelTrace trace) {
List<SpanData> spans = trace.getSpans();
- assertEquals(6, spans.size());
+ // to("log:info") no longer produces a processor span (SendProcessor
implements EndpointSending)
+ assertEquals(5, spans.size());
SpanData testProducer = spans.get(0);
SpanData direct = spans.get(1);
SpanData innerLog = spans.get(2);
SpanData innerProcessor = spans.get(3);
SpanData log = spans.get(4);
- SpanData innerToLog = spans.get(5);
// Validate span completion
assertTrue(testProducer.hasEnded());
@@ -71,14 +71,12 @@ public class EnableProcessorsTest extends
MicrometerObservabilityTracerPropagati
assertTrue(innerLog.hasEnded());
assertTrue(innerProcessor.hasEnded());
assertTrue(log.hasEnded());
- assertTrue(innerToLog.hasEnded());
// Validate same trace
assertEquals(testProducer.getTraceId(), direct.getTraceId());
assertEquals(testProducer.getTraceId(), innerLog.getTraceId());
assertEquals(testProducer.getTraceId(), innerProcessor.getTraceId());
assertEquals(testProducer.getTraceId(), log.getTraceId());
- assertEquals(testProducer.getTraceId(), innerToLog.getTraceId());
// Validate op
assertEquals(Op.EVENT_RECEIVED.toString(),
direct.getAttributes().get(AttributeKey.stringKey("op")));
@@ -90,7 +88,6 @@ public class EnableProcessorsTest extends
MicrometerObservabilityTracerPropagati
assertEquals(direct.getSpanId(), innerLog.getParentSpanId());
assertEquals(direct.getSpanId(), innerProcessor.getParentSpanId());
assertEquals(direct.getSpanId(), log.getParentSpanId());
- assertEquals(log.getSpanId(), innerToLog.getParentSpanId());
}
@Override
diff --git
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanBeanTest.java
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanBeanTest.java
index aedb256e9f2c..0f9355bbfc0b 100644
---
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanBeanTest.java
+++
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanBeanTest.java
@@ -55,14 +55,14 @@ public class SpanBeanTest extends
MicrometerObservabilityTracerPropagationTestSu
private void checkTrace(OtelTrace trace) {
List<SpanData> spans = trace.getSpans();
- assertEquals(7, spans.size());
+ // to("log:info") no longer produces a processor span (SendProcessor
implements EndpointSending)
+ assertEquals(6, spans.size());
SpanData testProducer = spans.get(0);
SpanData direct = spans.get(1);
SpanData innerLog = spans.get(2);
SpanData beanProcessor = spans.get(3);
SpanData customSpan = spans.get(4);
SpanData log = spans.get(5);
- SpanData innerToLog = spans.get(6);
// Validate span completion
assertTrue(testProducer.hasEnded());
@@ -71,16 +71,13 @@ public class SpanBeanTest extends
MicrometerObservabilityTracerPropagationTestSu
assertTrue(beanProcessor.hasEnded());
assertTrue(customSpan.hasEnded());
assertTrue(log.hasEnded());
- assertTrue(innerToLog.hasEnded());
// Validate same trace
assertEquals(testProducer.getSpanContext().getTraceId(),
direct.getSpanContext().getTraceId());
- assertEquals(testProducer.getSpanContext().getTraceId(),
direct.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
innerLog.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
beanProcessor.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
customSpan.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
log.getSpanContext().getTraceId());
- assertEquals(testProducer.getSpanContext().getTraceId(),
innerToLog.getSpanContext().getTraceId());
// Validate operations
assertEquals(Op.EVENT_RECEIVED.toString(),
direct.getAttributes().get(AttributeKey.stringKey("op")));
diff --git
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanCustomizationTest.java
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanCustomizationTest.java
index 4b86e4480cfc..c1fd9b99cd3f 100644
---
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanCustomizationTest.java
+++
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanCustomizationTest.java
@@ -57,14 +57,14 @@ public class SpanCustomizationTest extends
MicrometerObservabilityTracerPropagat
private void checkTrace(OtelTrace trace) {
List<SpanData> spans = trace.getSpans();
- assertEquals(7, spans.size());
+ // to("log:info") no longer produces a processor span (SendProcessor
implements EndpointSending)
+ assertEquals(6, spans.size());
SpanData testProducer = spans.get(0);
SpanData direct = spans.get(1);
SpanData innerLog = spans.get(2);
SpanData innerProcessor = spans.get(3);
SpanData customSpan = spans.get(4);
SpanData log = spans.get(5);
- SpanData innerToLog = spans.get(6);
// Validate span completion
assertTrue(testProducer.hasEnded());
@@ -73,16 +73,13 @@ public class SpanCustomizationTest extends
MicrometerObservabilityTracerPropagat
assertTrue(innerProcessor.hasEnded());
assertTrue(customSpan.hasEnded());
assertTrue(log.hasEnded());
- assertTrue(innerToLog.hasEnded());
// Validate same trace
assertEquals(testProducer.getSpanContext().getTraceId(),
direct.getSpanContext().getTraceId());
- assertEquals(testProducer.getSpanContext().getTraceId(),
direct.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
innerLog.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
innerProcessor.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
customSpan.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
log.getSpanContext().getTraceId());
- assertEquals(testProducer.getSpanContext().getTraceId(),
innerToLog.getSpanContext().getTraceId());
// Validate operations
assertEquals(Op.EVENT_RECEIVED.toString(),
direct.getAttributes().get(AttributeKey.stringKey("op")));
diff --git
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanInjectionTest.java
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanInjectionTest.java
index 908b5343c312..d2c335254da5 100644
---
a/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanInjectionTest.java
+++
b/components/camel-micrometer-observability/src/test/java/org/apache/camel/micrometer/observability/SpanInjectionTest.java
@@ -98,7 +98,8 @@ public class SpanInjectionTest extends
MicrometerObservabilityTracerPropagationT
private void checkTrace(OtelTrace trace, String parentTrace, String
parentSpan) {
List<SpanData> spans = trace.getSpans();
- assertEquals(7, spans.size());
+ // to("log:info") no longer produces a processor span (SendProcessor
implements EndpointSending)
+ assertEquals(6, spans.size());
SpanData mySpan = spans.get(0);
SpanData testProducer = spans.get(1);
@@ -106,7 +107,6 @@ public class SpanInjectionTest extends
MicrometerObservabilityTracerPropagationT
SpanData innerLog = spans.get(3);
SpanData innerProcessor = spans.get(4);
SpanData log = spans.get(5);
- SpanData innerToLog = spans.get(6);
// Validate span completion
assertTrue(mySpan.hasEnded());
@@ -115,7 +115,6 @@ public class SpanInjectionTest extends
MicrometerObservabilityTracerPropagationT
assertTrue(innerLog.hasEnded());
assertTrue(innerProcessor.hasEnded());
assertTrue(log.hasEnded());
- assertTrue(innerToLog.hasEnded());
// MySpan validation
assertEquals("mySpan", mySpan.getName());
@@ -126,7 +125,6 @@ public class SpanInjectionTest extends
MicrometerObservabilityTracerPropagationT
assertEquals(testProducer.getSpanContext().getTraceId(),
innerLog.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
innerProcessor.getSpanContext().getTraceId());
assertEquals(testProducer.getSpanContext().getTraceId(),
log.getSpanContext().getTraceId());
- assertEquals(testProducer.getSpanContext().getTraceId(),
innerToLog.getSpanContext().getTraceId());
// Validate operations
assertEquals(Op.EVENT_RECEIVED.toString(),
direct.getAttributes().get(AttributeKey.stringKey("op")));
@@ -141,7 +139,6 @@ public class SpanInjectionTest extends
MicrometerObservabilityTracerPropagationT
assertEquals(direct.getSpanContext().getSpanId(),
innerLog.getParentSpanContext().getSpanId());
assertEquals(direct.getSpanContext().getSpanId(),
innerProcessor.getParentSpanContext().getSpanId());
assertEquals(direct.getSpanContext().getSpanId(),
log.getParentSpanContext().getSpanId());
- assertEquals(log.getSpanContext().getSpanId(),
innerToLog.getParentSpanContext().getSpanId());
}
@Override
