(camel-karaf) branch main updated: fix(#665): Fix camel-elasticsearch feature by adding missing opentelemetry-common bundle (#683)

[jbonofre]

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

jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new 594af1720 fix(#665): Fix camel-elasticsearch feature by adding missing 
opentelemetry-common bundle (#683)
594af1720 is described below

commit 594af1720eff875cca6a5473dacbee0f2f7566d8
Author: JB Onofré <jbono...@apache.org>
AuthorDate: Thu Mar 12 05:54:39 2026 +0100

    fix(#665): Fix camel-elasticsearch feature by adding missing 
opentelemetry-common bundle (#683)
---
 features/src/main/feature/camel-features.xml                       | 3 ++-
 .../apache/karaf/camel/test/CamelElasticsearchRouteSupplier.java   | 7 +++----
 .../java/org/apache/karaf/camel/itest/CamelElasticsearchITest.java | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/features/src/main/feature/camel-features.xml 
b/features/src/main/feature/camel-features.xml
index ee0f5b703..715af4656 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1156,11 +1156,12 @@
         <bundle 
dependency='true'>mvn:jakarta.json/jakarta.json-api/${jakarta-json-api-version}</bundle>
         <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-api/${opentelemetry-version}</bundle>
         <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-context/${opentelemetry-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-common/${opentelemetry-version}</bundle>
         <bundle 
dependency='true'>wrap:mvn:io.opentelemetry.semconv/opentelemetry-semconv/1.37.0</bundle>
         <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}</bundle>
-        <bundle 
dependency='true'>mvn:jakarta.json/jakarta.json-api/${jakarta-json-api-version}</bundle>
         <bundle 
dependency='true'>mvn:jakarta.json.bind/jakarta.json.bind-api/${jakarta-json-bind-api-version}</bundle>
         <bundle 
dependency='true'>mvn:org.eclipse/yasson/${yasson-version}</bundle>
+        <bundle 
dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jakarta-jsonp/${jackson2-version}</bundle>
         <bundle 
dependency='true'>wrap:mvn:co.elastic.clients/elasticsearch-java/${elasticsearch-java-client-version}$overwrite=merge&amp;Import-Package=io.opentelemetry*;resolution:=optional,*</bundle>
         <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/${elasticsearch-java-client-version}</bundle>
         <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/${elasticsearch-java-client-sniffer-version}</bundle>
diff --git 
a/tests/features/camel-elasticsearch/src/main/java/org/apache/karaf/camel/test/CamelElasticsearchRouteSupplier.java
 
b/tests/features/camel-elasticsearch/src/main/java/org/apache/karaf/camel/test/CamelElasticsearchRouteSupplier.java
index c6d2e2877..eadf6b68f 100644
--- 
a/tests/features/camel-elasticsearch/src/main/java/org/apache/karaf/camel/test/CamelElasticsearchRouteSupplier.java
+++ 
b/tests/features/camel-elasticsearch/src/main/java/org/apache/karaf/camel/test/CamelElasticsearchRouteSupplier.java
@@ -44,9 +44,9 @@ public class CamelElasticsearchRouteSupplier extends 
AbstractCamelSingleFeatureR
 
     @Override
     protected void configureProducer(RouteBuilder builder, RouteDefinition 
producerRoute) {
-        //to add the mock endpoint at the end of the route, call 
configureConsumer
         configureConsumer(
-            
producerRoute.toF("elasticsearch://elasticsearch?operation=Exists&indexName=%s",
 INDEX_NAME)
+            producerRoute
+                    
.toF("elasticsearch://elasticsearch?operation=Exists&indexName=%s", INDEX_NAME)
                     .log("Index exist: ${body}")
                     .setBody(builder.simple("""
                             {"date": "${header.CamelTimerFiredTime}", 
"someKey": "someValue"}
@@ -70,11 +70,10 @@ public class CamelElasticsearchRouteSupplier extends 
AbstractCamelSingleFeatureR
                     .log("Delete doc: ${body}")
                     .setBody(builder.constant("OK"))
         );
-
     }
 
     @Override
     protected boolean consumerEnabled() {
         return false;
     }
-}
\ No newline at end of file
+}
diff --git 
a/tests/features/camel-elasticsearch/src/test/java/org/apache/karaf/camel/itest/CamelElasticsearchITest.java
 
b/tests/features/camel-elasticsearch/src/test/java/org/apache/karaf/camel/itest/CamelElasticsearchITest.java
index aad860f16..7dae4c2aa 100644
--- 
a/tests/features/camel-elasticsearch/src/test/java/org/apache/karaf/camel/itest/CamelElasticsearchITest.java
+++ 
b/tests/features/camel-elasticsearch/src/test/java/org/apache/karaf/camel/itest/CamelElasticsearchITest.java
@@ -23,7 +23,6 @@ import org.apache.karaf.camel.itests.CamelKarafTestHint;
 import org.apache.karaf.camel.itests.GenericContainerResource;
 import org.apache.karaf.camel.itests.PaxExamWithExternalResource;
 import org.apache.karaf.camel.itests.TemporaryFile;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -41,7 +40,6 @@ public class CamelElasticsearchITest extends 
AbstractCamelSingleFeatureResultMoc
         mock.expectedBodiesReceived("OK");
     }
 
-    @Ignore("TODO: this test is run forever, need a fix")
     @Test
     public void testResultMock() throws Exception {
         assertMockEndpointsSatisfied();