This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 ee5a9e387b46 chore(components): otel metrics rename base test support
class
ee5a9e387b46 is described below
commit ee5a9e387b46e04fa4f91cee7db2d40970b38c02
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Thu Dec 18 11:02:01 2025 +0100
chore(components): otel metrics rename base test support class
---
.../metrics/eventnotifier/OpenTelemetryExchangeEventNotifier.java | 3 +--
.../metrics/eventnotifier/OpenTelemetryRouteEventNotifier.java | 3 +--
.../metrics/messagehistory/OpenTelemetryMessageHistoryFactory.java | 4 +---
...penTelemetryTest.java => AbstractOpenTelemetryTestSupport.java} | 2 +-
.../OpenTelemetryExchangeEventNotifierDynamicTest.java | 4 ++--
.../eventnotifier/OpenTelemetryExchangeEventNotifierTest.java | 4 ++--
.../OpenTelemetryExchangeEventNotifierTimeUnitTest.java | 4 ++--
.../metrics/eventnotifier/OpenTelemetryRouteEventNotifierTest.java | 4 ++--
.../integration/messagehistory/MessageHistoryPatternIT.java | 7 +++----
.../metrics/messagehistory/MessageHistoryExceptionRouteTest.java | 4 ++--
.../opentelemetry/metrics/messagehistory/MessageHistoryTest.java | 4 ++--
.../metrics/routepolicy/AbstractOpenTelemetryRoutePolicyTest.java | 4 ++--
12 files changed, 21 insertions(+), 26 deletions(-)
diff --git
a/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifier.java
b/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifier.java
index 73efc7a9e7dc..53e787cdec12 100644
---
a/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifier.java
+++
b/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifier.java
@@ -27,7 +27,6 @@ import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.metrics.LongHistogram;
import io.opentelemetry.api.metrics.Meter;
import io.opentelemetry.api.metrics.ObservableLongGauge;
-import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
@@ -45,7 +44,7 @@ import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.SimpleEventNotifierSupport;
-public class OpenTelemetryExchangeEventNotifier extends EventNotifierSupport
implements CamelContextAware {
+public class OpenTelemetryExchangeEventNotifier extends EventNotifierSupport {
private static final AtomicLong lastExchangeTimestampHolder = new
AtomicLong(0);
private final Class<ExchangeEvent> eventType = ExchangeEvent.class;
diff --git
a/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryRouteEventNotifier.java
b/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryRouteEventNotifier.java
index 7a7c92e52cdf..687f15bf0bcf 100644
---
a/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryRouteEventNotifier.java
+++
b/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryRouteEventNotifier.java
@@ -23,7 +23,6 @@ import io.opentelemetry.api.metrics.LongCounter;
import io.opentelemetry.api.metrics.LongUpDownCounter;
import io.opentelemetry.api.metrics.Meter;
import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.CamelEvent;
import org.apache.camel.spi.CamelEvent.RouteEvent;
@@ -36,7 +35,7 @@ import static
org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.EVEN
import static
org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.KIND_ATTRIBUTE;
import static
org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.KIND_ROUTE;
-public class OpenTelemetryRouteEventNotifier extends EventNotifierSupport
implements CamelContextAware {
+public class OpenTelemetryRouteEventNotifier extends EventNotifierSupport {
private final Class<RouteEvent> eventType = RouteEvent.class;
private Meter meter;
diff --git
a/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/messagehistory/OpenTelemetryMessageHistoryFactory.java
b/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/messagehistory/OpenTelemetryMessageHistoryFactory.java
index 30ec70a457f1..32d69fc9082e 100644
---
a/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/messagehistory/OpenTelemetryMessageHistoryFactory.java
+++
b/components/camel-opentelemetry-metrics/src/main/java/org/apache/camel/opentelemetry/metrics/messagehistory/OpenTelemetryMessageHistoryFactory.java
@@ -22,7 +22,6 @@ import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.metrics.LongHistogram;
import io.opentelemetry.api.metrics.Meter;
import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.MessageHistory;
@@ -30,14 +29,13 @@ import org.apache.camel.NamedNode;
import org.apache.camel.NonManagedService;
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.StaticService;
import org.apache.camel.spi.MessageHistoryFactory;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.PatternHelper;
import org.apache.camel.support.service.ServiceSupport;
public class OpenTelemetryMessageHistoryFactory extends ServiceSupport
- implements CamelContextAware, StaticService, NonManagedService,
MessageHistoryFactory {
+ implements NonManagedService, MessageHistoryFactory {
private CamelContext camelContext;
private Meter meter;
diff --git
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/AbstractOpenTelemetryTest.java
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/AbstractOpenTelemetryTestSupport.java
similarity index 98%
rename from
components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/AbstractOpenTelemetryTest.java
rename to
components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/AbstractOpenTelemetryTestSupport.java
index 9dcda85227f3..c6fe0f9b25f0 100644
---
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/AbstractOpenTelemetryTest.java
+++
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/AbstractOpenTelemetryTestSupport.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class AbstractOpenTelemetryTest extends CamelTestSupport {
+public class AbstractOpenTelemetryTestSupport extends CamelTestSupport {
public final CamelOpenTelemetryExtension otelExtension =
CamelOpenTelemetryExtension.create();
diff --git
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierDynamicTest.java
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierDynamicTest.java
index d91f575e098c..21d7d254dbbf 100644
---
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierDynamicTest.java
+++
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierDynamicTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTest;
+import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTestSupport;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.DefaultComponent;
import org.apache.camel.support.DefaultEndpoint;
@@ -44,7 +44,7 @@ import static
org.junit.jupiter.api.Assertions.assertInstanceOf;
/**
* Test OpenTelemetryExchangeEventNotifier with dynamic endpoint URIs.
*/
-public class OpenTelemetryExchangeEventNotifierDynamicTest extends
AbstractOpenTelemetryTest {
+public class OpenTelemetryExchangeEventNotifierDynamicTest extends
AbstractOpenTelemetryTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierTest.java
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierTest.java
index 332b96ea3203..81e0b540f9fc 100644
---
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierTest.java
+++
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierTest.java
@@ -29,7 +29,7 @@ import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTest;
+import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTestSupport;
import org.apache.camel.support.ExpressionAdapter;
import org.awaitility.Awaitility;
import org.awaitility.core.ThrowingRunnable;
@@ -50,7 +50,7 @@ import static
org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class OpenTelemetryExchangeEventNotifierTest extends
AbstractOpenTelemetryTest {
+public class OpenTelemetryExchangeEventNotifierTest extends
AbstractOpenTelemetryTestSupport {
private static final Long DELAY = 250L;
private static final Long TOLERANCE = 100L;
diff --git
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierTimeUnitTest.java
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierTimeUnitTest.java
index 6f9759ab4bcf..a2a2c0f01bb3 100644
---
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierTimeUnitTest.java
+++
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryExchangeEventNotifierTimeUnitTest.java
@@ -26,7 +26,7 @@ import io.opentelemetry.sdk.metrics.data.PointData;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTest;
+import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTestSupport;
import org.junit.jupiter.api.Test;
import static
org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.DEFAULT_CAMEL_EXCHANGE_ELAPSED_TIMER;
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class OpenTelemetryExchangeEventNotifierTimeUnitTest extends
AbstractOpenTelemetryTest {
+public class OpenTelemetryExchangeEventNotifierTimeUnitTest extends
AbstractOpenTelemetryTestSupport {
private static final Long DELAY = 1100L;
diff --git
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryRouteEventNotifierTest.java
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryRouteEventNotifierTest.java
index 8807ebaabc1c..eb72aa25b878 100644
---
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryRouteEventNotifierTest.java
+++
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/eventnotifier/OpenTelemetryRouteEventNotifierTest.java
@@ -22,7 +22,7 @@ import io.opentelemetry.sdk.metrics.data.LongPointData;
import io.opentelemetry.sdk.metrics.data.PointData;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTest;
+import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTestSupport;
import org.junit.jupiter.api.Test;
import static
org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.DEFAULT_CAMEL_ROUTES_ADDED;
@@ -30,7 +30,7 @@ import static
org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.DEFA
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-public class OpenTelemetryRouteEventNotifierTest extends
AbstractOpenTelemetryTest {
+public class OpenTelemetryRouteEventNotifierTest extends
AbstractOpenTelemetryTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/MessageHistoryPatternIT.java
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/MessageHistoryPatternIT.java
index efbc49b75e5f..65fed267399f 100644
---
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/MessageHistoryPatternIT.java
+++
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/MessageHistoryPatternIT.java
@@ -20,10 +20,9 @@ import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.sdk.metrics.data.HistogramPointData;
import io.opentelemetry.sdk.metrics.data.PointData;
import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTest;
+import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTestSupport;
import
org.apache.camel.opentelemetry.metrics.messagehistory.OpenTelemetryMessageHistoryFactory;
import org.junit.jupiter.api.Test;
@@ -32,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class MessageHistoryPatternIT extends AbstractOpenTelemetryTest {
+public class MessageHistoryPatternIT extends AbstractOpenTelemetryTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
@@ -53,7 +52,7 @@ public class MessageHistoryPatternIT extends
AbstractOpenTelemetryTest {
getMockEndpoint("mock:bar").expectedMessageCount(count);
for (int i = 0; i < count; i++) {
- Exchange out = template.request("direct:start", e -> {
+ template.request("direct:start", e -> {
e.getMessage().setBody("Hello World");
});
}
diff --git
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/messagehistory/MessageHistoryExceptionRouteTest.java
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/messagehistory/MessageHistoryExceptionRouteTest.java
index f32aa99791b4..b58bcbeb45c0 100644
---
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/messagehistory/MessageHistoryExceptionRouteTest.java
+++
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/messagehistory/MessageHistoryExceptionRouteTest.java
@@ -24,7 +24,7 @@ import io.opentelemetry.sdk.metrics.data.PointData;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTest;
+import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTestSupport;
import org.junit.jupiter.api.Test;
import static
org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.DEFAULT_CAMEL_MESSAGE_HISTORY_METER_NAME;
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class MessageHistoryExceptionRouteTest extends
AbstractOpenTelemetryTest {
+public class MessageHistoryExceptionRouteTest extends
AbstractOpenTelemetryTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/messagehistory/MessageHistoryTest.java
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/messagehistory/MessageHistoryTest.java
index 99b699aa520b..c821e7ad0e8d 100644
---
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/messagehistory/MessageHistoryTest.java
+++
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/messagehistory/MessageHistoryTest.java
@@ -22,7 +22,7 @@ import io.opentelemetry.sdk.metrics.data.PointData;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTest;
+import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTestSupport;
import org.junit.jupiter.api.Test;
import static
org.apache.camel.opentelemetry.metrics.OpenTelemetryConstants.DEFAULT_CAMEL_MESSAGE_HISTORY_METER_NAME;
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class MessageHistoryTest extends AbstractOpenTelemetryTest {
+public class MessageHistoryTest extends AbstractOpenTelemetryTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/routepolicy/AbstractOpenTelemetryRoutePolicyTest.java
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/routepolicy/AbstractOpenTelemetryRoutePolicyTest.java
index 0eab8680b06d..47ef79d428f7 100644
---
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/routepolicy/AbstractOpenTelemetryRoutePolicyTest.java
+++
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/routepolicy/AbstractOpenTelemetryRoutePolicyTest.java
@@ -21,12 +21,12 @@ import java.util.List;
import io.opentelemetry.sdk.metrics.data.LongPointData;
import io.opentelemetry.sdk.metrics.data.PointData;
import org.apache.camel.CamelContext;
-import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTest;
+import org.apache.camel.opentelemetry.metrics.AbstractOpenTelemetryTestSupport;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-public abstract class AbstractOpenTelemetryRoutePolicyTest extends
AbstractOpenTelemetryTest {
+public abstract class AbstractOpenTelemetryRoutePolicyTest extends
AbstractOpenTelemetryTestSupport {
protected OpenTelemetryRoutePolicyFactory
createOpenTelemetryRoutePolicyFactory() {
OpenTelemetryRoutePolicyFactory factory = new
OpenTelemetryRoutePolicyFactory();
