This is an automated email from the ASF dual-hosted git repository. bvahdat 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 724c284b6a2 cleanup the camel-opentelemetry codebase a bit 724c284b6a2 is described below commit 724c284b6a208e4af281e669db6a5d0e2251c71c Author: Babak Vahdat <bvah...@apache.org> AuthorDate: Sun Dec 4 19:44:30 2022 +0100 cleanup the camel-opentelemetry codebase a bit --- .../apache/camel/opentelemetry/AttributeProcessor.java | 16 +++++++--------- .../opentelemetry/GetCorrelationContextProcessor.java | 16 +++++++--------- .../camel/opentelemetry/OpenTelemetrySpanAdapter.java | 2 +- .../opentelemetry/SetCorrelationContextProcessor.java | 16 +++++++--------- .../opentelemetry/propagators/OpenTelemetryGetter.java | 2 +- .../org/apache/camel/opentelemetry/ABCRouteTest.java | 6 +++--- .../opentelemetry/CamelOpenTelemetryTestSupport.java | 4 ++-- .../opentelemetry/ClientRecipientListRouteTest.java | 6 +++--- .../opentelemetry/CustomComponentNameRouteTest.java | 6 +++--- .../camel/opentelemetry/MulticastParallelRouteTest.java | 6 +++--- .../apache/camel/opentelemetry/MulticastRouteTest.java | 6 +++--- .../apache/camel/opentelemetry/RouteConcurrentTest.java | 8 ++++---- .../apache/camel/opentelemetry/SpanProcessorsTest.java | 6 +++--- .../camel/opentelemetry/TestSEDASpanDecorator.java | 2 +- .../org/apache/camel/opentelemetry/TwoServiceTest.java | 6 +++--- .../camel/opentelemetry/TwoServiceWithExcludeTest.java | 6 +++--- 16 files changed, 54 insertions(+), 60 deletions(-) diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java index 104e97a8e0c..6a111aeb694 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/AttributeProcessor.java @@ -42,10 +42,8 @@ public class AttributeProcessor extends AsyncProcessorSupport implements Traceab private String routeId; public AttributeProcessor(String tagName, Expression expression) { - this.attributeName = tagName; - this.expression = expression; - ObjectHelper.notNull(tagName, "tagName"); - ObjectHelper.notNull(expression, "expression"); + this.attributeName = ObjectHelper.notNull(tagName, "tagName"); + this.expression = ObjectHelper.notNull(expression, "expression"); } @Override @@ -69,11 +67,6 @@ public class AttributeProcessor extends AsyncProcessorSupport implements Traceab return true; } - @Override - public String toString() { - return id; - } - @Override public String getTraceLabel() { return "attribute[" + attributeName + ", " + expression + "]"; @@ -116,4 +109,9 @@ public class AttributeProcessor extends AsyncProcessorSupport implements Traceab protected void doStop() throws Exception { // noop } + + @Override + public String toString() { + return id; + } } diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java index 59a591b01dd..7b82aa52b1a 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/GetCorrelationContextProcessor.java @@ -35,10 +35,8 @@ public class GetCorrelationContextProcessor extends AsyncProcessorSupport implem private String routeId; public GetCorrelationContextProcessor(String keyName, String headerName) { - this.keyName = keyName; - this.headerName = headerName; - ObjectHelper.notNull(keyName, "keyName"); - ObjectHelper.notNull(headerName, "headerName"); + this.keyName = ObjectHelper.notNull(keyName, "keyName"); + this.headerName = ObjectHelper.notNull(headerName, "headerName"); } @Override @@ -61,11 +59,6 @@ public class GetCorrelationContextProcessor extends AsyncProcessorSupport implem return true; } - @Override - public String toString() { - return id; - } - @Override public String getTraceLabel() { return "getCorrelationContext[" + keyName + ", " + headerName + "]"; @@ -108,4 +101,9 @@ public class GetCorrelationContextProcessor extends AsyncProcessorSupport implem protected void doStop() throws Exception { // noop } + + @Override + public String toString() { + return id; + } } diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java index 48b2946d874..780b9ffe383 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java @@ -29,7 +29,7 @@ import org.apache.camel.tracing.Tag; public class OpenTelemetrySpanAdapter implements SpanAdapter { private static final String DEFAULT_EVENT_NAME = "log"; - private static EnumMap<Tag, String> tagMap = new EnumMap<>(Tag.class); + private static Map<Tag, String> tagMap = new EnumMap<>(Tag.class); static { tagMap.put(Tag.COMPONENT, "component"); diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java index 5b52a148769..28330c199f2 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java @@ -41,10 +41,8 @@ public class SetCorrelationContextProcessor extends AsyncProcessorSupport implem private final Expression expression; public SetCorrelationContextProcessor(String baggageName, Expression expression) { - this.baggageName = baggageName; - this.expression = expression; - ObjectHelper.notNull(baggageName, "baggageName"); - ObjectHelper.notNull(expression, "expression"); + this.baggageName = ObjectHelper.notNull(baggageName, "baggageName"); + this.expression = ObjectHelper.notNull(expression, "expression"); } @Override @@ -67,11 +65,6 @@ public class SetCorrelationContextProcessor extends AsyncProcessorSupport implem return true; } - @Override - public String toString() { - return id; - } - @Override public String getTraceLabel() { return "setCorrelationContext[" + baggageName + ", " + expression + "]"; @@ -114,4 +107,9 @@ public class SetCorrelationContextProcessor extends AsyncProcessorSupport implem protected void doStop() throws Exception { // noop } + + @Override + public String toString() { + return id; + } } diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetryGetter.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetryGetter.java index 02533760588..0dbd6ba501e 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetryGetter.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/propagators/OpenTelemetryGetter.java @@ -21,7 +21,7 @@ import org.apache.camel.tracing.ExtractAdapter; public class OpenTelemetryGetter implements TextMapGetter<ExtractAdapter> { - ExtractAdapter adapter; + private final ExtractAdapter adapter; public OpenTelemetryGetter(ExtractAdapter adapter) { this.adapter = adapter; diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java index eed6d4b0d9a..320f281d3f9 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -public class ABCRouteTest extends CamelOpenTelemetryTestSupport { +class ABCRouteTest extends CamelOpenTelemetryTestSupport { private static SpanTestData[] testdata = { new SpanTestData().setLabel("seda:b server").setUri("seda://b").setOperation("b") .setParentId(2).addLogMessage("routing at b"), @@ -31,12 +31,12 @@ public class ABCRouteTest extends CamelOpenTelemetryTestSupport { new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start") }; - public ABCRouteTest() { + ABCRouteTest() { super(testdata); } @Test - public void testRoute() { + void testRoute() { template.requestBody("direct:start", "Hello"); verify(); } diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java index 3508eb46a7a..f34a2382442 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java @@ -39,7 +39,7 @@ import org.apache.camel.tracing.SpanDecorator; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class CamelOpenTelemetryTestSupport extends CamelTestSupport { +class CamelOpenTelemetryTestSupport extends CamelTestSupport { static final AttributeKey<String> CAMEL_URI_KEY = AttributeKey.stringKey("camel-uri"); static final AttributeKey<String> COMPONENT_KEY = AttributeKey.stringKey("component"); @@ -53,7 +53,7 @@ public class CamelOpenTelemetryTestSupport extends CamelTestSupport { private OpenTelemetryTracer ottracer; private SdkTracerProvider tracerFactory; - public CamelOpenTelemetryTestSupport(SpanTestData[] testdata) { + CamelOpenTelemetryTestSupport(SpanTestData[] testdata) { this.testdata = testdata; } diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ClientRecipientListRouteTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ClientRecipientListRouteTest.java index 63945d11d4f..1fa8ff97fad 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ClientRecipientListRouteTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ClientRecipientListRouteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -public class ClientRecipientListRouteTest extends CamelOpenTelemetryTestSupport { +class ClientRecipientListRouteTest extends CamelOpenTelemetryTestSupport { private static SpanTestData[] testdata = { new SpanTestData().setLabel("seda:a server").setUri("seda://a").setOperation("a") @@ -32,12 +32,12 @@ public class ClientRecipientListRouteTest extends CamelOpenTelemetryTestSupport new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start") }; - public ClientRecipientListRouteTest() { + ClientRecipientListRouteTest() { super(testdata); } @Test - public void testRoute() { + void testRoute() { template.requestBody("direct:start", "Hello"); verify(); diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CustomComponentNameRouteTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CustomComponentNameRouteTest.java index cc8a860fdf4..27ddfdbd462 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CustomComponentNameRouteTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CustomComponentNameRouteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -public class CustomComponentNameRouteTest extends CamelOpenTelemetryTestSupport { +class CustomComponentNameRouteTest extends CamelOpenTelemetryTestSupport { private static SpanTestData[] testdata = { new SpanTestData().setLabel("myseda:b server").setUri("myseda://b").setOperation("b") @@ -32,12 +32,12 @@ public class CustomComponentNameRouteTest extends CamelOpenTelemetryTestSupport new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start") }; - public CustomComponentNameRouteTest() { + CustomComponentNameRouteTest() { super(testdata); } @Test - public void testRoute() { + void testRoute() { template.requestBody("direct:start", "Hello"); verify(); diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastParallelRouteTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastParallelRouteTest.java index 1ce73c5aeed..15fb907365e 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastParallelRouteTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastParallelRouteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -public class MulticastParallelRouteTest extends CamelOpenTelemetryTestSupport { +class MulticastParallelRouteTest extends CamelOpenTelemetryTestSupport { private static SpanTestData[] testdata = { new SpanTestData().setLabel("seda:b server").setUri("seda://b").setOperation("b") @@ -32,12 +32,12 @@ public class MulticastParallelRouteTest extends CamelOpenTelemetryTestSupport { new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start") }; - public MulticastParallelRouteTest() { + MulticastParallelRouteTest() { super(testdata); } @Test - public void testRoute() { + void testRoute() { template.requestBody("direct:start", "Hello"); verify(true); } diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastRouteTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastRouteTest.java index caa85e62bea..c464d593682 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastRouteTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastRouteTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -public class MulticastRouteTest extends CamelOpenTelemetryTestSupport { +class MulticastRouteTest extends CamelOpenTelemetryTestSupport { private static SpanTestData[] testdata = { new SpanTestData().setLabel("seda:b server").setUri("seda://b").setOperation("b") @@ -32,12 +32,12 @@ public class MulticastRouteTest extends CamelOpenTelemetryTestSupport { new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start") }; - public MulticastRouteTest() { + MulticastRouteTest() { super(testdata); } @Test - public void testRoute() { + void testRoute() { template.requestBody("direct:start", "Hello"); verify(); diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/RouteConcurrentTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/RouteConcurrentTest.java index 8e623e294fe..964932bdb95 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/RouteConcurrentTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/RouteConcurrentTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; -public class RouteConcurrentTest extends CamelOpenTelemetryTestSupport { +class RouteConcurrentTest extends CamelOpenTelemetryTestSupport { private static SpanTestData[] testdata = { new SpanTestData().setLabel("seda:foo server").setUri("seda://foo?concurrentConsumers=5").setOperation("foo"), @@ -33,12 +33,12 @@ public class RouteConcurrentTest extends CamelOpenTelemetryTestSupport { .setParentId(0) }; - public RouteConcurrentTest() { + RouteConcurrentTest() { super(testdata); } @Test - public void testSingleInvocationsOfRoute() { + void testSingleInvocationsOfRoute() { NotifyBuilder notify = new NotifyBuilder(context).whenDone(2).create(); template.sendBody("seda:foo", "Hello World"); @@ -49,7 +49,7 @@ public class RouteConcurrentTest extends CamelOpenTelemetryTestSupport { } @Test - public void testConcurrentInvocationsOfRoute() { + void testConcurrentInvocationsOfRoute() { NotifyBuilder notify = new NotifyBuilder(context).whenDone(10).create(); for (int i = 0; i < 5; i++) { diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java index ebc547fa875..cbe69b7035f 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import static org.apache.camel.language.simple.SimpleLanguage.simple; import static org.junit.jupiter.api.Assertions.assertEquals; -public class SpanProcessorsTest extends CamelOpenTelemetryTestSupport { +class SpanProcessorsTest extends CamelOpenTelemetryTestSupport { private static final SpanTestData[] TEST_DATA = { new SpanTestData().setLabel("seda:b server").setUri("seda://b").setOperation("b") @@ -37,12 +37,12 @@ public class SpanProcessorsTest extends CamelOpenTelemetryTestSupport { new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start") }; - public SpanProcessorsTest() { + SpanProcessorsTest() { super(TEST_DATA); } @Test - public void testRoute() { + void testRoute() { Exchange result = template.request("direct:start", exchange -> { exchange.getIn().setBody("Hello"); diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TestSEDASpanDecorator.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TestSEDASpanDecorator.java index 93cfb835f4b..c9597b97bdc 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TestSEDASpanDecorator.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TestSEDASpanDecorator.java @@ -21,7 +21,7 @@ import org.apache.camel.Exchange; import org.apache.camel.tracing.SpanAdapter; import org.apache.camel.tracing.decorators.SedaSpanDecorator; -public class TestSEDASpanDecorator extends SedaSpanDecorator { +class TestSEDASpanDecorator extends SedaSpanDecorator { @Override public void pre(SpanAdapter span, Exchange exchange, Endpoint endpoint) { diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceTest.java index 3500bf3b422..563a089ce41 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceTest.java @@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -public class TwoServiceTest extends CamelOpenTelemetryTestSupport { +class TwoServiceTest extends CamelOpenTelemetryTestSupport { private static SpanTestData[] testdata = { new SpanTestData().setLabel("ServiceB server").setUri("direct://ServiceB").setOperation("ServiceB") @@ -28,12 +28,12 @@ public class TwoServiceTest extends CamelOpenTelemetryTestSupport { new SpanTestData().setLabel("ServiceA server").setUri("direct://ServiceA").setOperation("ServiceA") }; - public TwoServiceTest() { + TwoServiceTest() { super(testdata); } @Test - public void testRoute() { + void testRoute() { template.requestBody("direct:ServiceA", "Hello"); verify(); diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceWithExcludeTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceWithExcludeTest.java index da3a506d89d..dc8fd800ca6 100644 --- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceWithExcludeTest.java +++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceWithExcludeTest.java @@ -23,13 +23,13 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.junit.jupiter.api.Test; -public class TwoServiceWithExcludeTest extends CamelOpenTelemetryTestSupport { +class TwoServiceWithExcludeTest extends CamelOpenTelemetryTestSupport { private static SpanTestData[] testdata = { new SpanTestData().setLabel("ServiceA server").setUri("direct://ServiceA").setOperation("ServiceA") }; - public TwoServiceWithExcludeTest() { + TwoServiceWithExcludeTest() { super(testdata); } @@ -39,7 +39,7 @@ public class TwoServiceWithExcludeTest extends CamelOpenTelemetryTestSupport { } @Test - public void testRoute() { + void testRoute() { template.requestBody("direct:ServiceA", "Hello"); verify();