bumps to brave 6 and warns about zipkin dep version (#242)

Signed-off-by: Adrian Cole <adrian@tetrate.io>
openzipkin · Jan 12, 2024 · d97c014 · d97c014
1 parent 35db29b
commit d97c014
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 20 deletions.
diff --git a/activemq-client/src/test/java/zipkin2/reporter/activemq/ActiveMQExtension.java b/activemq-client/src/test/java/zipkin2/reporter/activemq/ActiveMQExtension.java
@@ -64,7 +64,7 @@ String brokerURL() {
   // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
   static final class ActiveMQContainer extends GenericContainer<ActiveMQContainer> {
     ActiveMQContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin-activemq:2.27.0"));
+      super(parse("ghcr.io/openzipkin/zipkin-activemq:3.0.1"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

diff --git a/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQExtension.java b/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQExtension.java
@@ -82,7 +82,7 @@ int port() {
   // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
   static final class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
     RabbitMQContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:2.27.0"));
+      super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:3.0.1"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

diff --git a/benchmarks/src/main/java/zipkin2/reporter/KafkaSenderBenchmarks.java b/benchmarks/src/main/java/zipkin2/reporter/KafkaSenderBenchmarks.java
@@ -42,7 +42,7 @@ public class KafkaSenderBenchmarks extends SenderBenchmarks {
 
   static final class KafkaContainer extends GenericContainer<KafkaContainer> {
     KafkaContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin-kafka:2.27.0"));
+      super(parse("ghcr.io/openzipkin/zipkin-kafka:3.0.1"));
       waitStrategy = Wait.forHealthcheck();
       // Kafka broker listener port (19092) needs to be exposed for test cases to access it.
       addFixedExposedPort(KAFKA_PORT, KAFKA_PORT, InternetProtocol.TCP);

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -27,7 +27,8 @@
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
     <!-- use the same value in ../pom.xml -->
-    <zipkin.version>2.27.0</zipkin.version>
+    <!-- NOTE: Do not update to 3.x as that has floor Java 8 -->
+    <zipkin.version>2.27.1</zipkin.version>
   </properties>
 
   <url>https://github.com/openzipkin/zipkin-reporter-java</url>

diff --git a/build-bin/docker/configure_docker b/build-bin/docker/configure_docker
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2016-2023 The OpenZipkin Authors
+# Copyright 2016-2024 The OpenZipkin Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at

diff --git a/build-bin/git/login_git b/build-bin/git/login_git
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
+# Copyright 2016-2024 The OpenZipkin Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at

diff --git a/build-bin/git/version_from_trigger_tag b/build-bin/git/version_from_trigger_tag
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
+# Copyright 2016-2024 The OpenZipkin Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -13,8 +13,6 @@
 # the License.
 #
 
-set -ue
-
 # This script echos a `MAJOR.MINOR.PATCH` version tag based on..
 #  * arg1: XXXXX- prefix
 #  * arg2: XXXXX-MAJOR.MINOR.PATCH git trigger tag
@@ -23,6 +21,8 @@ set -ue
 #
 # Note: In CI, `build-bin/git/login_git` must be called before invoking this.
 
+set -ue
+
 trigger_tag_prefix=${1?required. Ex docker- to match docker-1.2.3}
 trigger_tag=${2?trigger_tag is required. Ex ${trigger_tag_prefix}1.2.3}
 

diff --git a/build-bin/gpg/configure_gpg b/build-bin/gpg/configure_gpg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2016-2020 The OpenZipkin Authors
+# Copyright 2016-2024 The OpenZipkin Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -13,10 +13,10 @@
 # the License.
 #
 
-set -ue
-
 # This script prepares GPG, needed to sign jars for Sonatype deployment during `maven_deploy`
 
+set -ue
+
 # ensure GPG commands work non-interactively
 export GPG_TTY=$(tty)
 # import signing key used for jar files

diff --git a/build-bin/maven/maven_deploy b/build-bin/maven/maven_deploy
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2016-2023 The OpenZipkin Authors
+# Copyright 2016-2024 The OpenZipkin Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at

diff --git a/build-bin/maven/maven_go_offline b/build-bin/maven/maven_go_offline
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2016-2023 The OpenZipkin Authors
+# Copyright 2016-2024 The OpenZipkin Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at

diff --git a/build-bin/maven/maven_opts b/build-bin/maven/maven_opts
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2016-2023 The OpenZipkin Authors
+# Copyright 2016-2024 The OpenZipkin Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at

diff --git a/build-bin/maven/maven_release b/build-bin/maven/maven_release
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2016-2023 The OpenZipkin Authors
+# Copyright 2016-2024 The OpenZipkin Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at

diff --git a/kafka/src/test/java/zipkin2/reporter/kafka/KafkaExtension.java b/kafka/src/test/java/zipkin2/reporter/kafka/KafkaExtension.java
@@ -90,7 +90,7 @@ String bootstrapServer() {
   // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
   static final class KafkaContainer extends GenericContainer<KafkaContainer> {
     KafkaContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin-kafka:2.27.0"));
+      super(parse("ghcr.io/openzipkin/zipkin-kafka:3.0.1"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

diff --git a/libthrift/src/test/java/zipkin2/reporter/libthrift/ZipkinExtension.java b/libthrift/src/test/java/zipkin2/reporter/libthrift/ZipkinExtension.java
@@ -76,7 +76,7 @@ Response get(String path) throws IOException {
   // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
   static final class ZipkinContainer extends GenericContainer<ZipkinContainer> {
     ZipkinContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin:2.27.0"));
+      super(parse("ghcr.io/openzipkin/zipkin:3.0.1"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

diff --git a/pom.xml b/pom.xml
@@ -61,10 +61,11 @@
     <errorprone.version>2.24.1</errorprone.version>
 
     <!-- use the same value in bom/pom.xml -->
-    <zipkin.version>2.27.0</zipkin.version>
+    <!-- NOTE: Do not update to 3.x as that has floor Java 8 -->
+    <zipkin.version>2.27.1</zipkin.version>
 
     <!-- Do not set this value in bom/pom.xml to avoid cyclic pinning -->
-    <brave.version>5.17.0</brave.version>
+    <brave.version>6.0.0</brave.version>
 
     <junit-jupiter.version>5.10.1</junit-jupiter.version>
     <assertj.version>3.25.1</assertj.version>