Skip to content

Commit 69cd0ee

Browse files
committed
chore: upgrade opentelemetry example to camel-opentelemetry2
Migrate the opentelemetry example from the deprecated camel-opentelemetry to camel-opentelemetry2. Changes: - Replace camel-opentelemetry-starter with camel-opentelemetry2-starter - Replace @CamelOpenTelemetry with @CamelOpenTelemetry2 - Fix Kafka broker URLs for host-to-Docker connectivity - Remove stale/unused properties (opentracing, jaeger, etc.) Note: the async (Kafka) trace context propagation is currently broken in camel-opentelemetry2 due to a missing byte[] header handling in camel-telemetry's AbstractMessagingSpanDecorator. A fix has been proposed in Apache Camel.
1 parent 5a27d3c commit 69cd0ee

13 files changed

Lines changed: 32 additions & 37 deletions

File tree

opentelemetry/CarBooking/pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<description>An example showing how to use Camel with OpenTelemetry</description>
3333

3434
<properties>
35-
<io.opentracing.contrib.version>3.3.1</io.opentracing.contrib.version>
3635
<opentelemetry-agent.version>1.25.1</opentelemetry-agent.version>
3736
</properties>
3837

@@ -88,7 +87,7 @@
8887
</dependency>
8988
<dependency>
9089
<groupId>org.apache.camel.springboot</groupId>
91-
<artifactId>camel-jackson3-starter</artifactId>
90+
<artifactId>camel-jackson3-starter</artifactId>
9291
</dependency>
9392
<dependency>
9493
<groupId>org.apache.camel.springboot</groupId>
@@ -119,7 +118,7 @@
119118
<!-- OpenTelemetry -->
120119
<dependency>
121120
<groupId>org.apache.camel.springboot</groupId>
122-
<artifactId>camel-opentelemetry-starter</artifactId>
121+
<artifactId>camel-opentelemetry2-starter</artifactId>
123122

124123
</dependency>
125124

@@ -168,4 +167,4 @@
168167
</plugin>
169168
</plugins>
170169
</build>
171-
</project>
170+
</project>

opentelemetry/CarBooking/src/main/java/com/example/demo/DemoApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
*/
1717
package com.example.demo;
1818

19-
import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry;
19+
import org.apache.camel.opentelemetry2.starter.CamelOpenTelemetry2;
2020
import org.springframework.boot.SpringApplication;
2121
import org.springframework.boot.autoconfigure.SpringBootApplication;
2222

23-
@CamelOpenTelemetry
23+
@CamelOpenTelemetry2
2424
@SpringBootApplication
2525
public class DemoApplication {
2626

opentelemetry/CarBooking/src/main/java/com/example/demo/MySimpleCamelRouter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ public void configure() throws Exception {
3939
.unmarshal().json(JsonLibrary.Jackson);
4040

4141
// kafka based
42-
from("kafka:car_input?brokers=kafka:9092").routeId("bookCar-kafka")
42+
from("kafka:car_input?brokers=localhost:9092").routeId("bookCar-kafka")
4343
.log(LoggingLevel.INFO, "New book car request via Kafka topic")
4444
.bean(new AvailableCars(),"getAvailableCar")
45-
.to("kafka:car_output?brokers=kafka:9092");
45+
.to("kafka:car_output?brokers=localhost:9092");
4646

4747
}
4848
}

opentelemetry/FlightBooking/pom.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
<description>An example showing how to use Camel with OpenTelemetry</description>
3232

3333
<properties>
34-
<java.version>11</java.version>
35-
<camel.version>3.14.1</camel.version>
36-
<jaeger.version>1.6.0</jaeger.version>
37-
<io.opentracing.contrib.version>3.3.1</io.opentracing.contrib.version>
3834
<opentelemetry-agent.version>1.25.1</opentelemetry-agent.version>
3935
</properties>
4036

@@ -87,7 +83,7 @@
8783
</dependency>
8884
<dependency>
8985
<groupId>org.apache.camel.springboot</groupId>
90-
<artifactId>camel-jackson3-starter</artifactId>
86+
<artifactId>camel-jackson3-starter</artifactId>
9187
</dependency>
9288
<dependency>
9389
<groupId>org.apache.camel.springboot</groupId>
@@ -113,7 +109,7 @@
113109
<!-- OpenTelemetry -->
114110
<dependency>
115111
<groupId>org.apache.camel.springboot</groupId>
116-
<artifactId>camel-opentelemetry-starter</artifactId>
112+
<artifactId>camel-opentelemetry2-starter</artifactId>
117113
</dependency>
118114

119115
<!-- Testing -->

opentelemetry/FlightBooking/src/main/java/com/example/demo/DemoApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
*/
1717
package com.example.demo;
1818

