(camel) branch main updated: fix(test): filter out OTel internal metrics in opentelemetry-metrics ITs (#21887)

[davsclaus]

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 9192d8b3c58d fix(test): filter out OTel internal metrics in 
opentelemetry-metrics ITs (#21887)
9192d8b3c58d is described below

commit 9192d8b3c58d35798780233ce901a1ca6253e1c4
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Mar 10 07:35:46 2026 +0100

    fix(test): filter out OTel internal metrics in opentelemetry-metrics ITs 
(#21887)
    
    OpenTelemetry 1.60+ exports internal SDK metrics (e.g.
    otel.sdk.metric_reader.collection.duration) via LoggingMetricExporter.
    The integration tests assumed only Camel metrics would appear in the
    log output, causing assertion failures. Filter out non-Camel metrics
    by checking for the "camel." prefix.
    
    Co-authored-by: Claude Opus 4.6 <nore...@anthropic.com>
---
 .../integration/eventnotifier/ExchangeEventNotifierAutoConfigIT.java  | 4 ++++
 .../integration/messagehistory/ManagedMessageHistoryAutoConfigIT.java | 4 ++++
 2 files changed, 8 insertions(+)

diff --git 
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/eventnotifier/ExchangeEventNotifierAutoConfigIT.java
 
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/eventnotifier/ExchangeEventNotifierAutoConfigIT.java
index 970ac6c9e3da..9e4f8264503c 100644
--- 
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/eventnotifier/ExchangeEventNotifierAutoConfigIT.java
+++ 
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/eventnotifier/ExchangeEventNotifierAutoConfigIT.java
@@ -110,6 +110,10 @@ public class ExchangeEventNotifierAutoConfigIT extends 
CamelTestSupport {
         for (LogRecord log : logs) {
             if (log.getParameters() != null && log.getParameters().length > 0) 
{
                 MetricData metricData = (MetricData) log.getParameters()[0];
+                // Skip non-Camel metrics (e.g. otel.sdk.* internal metrics 
added in OTel 1.60+)
+                if (!metricData.getName().startsWith("camel.")) {
+                    continue;
+                }
                 counts.compute(metricData.getName(), (k, v) -> v == null ? 1 : 
v + 1);
                 switch (metricData.getName()) {
                     case DEFAULT_CAMEL_EXCHANGE_ELAPSED_TIMER,
diff --git 
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/ManagedMessageHistoryAutoConfigIT.java
 
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/ManagedMessageHistoryAutoConfigIT.java
index c42aa9384d44..eecea58be6dd 100644
--- 
a/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/ManagedMessageHistoryAutoConfigIT.java
+++ 
b/components/camel-opentelemetry-metrics/src/test/java/org/apache/camel/opentelemetry/metrics/integration/messagehistory/ManagedMessageHistoryAutoConfigIT.java
@@ -105,6 +105,10 @@ public class ManagedMessageHistoryAutoConfigIT extends 
CamelTestSupport {
         for (LogRecord log : logs) {
             if (log.getParameters() != null && log.getParameters().length > 0) 
{
                 MetricData metricData = (MetricData) log.getParameters()[0];
+                // Skip non-Camel metrics (e.g. otel.sdk.* internal metrics 
added in OTel 1.60+)
+                if (!metricData.getName().startsWith("camel.")) {
+                    continue;
+                }
                 assertEquals(DEFAULT_CAMEL_MESSAGE_HISTORY_METER_NAME, 
metricData.getName());
 
                 assertPointDataForRouteId(metricData, "route1");