updates to the latest test dependencies (#3610)

Signed-off-by: Adrian Cole <adrian@tetrate.io>

benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java

@@ -91,7 +91,7 @@ class ServerIntegratedBenchmark {
 
   @Test void elasticsearch() throws Exception {
     GenericContainer<?> elasticsearch =
-      new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:2.23.2"))
+      new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:2.24.3"))
         .withNetwork(Network.SHARED)
         .withNetworkAliases("elasticsearch")
         .withLabel("name", "elasticsearch")
@@ -105,7 +105,7 @@ class ServerIntegratedBenchmark {
 
   @Test void cassandra3() throws Exception {
     GenericContainer<?> cassandra =
-      new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-cassandra:2.23.2"))
+      new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-cassandra:2.24.3"))
         .withNetwork(Network.SHARED)
         .withNetworkAliases("cassandra")
         .withLabel("name", "cassandra")
@@ -119,7 +119,7 @@ class ServerIntegratedBenchmark {
 
   @Test void mysql() throws Exception {
     GenericContainer<?> mysql =
-      new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-mysql:2.23.2"))
+      new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-mysql:2.24.3"))
         .withNetwork(Network.SHARED)
         .withNetworkAliases("mysql")
         .withLabel("name", "mysql")
@@ -157,7 +157,7 @@ void runBenchmark(@Nullable GenericContainer<?> storage, GenericContainer<?> zip
     // Use a quay.io mirror to prevent build outages due to Docker Hub pull quotas
     // Use same version as in docker/examples/docker-compose-prometheus.yml
     GenericContainer<?> prometheus =
-      new GenericContainer<>(parse("quay.io/prometheus/prometheus:v2.23.0"))
+      new GenericContainer<>(parse("quay.io/prometheus/prometheus:v2.48.0"))
         .withNetwork(Network.SHARED)
         .withNetworkAliases("prometheus")
         .withExposedPorts(9090)
@@ -167,7 +167,7 @@ void runBenchmark(@Nullable GenericContainer<?> storage, GenericContainer<?> zip
 
     // Use a quay.io mirror to prevent build outages due to Docker Hub pull quotas
     // Use same version as in docker/examples/docker-compose-prometheus.yml
-    GenericContainer<?> grafana = new GenericContainer<>(parse("quay.io/app-sre/grafana:7.3.4"))
+    GenericContainer<?> grafana = new GenericContainer<>(parse("quay.io/giantswarm/grafana:7.5.4"))
       .withNetwork(Network.SHARED)
       .withNetworkAliases("grafana")
       .withExposedPorts(3000)
@@ -179,7 +179,7 @@ void runBenchmark(@Nullable GenericContainer<?> storage, GenericContainer<?> zip
     // Use a quay.io mirror to prevent build outages due to Docker Hub pull quotas
     // Use same version as in docker/examples/docker-compose-prometheus.yml
     GenericContainer<?> grafanaDashboards =
-      new GenericContainer<>(parse("quay.io/rackspace/curl:7.70.0"))
+      new GenericContainer<>(parse("quay.io/cilium/alpine-curl:v1.8.0"))
         .withNetwork(Network.SHARED)
         .withWorkingDirectory("/tmp")
         .withLogConsumer(new Slf4jLogConsumer(LOG))

docker/examples/docker-compose-prometheus.yml

@@ -25,7 +25,7 @@ services:
   prometheus:
     # Use a quay.io mirror to prevent build outages due to Docker Hub pull quotas
     # Use latest from https://quay.io/repository/prometheus/prometheus?tab=tags
-    image: quay.io/prometheus/prometheus:v2.23.0
+    image: quay.io/prometheus/prometheus:v2.48.0
     container_name: prometheus
     ports:
       - 9090:9090
@@ -37,7 +37,7 @@ services:
   grafana:
     # Use a quay.io mirror to prevent build outages due to Docker Hub pull quotas
     # Use latest from https://quay.io/repository/app-sre/grafana?tab=tags
-    image: quay.io/app-sre/grafana:7.3.4
+    image: quay.io/giantswarm/grafana:7.5.4
     container_name: grafana
     ports:
       - 3000:3000
@@ -51,7 +51,7 @@ services:
     # This is an arbitrary small image that has curl installed
     # Use a quay.io mirror to prevent build outages due to Docker Hub pull quotas
     # Use latest from https://quay.io/repository/quay.io/rackspace/curl?tab=tags
-    image: quay.io/rackspace/curl:7.70.0
+    image: quay.io/cilium/alpine-curl:v1.8.0
     container_name: setup_grafana_datasource
     depends_on:
       - grafana

docker/test-images/zipkin-elasticsearch6/README.md

@@ -20,4 +20,7 @@ $ sudo sysctl -w vm.max_map_count=262144
 
 # If using docker-machine/Docker Toolbox/Boot2Docker, remotely adjust the same
 $ docker-machine ssh default "sudo sysctl -w vm.max_map_count=262144"
+
+# If using colima, it is similar as well
+$ colima ssh "sudo sysctl -w vm.max_map_count=262144"
 ```

pom.xml

@@ -86,18 +86,18 @@
 
     <!-- Test only dependencies -->
     <junit.version>4.13.2</junit.version>
-    <junit-jupiter.version>5.9.2</junit-jupiter.version>
-    <mockito.version>3.8.0</mockito.version>
-    <assertj.version>3.18.1</assertj.version>
-    <awaitility.version>4.0.3</awaitility.version>
-    <hamcrest.version>1.3</hamcrest.version>
-    <testcontainers.version>1.19.0</testcontainers.version>
-    <okhttp.version>4.9.0</okhttp.version>
+    <junit-jupiter.version>5.10.1</junit-jupiter.version>
+    <mockito.version>5.8.0</mockito.version>
+    <assertj.version>3.24.2</assertj.version>
+    <awaitility.version>4.2.0</awaitility.version>
+    <hamcrest.version>2.2</hamcrest.version>
+    <testcontainers.version>1.19.3</testcontainers.version>
+    <okhttp.version>4.12.0</okhttp.version>
     <okhttp5.version>5.0.0-alpha.11</okhttp5.version>
-    <kryo.version>5.0.3</kryo.version>
+    <kryo.version>5.5.0</kryo.version>
     <!-- Only used for proto interop testing; wire-maven-plugin is usually behind latest. -->
     <wire.version>3.0.2</wire.version>
-    <gson.version>2.8.9</gson.version>
+    <gson.version>2.10.1</gson.version>
     <unpack-proto.directory>${project.build.directory}/test/proto</unpack-proto.directory>
 
     <!--

zipkin-collector/kafka/src/test/java/zipkin2/collector/kafka/KafkaExtension.java

@@ -92,7 +92,7 @@ KafkaCollector.Builder newCollectorBuilder(String topic, int streams) {
   // 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.23.2"));
+      super(parse("ghcr.io/openzipkin/zipkin-kafka:2.24.3"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

zipkin-server/pom.xml

@@ -419,7 +419,7 @@
     <dependency>
       <groupId>com.jayway.jsonpath</groupId>
       <artifactId>json-path</artifactId>
-      <version>2.4.0</version>
+      <version>2.8.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraStorageExtension.java

@@ -156,7 +156,7 @@ static boolean poolInFlight(CqlSession session) {
   // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
   static final class CassandraContainer extends GenericContainer<CassandraContainer> {
     CassandraContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin-cassandra:2.23.2"));
+      super(parse("ghcr.io/openzipkin/zipkin-cassandra:2.24.3"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

zipkin-storage/elasticsearch/README.md

@@ -1,6 +1,6 @@
 # storage-elasticsearch
 
-This is is a plugin to the Elasticsearch storage component, which uses
+This is a plugin to the Elasticsearch storage component, which uses
 HTTP by way of [Armeria](https://github.com/line/armeria) and
 [Jackson](https://github.com/FasterXML/jackson). This uses Elasticsearch 5+
 features, but is tested against Elasticsearch 6-7.x.

zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java

@@ -127,7 +127,7 @@ String baseUrl() {
   // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
   static final class ElasticsearchContainer extends GenericContainer<ElasticsearchContainer> {
     ElasticsearchContainer(int majorVersion) {
-      super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":2.23.2"));
+      super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":2.24.3"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }

zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java

@@ -113,7 +113,7 @@ int port() {
   // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
   static final class MySQLContainer extends GenericContainer<MySQLContainer> {
     MySQLContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin-mysql:2.23.2"));
+      super(parse("ghcr.io/openzipkin/zipkin-mysql:2.24.3"));
       if ("true".equals(System.getProperty("docker.skip"))) {
         throw new TestAbortedException("${docker.skip} == true");
       }