Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions opentelemetry/CarBooking/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<description>An example showing how to use Camel with OpenTelemetry</description>

<properties>
<io.opentracing.contrib.version>3.3.1</io.opentracing.contrib.version>
<opentelemetry-agent.version>1.25.1</opentelemetry-agent.version>
</properties>

Expand Down Expand Up @@ -88,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jackson3-starter</artifactId>
<artifactId>camel-jackson3-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
Expand Down Expand Up @@ -119,7 +118,7 @@
<!-- OpenTelemetry -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-opentelemetry-starter</artifactId>
<artifactId>camel-opentelemetry2-starter</artifactId>

</dependency>

Expand Down Expand Up @@ -168,4 +167,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
*/
package com.example.demo;

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;

@CamelOpenTelemetry
@CamelOpenTelemetry2
@SpringBootApplication
public class DemoApplication {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ public void configure() throws Exception {
.unmarshal().json(JsonLibrary.Jackson);

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

}
}
8 changes: 2 additions & 6 deletions opentelemetry/FlightBooking/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@
<description>An example showing how to use Camel with OpenTelemetry</description>

<properties>
<java.version>11</java.version>
<camel.version>3.14.1</camel.version>
<jaeger.version>1.6.0</jaeger.version>
<io.opentracing.contrib.version>3.3.1</io.opentracing.contrib.version>
<opentelemetry-agent.version>1.25.1</opentelemetry-agent.version>
</properties>

Expand Down Expand Up @@ -87,7 +83,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jackson3-starter</artifactId>
<artifactId>camel-jackson3-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
Expand All @@ -113,7 +109,7 @@
<!-- OpenTelemetry -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-opentelemetry-starter</artifactId>
<artifactId>camel-opentelemetry2-starter</artifactId>
</dependency>

<!-- Testing -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
*/
package com.example.demo;

import org.apache.camel.opentelemetry2.starter.CamelOpenTelemetry2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry;

@CamelOpenTelemetry
@CamelOpenTelemetry2
@SpringBootApplication
public class DemoApplication {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public void configure() throws Exception {
.unmarshal().json(JsonLibrary.Jackson);

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

}
}
5 changes: 2 additions & 3 deletions opentelemetry/HotelBooking/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<description>An example showing how to use Camel with OpenTelemetry</description>

<properties>
<io.opentracing.contrib.version>3.3.1</io.opentracing.contrib.version>
<opentelemetry-agent.version>1.25.1</opentelemetry-agent.version>
</properties>

Expand Down Expand Up @@ -85,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jackson3-starter</artifactId>
<artifactId>camel-jackson3-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
Expand All @@ -111,7 +110,7 @@
<!-- OpenTelemetry -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-opentelemetry-starter</artifactId>
<artifactId>camel-opentelemetry2-starter</artifactId>
</dependency>

<!-- Testing -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
*/
package com.example.demo;

import org.apache.camel.opentelemetry2.starter.CamelOpenTelemetry2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry;

@CamelOpenTelemetry
@CamelOpenTelemetry2
@SpringBootApplication
public class DemoApplication {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public void configure() throws Exception {
.unmarshal().json(JsonLibrary.Jackson);

// kafka based
from("kafka:hotel_input?brokers=kafka:9092").routeId("bookHotel-kafka")
from("kafka:hotel_input?brokers=localhost:9092").routeId("bookHotel-kafka")
.log(LoggingLevel.INFO, "New book hotel request via Kafka topic")
.bean(new AvailableHotels(),"getAvailableHotel")
.to("kafka:hotel_output?brokers=kafka:9092");
.to("kafka:hotel_output?brokers=localhost:9092");
}
}
5 changes: 2 additions & 3 deletions opentelemetry/TripBooking/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<description>An example showing how to use Camel with OpenTelemetry</description>

<properties>
<io.opentracing.contrib.version>3.3.1</io.opentracing.contrib.version>
<opentelemetry-agent.version>1.25.1</opentelemetry-agent.version>
</properties>

Expand Down Expand Up @@ -81,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jackson3-starter</artifactId>
<artifactId>camel-jackson3-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
Expand Down Expand Up @@ -111,7 +110,7 @@
<!-- OpenTelemetry -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-opentelemetry-starter</artifactId>
<artifactId>camel-opentelemetry2-starter</artifactId>
</dependency>

<!-- Testing -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
*/
package com.example.demo;

import org.apache.camel.opentelemetry2.starter.CamelOpenTelemetry2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.apache.camel.opentelemetry.starter.CamelOpenTelemetry;

@CamelOpenTelemetry
@CamelOpenTelemetry2
@SpringBootApplication
public class DemoApplication {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ public void configure() throws Exception {
// .to("log:debug?showAll=true&multiline=true")
.setBody(simple("New async request ${header.x-b3-traceid}"))
.multicast().parallelProcessing()
.to("kafka:car_input?brokers=kafka:9092")
.to("kafka:flight_input?brokers=kafka:9092")
.to("kafka:hotel_input?brokers=kafka:9092")
.to("kafka:car_input?brokers=localhost:9092")
.to("kafka:flight_input?brokers=localhost:9092")
.to("kafka:hotel_input?brokers=localhost:9092")
.end();

from("kafka:car_output?brokers=kafka:9092").to("seda:tripAggregator");
from("kafka:flight_output?brokers=kafka:9092").to("seda:tripAggregator");
from("kafka:hotel_output?brokers=kafka:9092").to("seda:tripAggregator");
from("kafka:car_output?brokers=localhost:9092").to("seda:tripAggregator");
from("kafka:flight_output?brokers=localhost:9092").to("seda:tripAggregator");
from("kafka:hotel_output?brokers=localhost:9092").to("seda:tripAggregator");

from("seda:tripAggregator").routeId("bookTrip-kafka-response")
.aggregate(constant(true), new MergeAggregationStrategy())
Expand Down
4 changes: 3 additions & 1 deletion opentelemetry/containers/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ services:
environment:
- KAFKA_BROKER_ID=1
- KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
- KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
- KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
- KAFKA_LISTENERS=PLAINTEXT://0.0.0.0:29092,PLAINTEXT_HOST://0.0.0.0:9092
- KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
- KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1
jaeger:
image: jaegertracing/all-in-one:1.25
Expand Down
Loading