You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2026/03/09 17:21:23 UTC

(camel) branch fix/otel-metrics-tests created (now befeebf8baaf)

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a change to branch fix/otel-metrics-tests
in repository https://gitbox.apache.org/repos/asf/camel.git


      at befeebf8baaf fix(test): filter out OTel internal metrics in opentelemetry-metrics ITs

This branch includes the following new commits:

     new befeebf8baaf fix(test): filter out OTel internal metrics in opentelemetry-metrics ITs

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(camel) 01/01: fix(test): filter out OTel internal metrics in opentelemetry-metrics ITs

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch fix/otel-metrics-tests
in repository https://gitbox.apache.org/repos/asf/camel.git

commit befeebf8baaf20d5202ac8dce80619a9069a3541
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 9 18:21:11 2026 +0100

    fix(test): filter out OTel internal metrics in opentelemetry-metrics ITs
    
    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 <no...@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");