rest-cxf-opentelemetry: fix execution and update agent version

Author: mcarlett

rest-cxf-opentelemetry/pom.xml

@@ -33,7 +33,7 @@
 
     <properties>
         <category>CXF</category>
-        <opentelemetry-javaagent.version>2.7.0</opentelemetry-javaagent.version>
+        <opentelemetry-javaagent.version>2.19.0</opentelemetry-javaagent.version>
     </properties>
 
     <modules>

rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java

@@ -20,7 +20,6 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.bean.BeanConstants;
 import org.apache.camel.component.bean.validator.BeanValidationException;
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.model.dataformat.JsonLibrary;
@@ -48,8 +47,8 @@ public void configure() throws Exception {
                     "&providers=jaxrsProvider,openTelemetryProvider" +
                     "&loggingFeatureEnabled=true")
                 .to("log:camel-cxf-log?showAll=true")
-                .setHeader(BeanConstants.BEAN_METHOD_NAME, simple("${header.operationName}"))
-                .bean(EvenServiceImpl.class);
+                .toD("bean:org.apache.camel.example.springboot.cxf.otel.EvenServiceImpl" +
+                        "?method=${header.operationName}");
 
 
         from("direct:register").routeId("even-register")

rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java

@@ -20,7 +20,6 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.bean.BeanConstants;
 import org.apache.camel.component.bean.validator.BeanValidationException;
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.model.dataformat.JsonLibrary;
@@ -48,8 +47,8 @@ public void configure() throws Exception {
                     "&providers=jaxrsProvider,openTelemetryProvider" +
                     "&loggingFeatureEnabled=true")
                 .to("log:camel-cxf-log?showAll=true")
-                .setHeader(BeanConstants.BEAN_METHOD_NAME, simple("${header.operationName}"))
-                .bean(OddServiceImpl.class);
+                .toD("bean:org.apache.camel.example.springboot.cxf.otel.OddServiceImpl" +
+                        "?method=${header.operationName}");
 
 
         from("direct:register").routeId("odd-register")

rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java

@@ -18,7 +18,6 @@
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.bean.BeanConstants;
 import org.apache.camel.component.bean.validator.BeanValidationException;
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.component.minio.MinioConstants;
@@ -51,19 +50,23 @@ public void configure() throws Exception {
                     "&providers=jaxrsProvider,openTelemetryProvider" +
                     "&loggingFeatureEnabled=true")
                 .to("log:camel-cxf-log?showAll=true")
-                .setHeader(BeanConstants.BEAN_METHOD_NAME, simple("${header.operationName}"))
-                .bean(RandomServiceImpl.class);
+                .setHeader("methodName", simple("${header.operationName}"))
+                .toD("bean:org.apache.camel.example.springboot.cxf.otel.RandomServiceImpl?method=${header.methodName}");
 
 
         from("direct:play").routeId("play")
                 .loop(header("attempts"))
                     .process(exchange -> exchange.getIn().getHeaders().clear())
                     .setHeader(CxfConstants.HTTP_METHOD, constant("GET"))
                     .toD("cxfrs:{{service.random.url}}/services/api/generate")
+                    .convertBodyTo(RandomNumber.class)
+                    .marshal().json(JsonLibrary.Jackson)
                     .process(exchange -> exchange.getIn().getHeaders().clear())
                     .setHeader(CxfConstants.HTTP_METHOD, constant("POST"))
                     .setHeader(CxfConstants.CONTENT_TYPE, constant(MediaType.APPLICATION_JSON))
                     .toD("cxfrs:{{service.even.url}}/services/api/check")
+                    .convertBodyTo(RandomNumber.class)
+                    .marshal().json(JsonLibrary.Jackson)
                     .process(exchange -> exchange.getIn().getHeaders().clear())
                     .setHeader(CxfConstants.HTTP_METHOD, constant("POST"))
                     .setHeader(CxfConstants.CONTENT_TYPE, constant(MediaType.APPLICATION_JSON))
@@ -103,7 +106,7 @@ public void configure() throws Exception {
                 .toD("minio://{{bucket.name}}");
 
         from("direct:load-results").routeId("load-results")
-                .setVariable("results", () -> new Results())
+                .setVariable("results", Results::new)
                 .toD("minio://{{bucket.name}}?operation=listObjects")
                 .split(body())
                     .process(exchange -> {