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
commit 08e7f5aee9ec29af0db7b5b200b4322106921ec0 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Feb 17 07:46:31 2023 +0100 CAMEL-19040: Backlog tracer to capture MEP --- .../camel/management/BacklogTracerFilterTest.java | 6 +- .../management/BacklogTracerIdOnAllNodesTest.java | 4 +- .../camel/management/BacklogTracerPatternTest.java | 4 +- .../management/BacklogTracerStreamCachingTest.java | 2 +- .../apache/camel/management/BacklogTracerTest.java | 16 +++--- .../ManagedBrowsableEndpointAsXmlTest.java | 66 +++++++++++----------- 6 files changed, 50 insertions(+), 48 deletions(-) diff --git a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerFilterTest.java b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerFilterTest.java index d4c1766b217..7e141a3eaf1 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerFilterTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerFilterTest.java @@ -74,7 +74,7 @@ public class BacklogTracerFilterTest extends ManagementTestSupport { BacklogTracerEventMessage event = events.get(0); assertEquals(null, event.getToNode()); - assertEquals(" <message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <headers>\n" + " <header key=\"foo\" type=\"java.lang.Integer\">123</header>\n" + " </headers>\n" @@ -84,7 +84,7 @@ public class BacklogTracerFilterTest extends ManagementTestSupport { BacklogTracerEventMessage event1 = events.get(1); assertEquals("foo", event1.getToNode()); - assertEquals(" <message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <headers>\n" + " <header key=\"foo\" type=\"java.lang.Integer\">123</header>\n" + " </headers>\n" @@ -94,7 +94,7 @@ public class BacklogTracerFilterTest extends ManagementTestSupport { BacklogTracerEventMessage event2 = events.get(2); assertEquals("bar", event2.getToNode()); - assertEquals(" <message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <headers>\n" + " <header key=\"foo\" type=\"java.lang.Integer\">123</header>\n" + " </headers>\n" diff --git a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerIdOnAllNodesTest.java b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerIdOnAllNodesTest.java index d05b0ed1e87..91cf01c77a8 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerIdOnAllNodesTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerIdOnAllNodesTest.java @@ -112,7 +112,7 @@ public class BacklogTracerIdOnAllNodesTest extends ManagementTestSupport { BacklogTracerEventMessage event1 = events.get(0); assertEquals(to2.getId(), event1.getToNode()); - assertEquals(" <message exchangeId=\"" + fooExchanges.get(0).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + fooExchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Hello World</body>\n" + " </message>", event1.getMessageAsXml()); @@ -125,7 +125,7 @@ public class BacklogTracerIdOnAllNodesTest extends ManagementTestSupport { event1 = events.get(0); assertEquals("camel", event1.getToNode()); - assertEquals(" <message exchangeId=\"" + camelExchanges.get(0).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + camelExchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Hello Camel</body>\n" + " </message>", event1.getMessageAsXml()); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerPatternTest.java b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerPatternTest.java index 1cc845ee67a..1d3e6b95f1c 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerPatternTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerPatternTest.java @@ -74,14 +74,14 @@ public class BacklogTracerPatternTest extends ManagementTestSupport { BacklogTracerEventMessage event1 = events.get(0); assertEquals("foo", event1.getToNode()); - assertEquals(" <message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Hello World</body>\n" + " </message>", event1.getMessageAsXml()); BacklogTracerEventMessage event2 = events.get(1); assertEquals("foo", event2.getToNode()); - assertEquals(" <message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Bye World</body>\n" + " </message>", event2.getMessageAsXml()); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerStreamCachingTest.java b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerStreamCachingTest.java index bda1b360b1b..b8cf3240ab7 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerStreamCachingTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerStreamCachingTest.java @@ -77,7 +77,7 @@ public class BacklogTracerStreamCachingTest extends ManagementTestSupport { BacklogTracerEventMessage event1 = events.get(0); assertEquals("bar", event1.getToNode()); - assertEquals(" <message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"org.apache.camel.converter.stream.ByteArrayInputStreamCache\">Bye World</body>\n" + " </message>", event1.getMessageAsXml()); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerTest.java b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerTest.java index 9d0ee97df6f..5fb94f7f15d 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/BacklogTracerTest.java @@ -75,14 +75,14 @@ public class BacklogTracerTest extends ManagementTestSupport { BacklogTracerEventMessage event1 = events.get(0); assertEquals("foo", event1.getToNode()); - assertEquals(" <message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Hello World</body>\n" + " </message>", event1.getMessageAsXml()); BacklogTracerEventMessage event2 = events.get(1); assertEquals("foo", event2.getToNode()); - assertEquals(" <message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Bye World</body>\n" + " </message>", event2.getMessageAsXml()); @@ -160,7 +160,7 @@ public class BacklogTracerTest extends ManagementTestSupport { BacklogTracerEventMessage event0 = events.get(0); assertEquals("route1", event0.getRouteId()); assertEquals(null, event0.getToNode()); - assertEquals(" <message exchangeId=\"" + fooExchanges.get(0).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + fooExchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Hello World</body>\n" + " </message>", event0.getMessageAsXml()); @@ -168,7 +168,7 @@ public class BacklogTracerTest extends ManagementTestSupport { BacklogTracerEventMessage event1 = events.get(1); assertEquals("route1", event1.getRouteId()); assertEquals("foo", event1.getToNode()); - assertEquals(" <message exchangeId=\"" + fooExchanges.get(0).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + fooExchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Hello World</body>\n" + " </message>", event1.getMessageAsXml()); @@ -176,7 +176,7 @@ public class BacklogTracerTest extends ManagementTestSupport { BacklogTracerEventMessage event2 = events.get(2); assertEquals("route1", event2.getRouteId()); assertEquals("bar", event2.getToNode()); - assertEquals(" <message exchangeId=\"" + barExchanges.get(0).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + barExchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Hello World</body>\n" + " </message>", event2.getMessageAsXml()); @@ -184,7 +184,7 @@ public class BacklogTracerTest extends ManagementTestSupport { BacklogTracerEventMessage event3 = events.get(4); assertEquals("route1", event3.getRouteId()); assertEquals(null, event3.getToNode()); - assertEquals(" <message exchangeId=\"" + fooExchanges.get(1).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + fooExchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Bye World</body>\n" + " </message>", event3.getMessageAsXml()); @@ -192,7 +192,7 @@ public class BacklogTracerTest extends ManagementTestSupport { BacklogTracerEventMessage event4 = events.get(5); assertEquals("route1", event4.getRouteId()); assertEquals("foo", event4.getToNode()); - assertEquals(" <message exchangeId=\"" + fooExchanges.get(1).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + fooExchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Bye World</body>\n" + " </message>", event3.getMessageAsXml()); @@ -200,7 +200,7 @@ public class BacklogTracerTest extends ManagementTestSupport { BacklogTracerEventMessage event5 = events.get(6); assertEquals("route1", event5.getRouteId()); assertEquals("bar", event5.getToNode()); - assertEquals(" <message exchangeId=\"" + barExchanges.get(1).getExchangeId() + "\">\n" + assertEquals(" <message exchangeId=\"" + barExchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\">\n" + " <body type=\"java.lang.String\">Bye World</body>\n" + " </message>", event4.getMessageAsXml()); diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlTest.java index cd7c9fad980..f1f21a9f21d 100644 --- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlTest.java +++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedBrowsableEndpointAsXmlTest.java @@ -66,24 +66,24 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport { assertNotNull(out); log.info(out); - assertEquals("<message exchangeId=\"" + exchanges.get(0).getExchangeId() - + "\">\n <body type=\"java.lang.String\"><foo>Camel &gt; Donkey</foo></body>\n</message>", + assertEquals("<message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <body type=\"java.lang.String\"><foo>Camel &gt; Donkey</foo></body>\n</message>", out); out = (String) mbeanServer.invoke(name, "browseMessageAsXml", new Object[] { 1, true }, new String[] { "java.lang.Integer", "java.lang.Boolean" }); assertNotNull(out); log.info(out); - assertEquals("<message exchangeId=\"" + exchanges.get(1).getExchangeId() - + "\">\n <body type=\"java.lang.String\">Camel > Donkey</body>\n</message>", + assertEquals("<message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <body type=\"java.lang.String\">Camel > Donkey</body>\n</message>", out); out = (String) mbeanServer.invoke(name, "browseMessageAsXml", new Object[] { 2, true }, new String[] { "java.lang.Integer", "java.lang.Boolean" }); assertNotNull(out); log.info(out); - assertEquals("<message exchangeId=\"" + exchanges.get(2).getExchangeId() - + "\">\n <headers>\n <header key=\"name\" type=\"java.lang.String\">Me & You</header>\n </headers>\n" + assertEquals("<message exchangeId=\"" + exchanges.get(2).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"name\" type=\"java.lang.String\">Me & You</header>\n </headers>\n" + " <body type=\"java.lang.String\"><foo>Camel &gt; Donkey</foo></body>\n</message>", out); @@ -91,7 +91,8 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport { new String[] { "java.lang.Integer", "java.lang.Boolean" }); assertNotNull(out); log.info(out); - assertEquals("<message exchangeId=\"" + exchanges.get(3).getExchangeId() + "\">\n <headers>\n" + assertEquals( + "<message exchangeId=\"" + exchanges.get(3).getExchangeId() + "\" exchangePattern=\"InOnly\">\n <headers>\n" + " <header key=\"title\" type=\"java.lang.String\"><title>Me &amp; You</title></header>\n </headers>\n" + " <body type=\"java.lang.String\"><foo>Camel &gt; Donkey</foo></body>\n</message>", out); @@ -100,8 +101,8 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport { new String[] { "java.lang.Integer", "java.lang.Boolean" }); assertNotNull(out); log.info(out); - assertEquals("<message exchangeId=\"" + exchanges.get(4).getExchangeId() - + "\">\n <headers>\n <header key=\"name\" type=\"java.lang.String\">Me & You</header>\n </headers>\n" + assertEquals("<message exchangeId=\"" + exchanges.get(4).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"name\" type=\"java.lang.String\">Me & You</header>\n </headers>\n" + " <body type=\"java.lang.String\">Camel > Donkey</body>\n</message>", out); @@ -109,8 +110,8 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport { new String[] { "java.lang.Integer", "java.lang.Boolean" }); assertNotNull(out); log.info(out); - assertEquals("<message exchangeId=\"" + exchanges.get(5).getExchangeId() - + "\">\n <headers>\n <header key=\"user\" type=\"java.lang.Boolean\">true</header>\n </headers>\n" + assertEquals("<message exchangeId=\"" + exchanges.get(5).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"user\" type=\"java.lang.Boolean\">true</header>\n </headers>\n" + " <body type=\"java.lang.Integer\">123</body>\n</message>", out); @@ -118,8 +119,8 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport { new String[] { "java.lang.Integer", "java.lang.Boolean" }); assertNotNull(out); log.info(out); - assertEquals("<message exchangeId=\"" + exchanges.get(6).getExchangeId() - + "\">\n <headers>\n <header key=\"title\" type=\"java.lang.String\">Camel rocks</header>\n" + assertEquals("<message exchangeId=\"" + exchanges.get(6).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"title\" type=\"java.lang.String\">Camel rocks</header>\n" + " <header key=\"uid\" type=\"java.lang.Integer\">123</header>\n" + " <header key=\"user\" type=\"java.lang.Boolean\">false</header>\n </headers>\n" + " <body type=\"java.lang.String\"><animal><name>Donkey</name><age>17</age></animal></body>\n</message>", @@ -146,16 +147,16 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport { assertNotNull(out); log.info(out); - assertEquals("<message exchangeId=\"" + exchanges.get(0).getExchangeId() - + "\">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">123</header>\n </headers>\n</message>", + assertEquals("<message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">123</header>\n </headers>\n</message>", out); out = (String) mbeanServer.invoke(name, "browseMessageAsXml", new Object[] { 1, false }, new String[] { "java.lang.Integer", "java.lang.Boolean" }); assertNotNull(out); log.info(out); - assertEquals("<message exchangeId=\"" + exchanges.get(1).getExchangeId() - + "\">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">456</header>\n </headers>\n</message>", + assertEquals("<message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">456</header>\n </headers>\n</message>", out); } @@ -179,10 +180,10 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport { assertNotNull(out); log.info(out); - assertEquals("<messages>\n<message exchangeId=\"" + exchanges.get(0).getExchangeId() - + "\">\n <body type=\"java.lang.String\">Hello World</body>\n</message>\n" - + "<message exchangeId=\"" + exchanges.get(1).getExchangeId() - + "\">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">456</header>\n </headers>\n" + assertEquals("<messages>\n<message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <body type=\"java.lang.String\">Hello World</body>\n</message>\n" + + "<message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">456</header>\n </headers>\n" + " <body type=\"java.lang.String\">Bye World</body>\n</message>\n</messages>", out); } @@ -207,10 +208,11 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport { assertNotNull(out); log.info(out); - assertEquals("<messages>\n<message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\">\n <headers>\n" + assertEquals("<messages>\n<message exchangeId=\"" + exchanges.get(0).getExchangeId() + + "\" exchangePattern=\"InOnly\">\n <headers>\n" + " <header key=\"foo\" type=\"java.lang.Integer\">123</header>\n </headers>\n</message>\n" - + "<message exchangeId=\"" + exchanges.get(1).getExchangeId() - + "\">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">456</header>\n </headers>\n" + + "<message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">456</header>\n </headers>\n" + "</message>\n</messages>", out); } @@ -236,10 +238,10 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport { assertNotNull(out); log.info(out); - assertEquals("<messages>\n<message exchangeId=\"" + exchanges.get(0).getExchangeId() - + "\">\n <body type=\"java.lang.String\">Hello World</body>\n</message>\n" - + "<message exchangeId=\"" + exchanges.get(1).getExchangeId() - + "\">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">456</header>\n </headers>\n" + assertEquals("<messages>\n<message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <body type=\"java.lang.String\">Hello World</body>\n</message>\n" + + "<message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">456</header>\n </headers>\n" + " <body type=\"java.lang.String\">Bye World</body>\n</message>\n</messages>", out); } @@ -265,10 +267,10 @@ public class ManagedBrowsableEndpointAsXmlTest extends ManagementTestSupport { assertNotNull(out); log.info(out); - assertEquals("<messages>\n<message exchangeId=\"" + exchanges.get(0).getExchangeId() - + "\">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">123</header>\n </headers>\n</message>\n" - + "<message exchangeId=\"" + exchanges.get(1).getExchangeId() - + "\">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">456</header>\n </headers>\n" + assertEquals("<messages>\n<message exchangeId=\"" + exchanges.get(0).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">123</header>\n </headers>\n</message>\n" + + "<message exchangeId=\"" + exchanges.get(1).getExchangeId() + "\" exchangePattern=\"InOnly\"" + + ">\n <headers>\n <header key=\"foo\" type=\"java.lang.Integer\">456</header>\n </headers>\n" + "</message>\n</messages>", out); }