diff --git a/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java b/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java index 86793d54cff..b2878d39700 100644 --- a/benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java +++ b/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)) diff --git a/docker/examples/docker-compose-prometheus.yml b/docker/examples/docker-compose-prometheus.yml index fa63a9a4923..e1cd1559266 100644 --- a/docker/examples/docker-compose-prometheus.yml +++ b/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 diff --git a/docker/test-images/zipkin-elasticsearch6/README.md b/docker/test-images/zipkin-elasticsearch6/README.md index 03da0c34488..7ea2483ab22 100644 --- a/docker/test-images/zipkin-elasticsearch6/README.md +++ b/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" ``` diff --git a/pom.xml b/pom.xml index 06a7cfd5664..b060eafd823 100755 --- a/pom.xml +++ b/pom.xml @@ -86,18 +86,18 @@ 4.13.2 - 5.9.2 - 3.8.0 - 3.18.1 - 4.0.3 - 1.3 - 1.19.0 - 4.9.0 + 5.10.1 + 5.8.0 + 3.24.2 + 4.2.0 + 2.2 + 1.19.3 + 4.12.0 5.0.0-alpha.11 - 5.0.3 + 5.5.0 3.0.2 - 2.8.9 + 2.10.1 ${project.build.directory}/test/proto