Updates to Brave 5.18 with zipkin-reporter 3 (#98)

Signed-off-by: Adrian Cole <[email protected]>
openzipkin · Jan 8, 2024 · 7148c44 · 7148c44
1 parent 07d88c2
commit 7148c44
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/build-bin/docker-compose-kafka.test.yml b/build-bin/docker-compose-kafka.test.yml
@@ -5,7 +5,7 @@ version: "2.4"
 services:
   sut:
     container_name: sut
-    image: ghcr.io/openzipkin/alpine:3.18.5
+    image: ghcr.io/openzipkin/alpine:3.19.0
     entrypoint: /bin/sh
     # Keep the container running until HEALTHCHECK passes
     command: "-c \"sleep 5m\""
@@ -18,7 +18,7 @@ services:
 
   get_frontend:
     container_name: get_frontend
-    image: ghcr.io/openzipkin/alpine:3.18.5
+    image: ghcr.io/openzipkin/alpine:3.19.0
     entrypoint: /bin/sh
     # Pass a trace header with a constant trace ID, so that we know what to look for later
     command: "-c \"wget -qO- --header 'b3: cafebabecafebabe-cafebabecafebabe-1' http://frontend:8081\""

diff --git a/build-bin/docker-compose.test.yml b/build-bin/docker-compose.test.yml
@@ -4,7 +4,7 @@ version: "2.4"
 services:
   sut:
     container_name: sut
-    image: ghcr.io/openzipkin/alpine:3.18.5
+    image: ghcr.io/openzipkin/alpine:3.19.0
     entrypoint: /bin/sh
     # Keep the container running until HEALTHCHECK passes
     command: "-c \"sleep 5m\""
@@ -16,7 +16,7 @@ services:
         condition: service_started
   get_frontend:
     container_name: get_frontend
-    image: ghcr.io/openzipkin/alpine:3.18.5
+    image: ghcr.io/openzipkin/alpine:3.19.0
     entrypoint: /bin/sh
     # Pass a trace header with a constant trace ID, so that we know what to look for later
     command: "-c \"wget -qO- --header 'b3: cafebabecafebabe-cafebabecafebabe-1' http://frontend:8081\""

diff --git a/jersey2-cassandra3/pom.xml b/jersey2-cassandra3/pom.xml
@@ -21,15 +21,14 @@
     <maven.compiler.release>8</maven.compiler.release>
 
     <!-- Use a container that doesn't use Netty. -->
-    <jersey.version>2.33</jersey.version>
-    <spring.version>4.3.29.RELEASE</spring.version>
+    <jersey.version>2.41</jersey.version>
+    <spring.version>4.3.30.RELEASE</spring.version>
 
-    <cassandra.version>3.11.9</cassandra.version>
-    <!-- Use the cassandra-driver-core version bundled in cassandra to not conflict with Netty. -->
-    <cassandra-driver-core.version>3.0.1</cassandra-driver-core.version>
+    <cassandra.version>4.1.3</cassandra.version>
+    <cassandra-driver-core.version>3.11.2</cassandra-driver-core.version>
 
     <!-- https://github.com/openzipkin/brave-cassandra -->
-    <brave-cassandra.version>0.11.1</brave-cassandra.version>
+    <brave-cassandra.version>0.13.0</brave-cassandra.version>
   </properties>
 
   <dependencies>

diff --git a/jersey2-cassandra3/src/main/java/brave/example/Frontend.java b/jersey2-cassandra3/src/main/java/brave/example/Frontend.java
@@ -53,7 +53,7 @@ public static void main(String[] args) throws Exception {
     String contactPointString = System.getProperty("backend.contactPoint", "127.0.0.1:9042");
     HostAndPort parsed = HostAndPort.fromString(contactPointString).withDefaultPort(9042);
     Cluster cluster = Cluster.builder()
-        .addContactPointsWithPorts(new InetSocketAddress(parsed.getHostText(), parsed.getPort()))
+        .addContactPointsWithPorts(new InetSocketAddress(parsed.getHost(), parsed.getPort()))
         .build();
     Runtime.getRuntime().addShutdownHook(new Thread(cluster::close));
 

diff --git a/jersey2-cassandra3/src/main/resources/cassandra.yaml b/jersey2-cassandra3/src/main/resources/cassandra.yaml
@@ -9,7 +9,6 @@ storage_port: 7000
 native_transport_port: 9042
 listen_address: 127.0.0.1
 start_native_transport: true
-start_rpc: false
 seed_provider:
   - class_name: org.apache.cassandra.locator.SimpleSeedProvider
     parameters:

diff --git a/parent-pom.xml b/parent-pom.xml
@@ -33,7 +33,9 @@
     <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <brave.version>5.17.1</brave.version>
+    <brave.version>5.18.0</brave.version>
+    <old-zipkin-reporter.version>2.17.2</old-zipkin-reporter.version>
+    <zipkin-reporter.version>3.0.0</zipkin-reporter.version>
 
     <!-- The JRE used in Docker images can be higher than ${maven.compiler.release}. -->
     <jre.version>SET MANUALLY IN PROJECTS</jre.version>
@@ -53,6 +55,13 @@
   <!-- Only declare Brave dependencies here as we want projects to control their own settings -->
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>io.zipkin.reporter2</groupId>
+        <artifactId>zipkin-reporter-bom</artifactId>
+        <version>${zipkin-reporter.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>io.zipkin.brave</groupId>
         <artifactId>brave-bom</artifactId>

diff --git a/webflux5-sleuth/pom.xml b/webflux5-sleuth/pom.xml
@@ -21,6 +21,7 @@
 
     <spring-boot.version>2.3.7.RELEASE</spring-boot.version>
     <sleuth.version>2.2.6.RELEASE</sleuth.version>
+    <zipkin-reporter.version>${old-zipkin-reporter.version}</zipkin-reporter.version>
   </properties>
 
   <dependencyManagement>
@@ -53,6 +54,13 @@
       <artifactId>spring-cloud-starter-zipkin</artifactId>
       <version>${sleuth.version}</version>
     </dependency>
+
+    <!-- Needed for ZipkinRestTemplateSenderConfiguration: BytesMessageEncoder
+         See https://github.com/spring-cloud/spring-cloud-sleuth/pull/2335/files -->
+    <dependency>
+      <groupId>io.zipkin.reporter2</groupId>
+      <artifactId>zipkin-reporter</artifactId>
+    </dependency>
   </dependencies>
 
   <build>