19+
import org.apache.camel.opentelemetry2.starter.CamelOpenTelemetry2;
1920
import org.springframework.boot.SpringApplication;
2021
import org.springframework.boot.autoconfigure.SpringBootApplication;
21-
import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry;
2222

23-
@CamelOpenTelemetry
23+
@CamelOpenTelemetry2
2424
@SpringBootApplication
2525
public class DemoApplication {
2626

opentelemetry/FlightBooking/src/main/java/com/example/demo/MySimpleCamelRouter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ public void configure() throws Exception {
4040
.unmarshal().json(JsonLibrary.Jackson);
4141

4242
// kafka based
43-
from("kafka:flight_input?brokers=kafka:9092").routeId("bookFlight-kafka")
43+
from("kafka:flight_input?brokers=localhost:9092").routeId("bookFlight-kafka")
4444
.log(LoggingLevel.INFO, "New book flight request via Kafka topic")
4545
.bean(new AvailableFlights(),"getAvailableFlight")
46-
.to("kafka:flight_output?brokers=kafka:9092");
46+
.to("kafka:flight_output?brokers=localhost:9092");
4747

4848
}
4949
}

opentelemetry/HotelBooking/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<description>An example showing how to use Camel with OpenTelemetry</description>
3333

3434
<properties>
35-
<io.opentracing.contrib.version>3.3.1</io.opentracing.contrib.version>
3635
<opentelemetry-agent.version>1.25.1</opentelemetry-agent.version>
3736
</properties>
3837

@@ -85,7 +84,7 @@
8584
</dependency>
8685
<dependency>
8786
<groupId>org.apache.camel.springboot</groupId>
88-
<artifactId>camel-jackson3-starter</artifactId>
87+
<artifactId>camel-jackson3-starter</artifactId>
8988
</dependency>
9089
<dependency>
9190
<groupId>org.apache.camel.springboot</groupId>
@@ -111,7 +110,7 @@
111110
<!-- OpenTelemetry -->
112111
<dependency>
113112
<groupId>org.apache.camel.springboot</groupId>
114-
<artifactId>camel-opentelemetry-starter</artifactId>
113+
<artifactId>camel-opentelemetry2-starter</artifactId>
115114
</dependency>
116115

117116
<!-- Testing -->

opentelemetry/HotelBooking/src/main/java/com/example/demo/DemoApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
*/
1717
package com.example.demo;
1818

19+
import org.apache.camel.opentelemetry2.starter.CamelOpenTelemetry2;
1920
import org.springframework.boot.SpringApplication;
2021
import org.springframework.boot.autoconfigure.SpringBootApplication;
21-
import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry;
2222

23-
@CamelOpenTelemetry
23+
@CamelOpenTelemetry2
2424
@SpringBootApplication
2525
public class DemoApplication {
2626

opentelemetry/HotelBooking/src/main/java/com/example/demo/MySimpleCamelRouter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public void configure() throws Exception {
3939
.unmarshal().json(JsonLibrary.Jackson);
4040

4141
// kafka based
42-
from("kafka:hotel_input?brokers=kafka:9092").routeId("bookHotel-kafka")
42+
from("kafka:hotel_input?brokers=localhost:9092").routeId("bookHotel-kafka")
4343
.log(LoggingLevel.INFO, "New book hotel request via Kafka topic")
4444
.bean(new AvailableHotels(),"getAvailableHotel")
45-
.to("kafka:hotel_output?brokers=kafka:9092");
45+
.to("kafka:hotel_output?brokers=localhost:9092");
4646
}
4747
}

opentelemetry/TripBooking/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<description>An example showing how to use Camel with OpenTelemetry</description>
3333

3434
<properties>
35-
<io.opentracing.contrib.version>3.3.1</io.opentracing.contrib.version>
3635
<opentelemetry-agent.version>1.25.1</opentelemetry-agent.version>
3736
</properties>
3837

@@ -81,7 +80,7 @@
8180
</dependency>
8281
<dependency>
8382
<groupId>org.apache.camel.springboot</groupId>
84-
<artifactId>camel-jackson3-starter</artifactId>
83+
<artifactId>camel-jackson3-starter</artifactId>
8584
</dependency>
8685
<dependency>
8786
<groupId>org.apache.camel.springboot</groupId>
@@ -111,7 +110,7 @@
111110
<!-- OpenTelemetry -->
112111
<dependency>
113112
<groupId>org.apache.camel.springboot</groupId>
114-
<artifactId>camel-opentelemetry-starter</artifactId>
113+
<artifactId>camel-opentelemetry2-starter</artifactId>
115114
</dependency>
116115

117116
<!-- Testing -->

0 commit comments

Comments
 (0)