Skip to content

Commit

Permalink
Updates things that can to latest LTS JRE 21 (#93)
Browse files Browse the repository at this point in the history
Signed-off-by: Adrian Cole <adrian@tetrate.io>
  • Loading branch information
codefromthecrypt authored Dec 6, 2023
1 parent b28e164 commit fa99ab1
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 33 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion armeria-kafka/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
4 changes: 2 additions & 2 deletions armeria-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<packaging>jar</packaging>

<name>brave-example-armeria-kafka</name>
<description>Tracing Example: Armeria/Kafka Clients and Streams/Java 17</description>
<description>Tracing Example: Armeria/Kafka Clients and Streams/Java 21</description>

<properties>
<jre.version>17</jre.version>
<jre.version>21</jre.version>
<maven.compiler.release>8</maven.compiler.release>

<armeria.version>1.6.0</armeria.version>
Expand Down
4 changes: 2 additions & 2 deletions armeria/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<packaging>jar</packaging>

<name>brave-example-armeria</name>
<description>Tracing Example: Armeria/ Java 17</description>
<description>Tracing Example: Armeria/ Java 21</description>

<properties>
<jre.version>17</jre.version>
<jre.version>21</jre.version>
<maven.compiler.release>8</maven.compiler.release>

<armeria.version>1.6.0</armeria.version>
Expand Down
5 changes: 4 additions & 1 deletion build-bin/docker_args
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions dropwizard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<packaging>jar</packaging>

<name>brave-example-dropwizard</name>
<description>Tracing Example: Dropwizard/ Java 17</description>
<description>Tracing Example: Dropwizard/ Java 21</description>

<properties>
<jre.version>17</jre.version>
<jre.version>21</jre.version>
<maven.compiler.release>8</maven.compiler.release>

<!-- You don't have to add a dependency on Dropwizard because dropwizard-zipkin manages it -->
Expand Down
2 changes: 1 addition & 1 deletion netty4-grpc/README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions netty4-grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<packaging>jar</packaging>

<name>brave-example-netty4-grpc</name>
<description>Tracing Example: Netty 4.1/Google gRPC 1.34/JRE 17</description>
<description>Tracing Example: Netty 4.1/Google gRPC 1.34/JRE 21</description>

<properties>
<jre.version>17</jre.version>
<jre.version>21</jre.version>
<maven.compiler.release>8</maven.compiler.release>

<grpc.version>1.34.1</grpc.version>
Expand Down
10 changes: 0 additions & 10 deletions parent-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,6 @@
<build>
<pluginManagement>
<plugins>
<!-- mvn -N io.takari:maven:wrapper generates the ./mvnw script -->
<plugin>
<groupId>io.takari</groupId>
<artifactId>maven</artifactId>
<version>0.7.7</version>
<configuration>
<maven>3.6.3</maven>
</configuration>
</plugin>

<!-- mvn de.qaware.maven:go-offline-maven-plugin:resolve-dependencies -->
<plugin>
<groupId>de.qaware.maven</groupId>
Expand Down
6 changes: 3 additions & 3 deletions ratpack/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<packaging>jar</packaging>

<name>brave-example-ratpack</name>
<description>Tracing Example: Ratpack/ Java 17</description>
<description>Tracing Example: Ratpack/ Java 21</description>

<properties>
<jre.version>17</jre.version>
<jre.version>21</jre.version>
<maven.compiler.release>8</maven.compiler.release>

<ratpack.version>1.9.0</ratpack.version>
Expand All @@ -36,7 +36,7 @@
</exclusion>
</exclusions>
</dependency>
<!-- Override for JRE 17 -->
<!-- Override for JRE 21 -->
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions webflux5-sleuth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<packaging>jar</packaging>

<name>brave-example-webflux5-sleuth</name>
<description>Tracing Example: Spring 5.2, Reactor Netty 0.9, Spring Boot 2.3, Spring Cloud Sleuth 2.2, Log4J 2.13, JRE 17</description>
<description>Tracing Example: Spring 5.2, Reactor Netty 0.9, Spring Boot 2.3, Spring Cloud Sleuth 2.2, Log4J 2.13, JRE 21</description>

<properties>
<jre.version>17</jre.version>
<jre.version>21</jre.version>
<maven.compiler.release>8</maven.compiler.release>

<spring-boot.version>2.3.7.RELEASE</spring-boot.version>
Expand Down

0 comments on commit fa99ab1

Please sign in to comment.