Updates to Brave 5.18 with zipkin-reporter 3

Signed-off-by: Adrian Cole <[email protected]>
openzipkin · Jan 7, 2024 · aa4112d · aa4112d
1 parent 6328492
commit aa4112d
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 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/parent-pom.xml b/parent-pom.xml
@@ -27,13 +27,28 @@
     </license>
   </licenses>
 
+  <repositories>
+    <repository>
+      <id>sonatype.snapshots</id>
+      <name>Sonatype Snapshots</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
     <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-SNAPSHOT</brave.version>
+    <zipkin-reporter.version>3.0.0-SNAPSHOT</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,13 +68,31 @@
   <!-- 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>
         <version>${brave.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>io.zipkin.brave</groupId>
+        <artifactId>brave</artifactId>
+        <version>${brave.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>*</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
     </dependencies>
   </dependencyManagement>