Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bumps to latest test docker images #3791

Merged
merged 1 commit into from
Feb 4, 2025
Merged

bumps to latest test docker images #3791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions benchmarks/src/test/java/zipkin2/server/ServerIntegratedBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class ServerIntegratedBenchmark {

@Test void elasticsearch() throws Exception {
GenericContainer<?> elasticsearch =
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:3.4.2"))
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-elasticsearch7:3.4.3"))
.withNetwork(Network.SHARED)
.withNetworkAliases("elasticsearch")
.withLabel("name", "elasticsearch")
Expand All @@ -95,7 +95,7 @@ class ServerIntegratedBenchmark {

@Test void cassandra3() throws Exception {
GenericContainer<?> cassandra =
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.2"))
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.3"))
.withNetwork(Network.SHARED)
.withNetworkAliases("cassandra")
.withLabel("name", "cassandra")
Expand All @@ -109,7 +109,7 @@ class ServerIntegratedBenchmark {

@Test void mysql() throws Exception {
GenericContainer<?> mysql =
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.2"))
new GenericContainer<>(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.3"))
.withNetwork(Network.SHARED)
.withNetworkAliases("mysql")
.withLabel("name", "mysql")
Expand Down
2 changes: 1 addition & 1 deletion zipkin-collector/activemq/src/test/java/zipkin2/collector/activemq/ActiveMQExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-activemq:3.4.3"));
withExposedPorts(ACTIVEMQ_PORT);
waitStrategy = Wait.forListeningPorts(ACTIVEMQ_PORT);
withStartupTimeout(Duration.ofSeconds(60));
Expand Down
2 changes: 1 addition & 1 deletion zipkin-collector/kafka/src/test/java/zipkin2/collector/kafka/KafkaExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,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:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-kafka:3.4.3"));
waitStrategy = Wait.forHealthcheck();
// 19092 is for connections from the Docker host and needs to be used as a fixed port.
// TODO: someone who knows Kafka well, make ^^ comment better!
Expand Down
2 changes: 1 addition & 1 deletion zipkin-collector/rabbitmq/src/test/java/zipkin2/collector/rabbitmq/RabbitMQExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,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:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:3.4.3"));
withExposedPorts(RABBIT_PORT);
waitStrategy = Wait.forLogMessage(".*Server startup complete.*", 1);
withStartupTimeout(Duration.ofSeconds(60));
Expand Down
2 changes: 1 addition & 1 deletion zipkin-server/src/test/java/zipkin2/server/internal/eureka/BaseITZipkinEureka.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static final class EurekaContainer extends GenericContainer<EurekaContainer> {
static final int EUREKA_PORT = 8761;

EurekaContainer(Map<String, String> env) {
super(parse("ghcr.io/openzipkin/zipkin-eureka:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-eureka:3.4.3"));
withEnv(env);
withExposedPorts(EUREKA_PORT);
waitStrategy = Wait.forHealthcheck();
Expand Down
2 changes: 1 addition & 1 deletion zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/CassandraContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class CassandraContainer extends GenericContainer<CassandraContainer> {
CqlSession globalSession;

CassandraContainer() {
super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-cassandra:3.4.3"));
addExposedPort(9042);
waitStrategy = Wait.forHealthcheck();
withLogConsumer(new Slf4jLogConsumer(LOGGER));
Expand Down
2 changes: 1 addition & 1 deletion ...elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ElasticsearchExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ElasticsearchExtension extends ElasticsearchBaseExtension {
// 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 + ":3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-elasticsearch" + majorVersion + ":3.4.3"));
addExposedPort(9200);
waitStrategy = Wait.forHealthcheck();
withLogConsumer(new Slf4jLogConsumer(LOGGER));
Expand Down
2 changes: 1 addition & 1 deletion ...ge/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/OpenSearchExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class OpenSearchExtension extends ElasticsearchBaseExtension {
// mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
static final class OpenSearchContainer extends GenericContainer<OpenSearchContainer> {
OpenSearchContainer(int majorVersion) {
super(parse("ghcr.io/openzipkin/zipkin-opensearch" + majorVersion + ":3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-opensearch" + majorVersion + ":3.4.3"));
addExposedPort(9200);
waitStrategy = Wait.forHealthcheck();
withLogConsumer(new Slf4jLogConsumer(LOGGER));
Expand Down
2 changes: 1 addition & 1 deletion zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/MySQLExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,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:3.4.2"));
super(parse("ghcr.io/openzipkin/zipkin-mysql:3.4.3"));
addExposedPort(3306);
waitStrategy = Wait.forHealthcheck();
withLogConsumer(new Slf4jLogConsumer(LOGGER));
Expand Down
Loading