From fa99ab1135b6982c8ca82485d31c27779d38a8ac Mon Sep 17 00:00:00 2001 From: Crypt Keeper <64215+codefromthecrypt@users.noreply.github.com> Date: Wed, 6 Dec 2023 16:34:11 +0800 Subject: [PATCH] Updates things that can to latest LTS JRE 21 (#93) Signed-off-by: Adrian Cole --- README.md | 12 ++++++------ armeria-kafka/README.md | 2 +- armeria-kafka/pom.xml | 4 ++-- armeria/pom.xml | 4 ++-- build-bin/docker_args | 5 ++++- docker/Dockerfile | 2 +- dropwizard/pom.xml | 4 ++-- netty4-grpc/README.md | 2 +- netty4-grpc/pom.xml | 4 ++-- parent-pom.xml | 10 ---------- ratpack/pom.xml | 6 +++--- webflux5-sleuth/pom.xml | 4 ++-- 12 files changed, 26 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 92f6bfd..0607a4f 100644 --- a/README.md +++ b/README.md @@ -37,17 +37,17 @@ There are some interesting details that apply to all examples: Here are the example projects you can try: * [armeria](armeria) `BRAVE_EXAMPLE=armeria docker-compose up` - * Runtime: Armeria, SLF4J 1.7, JRE 17 + * Runtime: Armeria, SLF4J 1.7, JRE 21 * Trace Instrumentation: [Armeria](https://armeria.dev/), [SLF4J](https://github.com/openzipkin/brave/tree/master/context/slf4j) * Trace Configuration: [Brave API](https://github.com/openzipkin/brave/tree/master/brave#setup) [Java](armeria/src/main/java/brave/example/HttpTracingFactory.java) * [armeria-kafka](armeria-kafka) `BRAVE_EXAMPLE=armeria-kafka docker-compose -f docker-compose.yml -f docker-compose-kafka.yml up` - * Runtime: Armeria, Kafka Clients and Streams 2.7, SLF4J 1.7, JRE 17 + * Runtime: Armeria, Kafka Clients and Streams 2.7, SLF4J 1.7, JRE 21 * Trace Instrumentation: [Armeria](https://armeria.dev/), [Kafka Clients](https://github.com/openzipkin/brave/tree/master/instrumentation/kafka-clients), [Kafka Streams](https://github.com/openzipkin/brave/tree/master/instrumentation/kafka-streams), [SLF4J](https://github.com/openzipkin/brave/tree/master/context/slf4j) * Trace Configuration: [Brave API](https://github.com/openzipkin/brave/tree/master/brave#setup) [Java](armeria/src/main/java/brave/example/HttpTracingFactory.java) * [dropwizard](dropwizard) `BRAVE_EXAMPLE=dropwizard docker-compose up` - * Runtime: JaxRS 2, Jersey 2.31, Apache HttpClient 4.5, Jetty 9.4, SLF4J 1.7, JRE 17 + * Runtime: JaxRS 2, Jersey 2.31, Apache HttpClient 4.5, Jetty 9.4, SLF4J 1.7, JRE 21 * Trace Instrumentation: [Jersey Server](https://github.com/openzipkin/brave/tree/master/instrumentation/jersey-server), [Apache HttpClient](https://github.com/openzipkin/brave/tree/master/instrumentation/httpclient), [SLF4J](https://github.com/openzipkin/brave/tree/master/context/slf4j) * Trace Configuration: [Dropwizard Zipkin](https://github.com/smoketurner/dropwizard-zipkin) [Java](dropwizard/src/main/java/brave/example/ExampleApplication.java) [Yaml](dropwizard/src/main/resources/server.yml) @@ -57,17 +57,17 @@ Here are the example projects you can try: * Trace Configuration: [Brave API](https://github.com/openzipkin/brave/tree/master/brave#setup) [XML](jersey2-cassandra3/src/main/webapp/WEB-INF/tracing.xml) * [netty4-grpc](netty4-grpc) `BRAVE_EXAMPLE=netty4-grpc docker-compose up` - * Runtime: Netty 4.1, Google gRPC 1.34 , SLF4J 1.7, JRE 17 + * Runtime: Netty 4.1, Google gRPC 1.34 , SLF4J 1.7, JRE 21 * Trace Instrumentation: [Netty Codec HTTP](https://github.com/openzipkin/brave/tree/master/instrumentation/netty-codec-http), [Google gRPC](https://github.com/openzipkin/brave/tree/master/instrumentation/grpc), [SLF4J](https://github.com/openzipkin/brave/tree/master/context/slf4j) * Trace Configuration: [Brave API](https://github.com/openzipkin/brave/tree/master/brave#setup) [Java](netty4-grpc/src/main/java/brave/example/TracingConfiguration.java) * [ratpack](ratpack) `BRAVE_EXAMPLE=ratpack docker-compose up` - * Runtime: Ratpack 1.8, Guice 4, SLF4J 1.7, JRE 17 + * Runtime: Ratpack 1.8, Guice 4, SLF4J 1.7, JRE 21 * Trace Instrumentation: [Brave Ratpack](https://github.com/openzipkin-contrib/brave-ratpack) * Trace Configuration: [Brave Ratpack Guice](https://github.com/openzipkin-contrib/brave-ratpack) [Java](ratpack/src/main/java/brave/example/Backend.java) * [webflux5-sleuth](webflux5-sleuth) `BRAVE_EXAMPLE=webflux5-sleuth docker-compose up` - * Runtime: Spring 5.2, Reactor Netty 0.9, Spring Boot 2.3, Spring Cloud Sleuth 2.2, Log4J 2.13, JRE 17 + * Runtime: Spring 5.2, Reactor Netty 0.9, Spring Boot 2.3, Spring Cloud Sleuth 2.2, Log4J 2.13, JRE 21 * Trace Instrumentation: [WebFlux Server](https://github.com/spring-cloud/spring-cloud-sleuth/blob/2.2.x/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFilter.java), [WebFlux Client](https://github.com/spring-cloud/spring-cloud-sleuth/blob/2.2.x/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java), [Reactor Context](https://github.com/spring-cloud/spring-cloud-sleuth/blob/2.2.x/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ScopePassingSpanSubscriber.java), [SLF4J](https://github.com/openzipkin/brave/tree/master/context/slf4j) * Trace Configuration: [Spring Cloud Sleuth](https://github.com/spring-cloud/spring-cloud-sleuth/tree/2.2.x/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig) [Properties](webflux5-sleuth/src/main/resources/application.properties) diff --git a/armeria-kafka/README.md b/armeria-kafka/README.md index e32de73..9f4f1ab 100644 --- a/armeria-kafka/README.md +++ b/armeria-kafka/README.md @@ -1,4 +1,4 @@ -## Tracing Example: Armeria/Kafka Clients and Streams/Java 17 +## Tracing Example: Armeria/Kafka Clients and Streams/Java 21 Instead of client/server, this example implements a http->producer->streams->consumer flow. diff --git a/armeria-kafka/pom.xml b/armeria-kafka/pom.xml index 9a89bd3..a1e45ec 100644 --- a/armeria-kafka/pom.xml +++ b/armeria-kafka/pom.xml @@ -14,10 +14,10 @@ jar brave-example-armeria-kafka - Tracing Example: Armeria/Kafka Clients and Streams/Java 17 + Tracing Example: Armeria/Kafka Clients and Streams/Java 21 - 17 + 21 8 1.6.0 diff --git a/armeria/pom.xml b/armeria/pom.xml index a5ab087..255fb03 100644 --- a/armeria/pom.xml +++ b/armeria/pom.xml @@ -14,10 +14,10 @@ jar brave-example-armeria - Tracing Example: Armeria/ Java 17 + Tracing Example: Armeria/ Java 21 - 17 + 21 8 1.6.0 diff --git a/build-bin/docker_args b/build-bin/docker_args index 50d4ce6..917343d 100755 --- a/build-bin/docker_args +++ b/build-bin/docker_args @@ -8,7 +8,7 @@ else exit 1 fi -JAVA_VERSION=${JAVA_VERSION:-17.0.9_p8} +JAVA_VERSION=${JAVA_VERSION:-21.0.1_p12} # DOCKER_ARCHS to eventually push to the registry DOCKER_ARCHS="amd64 arm64" @@ -32,6 +32,9 @@ case "${JRE_VERSION}" in 17 ) DOCKER_PARENT_IMAGE=ghcr.io/openzipkin/java:17.0.9_p8-jre ;; + 21 ) + DOCKER_PARENT_IMAGE=ghcr.io/openzipkin/java:21.0.1_p12-jre + ;; * ) echo "Invalid JRE_VERSION: ${JRE_VERSION}" exit 1 diff --git a/docker/Dockerfile b/docker/Dockerfile index d763e69..52512d8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ # non-root users and such as they are not intended to run in production anyway. # The image binaries this example builds are installed over -ARG docker_parent_image=ghcr.io/openzipkin/java:17.0.9_p8-jre +ARG docker_parent_image=ghcr.io/openzipkin/java:21.0.1_p12 # We copy files from the context into a scratch container first to avoid a problem where docker and # docker-compose don't share layer hashes https://github.com/docker/compose/issues/883 normally. diff --git a/dropwizard/pom.xml b/dropwizard/pom.xml index 2c38001..7c8a527 100644 --- a/dropwizard/pom.xml +++ b/dropwizard/pom.xml @@ -14,10 +14,10 @@ jar brave-example-dropwizard - Tracing Example: Dropwizard/ Java 17 + Tracing Example: Dropwizard/ Java 21 - 17 + 21 8 diff --git a/netty4-grpc/README.md b/netty4-grpc/README.md index 6ab6432..5103f55 100644 --- a/netty4-grpc/README.md +++ b/netty4-grpc/README.md @@ -1,4 +1,4 @@ -## Tracing Example: Netty 4.1/Google gRPC 1.34/JRE 17 +## Tracing Example: Netty 4.1/Google gRPC 1.34/JRE 21 Instead of servlet, the frontend is a Netty HTTP handler. The backend is Google gRPC 1.31. Both services run as a normal Java application. diff --git a/netty4-grpc/pom.xml b/netty4-grpc/pom.xml index 08de47c..61935c4 100644 --- a/netty4-grpc/pom.xml +++ b/netty4-grpc/pom.xml @@ -14,10 +14,10 @@ jar brave-example-netty4-grpc - Tracing Example: Netty 4.1/Google gRPC 1.34/JRE 17 + Tracing Example: Netty 4.1/Google gRPC 1.34/JRE 21 - 17 + 21 8 1.34.1 diff --git a/parent-pom.xml b/parent-pom.xml index 49418f9..be76c20 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -69,16 +69,6 @@ - - - io.takari - maven - 0.7.7 - - 3.6.3 - - - de.qaware.maven diff --git a/ratpack/pom.xml b/ratpack/pom.xml index ef6750f..7a51c62 100644 --- a/ratpack/pom.xml +++ b/ratpack/pom.xml @@ -14,10 +14,10 @@ jar brave-example-ratpack - Tracing Example: Ratpack/ Java 17 + Tracing Example: Ratpack/ Java 21 - 17 + 21 8 1.9.0 @@ -36,7 +36,7 @@ - + com.google.inject guice diff --git a/webflux5-sleuth/pom.xml b/webflux5-sleuth/pom.xml index d049cfa..8081da8 100644 --- a/webflux5-sleuth/pom.xml +++ b/webflux5-sleuth/pom.xml @@ -13,10 +13,10 @@ 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 17 + Tracing Example: Spring 5.2, Reactor Netty 0.9, Spring Boot 2.3, Spring Cloud Sleuth 2.2, Log4J 2.13, JRE 21 - 17 + 21 8 2.3.7.RELEASE