deps: updates to latest notably zipkin (#221)

Signed-off-by: Adrian Cole <adrian@tetrate.io>
openzipkin · Dec 14, 2023 · 646427b · 646427b
1 parent 9ca8a6c
commit 646427b
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 20 deletions.
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -118,7 +118,7 @@
       <artifactId>kafka-junit</artifactId>
       <!-- This version is tightly coupled to the version of kafka-clients being used.
        https://github.com/charithe/kafka-junit -->
-      <version>4.1.10</version>
+      <version>4.2.10</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
     <!-- use the same value in ../pom.xml -->
-    <zipkin.version>2.24.4</zipkin.version>
+    <zipkin.version>2.25.0</zipkin.version>
   </properties>
 
   <url>https://github.com/openzipkin/zipkin-reporter-java</url>

diff --git a/brave/pom.xml b/brave/pom.xml
@@ -61,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>io.zipkin.zipkin2</groupId>
-      <artifactId>zipkin-junit</artifactId>
+      <artifactId>zipkin-junit5</artifactId>
       <version>${zipkin.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/brave/src/test/java/zipkin2/reporter/brave/BasicUsageTest.java b/brave/src/test/java/zipkin2/reporter/brave/BasicUsageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
+ * Copyright 2016-2023 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
@@ -19,9 +19,9 @@
 import brave.propagation.TraceContextOrSamplingFlags;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import zipkin2.Span;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,7 +33,7 @@ abstract class BasicUsageTest<H extends ZipkinSpanHandler> {
 
   abstract H zipkinSpanHandler(List<Span> spans);
 
-  @Before public void init() {
+  @BeforeEach void init() {
     zipkinSpanHandler = zipkinSpanHandler(spans);
     tracing = Tracing.newBuilder()
         .localServiceName("Aa")
@@ -43,11 +43,11 @@ abstract class BasicUsageTest<H extends ZipkinSpanHandler> {
         .build();
   }
 
-  @After public void close() {
+  @AfterEach void close() {
     tracing.close();
   }
 
-  @Test public void reconfigure() {
+  @Test void reconfigure() {
     tracing.close();
     zipkinSpanHandler.close();
 
@@ -74,7 +74,7 @@ abstract class BasicUsageTest<H extends ZipkinSpanHandler> {
   }
 
   /** This mainly shows endpoints are taken from Brave, and error is back-filled. */
-  @Test public void basicSpan() {
+  @Test void basicSpan() {
     TraceContext context = B3SingleFormat.parseB3SingleFormat(
         "50d980fffa300f29-86154a4ba6e91385-1"
     ).context();
@@ -105,7 +105,7 @@ void triggerReport() {
   }
 
   /** This shows that in practice, we don't report when the user tells us not to! */
-  @Test public void abandonedSpan() {
+  @Test void abandonedSpan() {
     TraceContext context = B3SingleFormat.parseB3SingleFormat(
         "50d980fffa300f29-86154a4ba6e91385-1"
     ).context();
@@ -119,7 +119,7 @@ void triggerReport() {
     assertThat(spans).isEmpty();
   }
 
-  @Test public void unsampledSpan() {
+  @Test void unsampledSpan() {
     brave.Span unsampledRemote =
         tracing.tracer().nextSpan(TraceContextOrSamplingFlags.NOT_SAMPLED).name("test").start(1L);
     assertThat(unsampledRemote.isNoop()).isTrue();

diff --git a/brave/src/test/java/zipkin2/reporter/brave/BasicUsageTest_Async.java b/brave/src/test/java/zipkin2/reporter/brave/BasicUsageTest_Async.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The OpenZipkin Authors
+ * Copyright 2016-2023 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
@@ -16,12 +16,13 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.junit.Rule;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import zipkin2.Span;
-import zipkin2.junit.ZipkinRule;
+import zipkin2.junit5.ZipkinExtension;
 import zipkin2.reporter.okhttp3.OkHttpSender;
 
 public class BasicUsageTest_Async extends BasicUsageTest<AsyncZipkinSpanHandler> {
-  @Rule public ZipkinRule zipkin = new ZipkinRule();
+  @RegisterExtension public ZipkinExtension zipkin = new ZipkinExtension();
 
   OkHttpSender sender = OkHttpSender.create(zipkin.httpUrl() + "/api/v2/spans");
 

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.24.4"));
+      super(parse("ghcr.io/openzipkin/zipkin-kafka:2.25.0"));
       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.24.4"));
+      super(parse("ghcr.io/openzipkin/zipkin:2.25.0"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

diff --git a/metrics-micrometer/pom.xml b/metrics-micrometer/pom.xml
@@ -31,7 +31,7 @@
     <module.name>zipkin2.reporter.metrics.micrometer</module.name>
 
     <main.basedir>${project.basedir}/..</main.basedir>
-    <micrometer.version>1.12.0</micrometer.version>
+    <micrometer.version>1.12.1</micrometer.version>
   </properties>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -57,14 +57,16 @@
     <errorprone.version>2.23.0</errorprone.version>
 
     <!-- use the same value in bom/pom.xml -->
-    <zipkin.version>2.24.4</zipkin.version>
+    <zipkin.version>2.25.0</zipkin.version>
 
     <!-- Do not set this value in bom/pom.xml to avoid cyclic pinning -->
     <brave.version>5.16.0</brave.version>
 
     <junit.version>4.13.2</junit.version>
     <junit-jupiter.version>5.10.1</junit-jupiter.version>
+    <!-- use pre-kotlin version -->
     <okhttp.version>3.14.9</okhttp.version>
+    <okhttp5.version>5.0.0-alpha.11</okhttp5.version>
     <!-- use pre slf4j 2 version -->
     <logback.version>1.2.13</logback.version>
     <testcontainers.version>1.19.3</testcontainers.version>