diff --git a/rest-cxf-opentelemetry/pom.xml b/rest-cxf-opentelemetry/pom.xml index 9d564a305..4d0244165 100644 --- a/rest-cxf-opentelemetry/pom.xml +++ b/rest-cxf-opentelemetry/pom.xml @@ -98,7 +98,7 @@ org.apache.camel.springboot - camel-opentelemetry-starter + camel-opentelemetry2-starter diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java b/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java index 15b7d453f..8fa6b692c 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java +++ b/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java @@ -16,14 +16,14 @@ */ package org.apache.camel.example.springboot.cxf.otel; -import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry; +import org.apache.camel.opentelemetry2.starter.CamelOpenTelemetry2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; // CHECKSTYLE:OFF @SpringBootApplication -@CamelOpenTelemetry +@CamelOpenTelemetry2 public class Application { /** diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java b/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java index 255a9e6c0..528a79b57 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java +++ b/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java @@ -48,7 +48,7 @@ public void configure() throws Exception { "&loggingFeatureEnabled=true") .to("log:camel-cxf-log?showAll=true") .toD("bean:org.apache.camel.example.springboot.cxf.otel.EvenServiceImpl" + - "?method=${header.operationName}"); + "?method=${header.CamelCxfOperationName}"); from("direct:register").routeId("even-register") diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java b/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java index 15b7d453f..8fa6b692c 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java +++ b/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java @@ -16,14 +16,14 @@ */ package org.apache.camel.example.springboot.cxf.otel; -import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry; +import org.apache.camel.opentelemetry2.starter.CamelOpenTelemetry2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; // CHECKSTYLE:OFF @SpringBootApplication -@CamelOpenTelemetry +@CamelOpenTelemetry2 public class Application { /** diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java b/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java index 26ccf0708..e24e89dbf 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java +++ b/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java @@ -48,7 +48,7 @@ public void configure() throws Exception { "&loggingFeatureEnabled=true") .to("log:camel-cxf-log?showAll=true") .toD("bean:org.apache.camel.example.springboot.cxf.otel.OddServiceImpl" + - "?method=${header.operationName}"); + "?method=${header.CamelCxfOperationName}"); from("direct:register").routeId("odd-register") diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java index 15b7d453f..8fa6b692c 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java +++ b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/Application.java @@ -16,14 +16,14 @@ */ package org.apache.camel.example.springboot.cxf.otel; -import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry; +import org.apache.camel.opentelemetry2.starter.CamelOpenTelemetry2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; // CHECKSTYLE:OFF @SpringBootApplication -@CamelOpenTelemetry +@CamelOpenTelemetry2 public class Application { /** diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java index b1a09e761..86cd56157 100644 --- a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java +++ b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java @@ -50,7 +50,7 @@ public void configure() throws Exception { "&providers=jaxrsProvider,openTelemetryProvider" + "&loggingFeatureEnabled=true") .to("log:camel-cxf-log?showAll=true") - .setHeader("methodName", simple("${header.operationName}")) + .setHeader("methodName", simple("${header.CamelCxfOperationName}")) .toD("bean:org.apache.camel.example.springboot.cxf.otel.RandomServiceImpl?method=${header.methodName}");