diff --git a/armeria-kafka/pom.xml b/armeria-kafka/pom.xml index c7ef375..6ae9898 100644 --- a/armeria-kafka/pom.xml +++ b/armeria-kafka/pom.xml @@ -20,8 +20,8 @@ 21 8 - 1.6.0 - 3.4.0 + 1.26.4 + 3.6.1 diff --git a/armeria-kafka/src/main/java/brave/example/Backend.java b/armeria-kafka/src/main/java/brave/example/Backend.java index 09a0f5c..476ff2c 100644 --- a/armeria-kafka/src/main/java/brave/example/Backend.java +++ b/armeria-kafka/src/main/java/brave/example/Backend.java @@ -20,7 +20,6 @@ import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.StreamsConfig; import org.apache.kafka.streams.kstream.Consumed; -import org.apache.kafka.streams.kstream.Produced; public final class Backend { @@ -36,8 +35,8 @@ public static void main(String[] args) { StreamsBuilder builder = new StreamsBuilder(); builder.stream("input", Consumed.with(Serdes.String(), Serdes.String())) - .transformValues(tracing.kafkaStreamsTracing.mapValues("mapping", s -> s + ". Thanks!")) - .to("output", Produced.with(Serdes.String(), Serdes.String())); + .processValues(tracing.kafkaStreamsTracing.processValues("mapping", + () -> r -> r.withValue(r.value() + ". Thanks!"))); KafkaStreams kafkaStreams = tracing.kafkaStreamsTracing.kafkaStreams(builder.build(), streamsConfig); diff --git a/armeria/pom.xml b/armeria/pom.xml index 255fb03..86d531d 100644 --- a/armeria/pom.xml +++ b/armeria/pom.xml @@ -20,7 +20,7 @@ 21 8 - 1.6.0 + 1.26.4 diff --git a/jersey2-cassandra3/pom.xml b/jersey2-cassandra3/pom.xml index 9475ae0..02c0775 100644 --- a/jersey2-cassandra3/pom.xml +++ b/jersey2-cassandra3/pom.xml @@ -124,5 +124,9 @@ io.zipkin.brave brave-spring-beans + + io.zipkin.reporter2 + zipkin-reporter-spring-beans + diff --git a/parent-pom.xml b/parent-pom.xml index 07b63b5..b4ebb04 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -33,9 +33,8 @@ UTF-8 UTF-8 - 5.18.0 - 2.17.2 - 3.0.0 + 5.18.1 + 3.0.2 SET MANUALLY IN PROJECTS @@ -44,7 +43,7 @@ 3.1.1 1.2.8 - 3.11.0 + 3.12.1 3.6.1 3.4.0 diff --git a/webflux5-sleuth/README.md b/webflux5-sleuth/README.md index f1e1335..01c548d 100644 --- a/webflux5-sleuth/README.md +++ b/webflux5-sleuth/README.md @@ -1,13 +1,13 @@ ## Tracing Example: Spring WebFlux 5/Spring Boot 2.3/Spring Cloud Sleuth 2.2 -Instead of servlet, this uses Spring Boot 2.3 to create a self-contained +Instead of servlet, this uses Spring Boot 2.6 to create a self-contained application that runs Spring WebFlux 5 controllers. * brave.example.Frontend and Backend: Rest controllers * brave.example.AppAutoConfiguration: Sets up the WebClient used in the Frontend. Application code doesn't show any tracing configuration because that's handled -by [Spring Cloud Sleuth v2](https://github.com/spring-cloud/spring-cloud-sleuth/tree/2.2.x), configured by properties. +by [Spring Cloud Sleuth v3](https://github.com/spring-cloud/spring-cloud-sleuth/tree/3.1.x), configured by properties. Version 2 of Sleuth was based on Brave. It provided auto-configuration of Brave libraries used in other projects, such as span reporting, logging context, diff --git a/webflux5-sleuth/pom.xml b/webflux5-sleuth/pom.xml index a2888bb..7bf88de 100644 --- a/webflux5-sleuth/pom.xml +++ b/webflux5-sleuth/pom.xml @@ -13,15 +13,20 @@ jar brave-example-webflux5-sleuth - Tracing Example: Spring 5.2, Reactor Netty 0.9, Spring Boot 2.3, Spring Cloud Sleuth 2.2, Log4J 2.13, JRE 21 + Tracing Example: Spring 5.2, Reactor Netty 1.0, Spring Boot 2.6, Spring Cloud Sleuth 3.1, Log4J 2.17, JRE 21 21 8 - 2.3.7.RELEASE - 2.2.6.RELEASE - ${old-zipkin-reporter.version} + 2.6.15 + 3.1.10 + + 5.17.1 + + 2.17.2 @@ -46,17 +51,23 @@ org.springframework.boot spring-boot-starter-actuator + ${spring-boot.version} org.springframework.cloud - spring-cloud-starter-zipkin + spring-cloud-starter-sleuth + ${sleuth.version} + + + org.springframework.cloud + spring-cloud-sleuth-zipkin ${sleuth.version} + See https://github.com/spring-cloud/spring-cloud-sleuth/pull/2335 --> io.zipkin.reporter2 zipkin-reporter diff --git a/webmvc25-jetty/pom.xml b/webmvc25-jetty/pom.xml index 7a8696b..18a605d 100755 --- a/webmvc25-jetty/pom.xml +++ b/webmvc25-jetty/pom.xml @@ -73,6 +73,10 @@ io.zipkin.brave brave + + io.zipkin.reporter2 + zipkin-reporter-spring-beans + io.zipkin.reporter2 zipkin-reporter-brave diff --git a/webmvc3-jetty/pom.xml b/webmvc3-jetty/pom.xml index e35c328..c5bd30f 100755 --- a/webmvc3-jetty/pom.xml +++ b/webmvc3-jetty/pom.xml @@ -78,6 +78,10 @@ io.zipkin.brave brave + + io.zipkin.reporter2 + zipkin-reporter-spring-beans + io.zipkin.reporter2 zipkin-reporter-brave diff --git a/webmvc4-jetty/pom.xml b/webmvc4-jetty/pom.xml index 8dd34f7..9944336 100755 --- a/webmvc4-jetty/pom.xml +++ b/webmvc4-jetty/pom.xml @@ -92,6 +92,10 @@ io.zipkin.brave brave + + io.zipkin.reporter2 + zipkin-reporter-spring-beans + io.zipkin.reporter2 zipkin-reporter-brave