Skip to content

Commit b03c6f2

Browse files
committed
Pin Docker images used in tests to specific versions
Replaces :latest / unpinned tags with specific versions to prevent silent CI regressions from upstream image changes (e.g. RabbitMQ 4.3 broke Spring AnonymousQueue handling).
1 parent b13eb10 commit b03c6f2

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

  • instrumentation
    • gwt-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/gwt/v2_0
    • jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1
    • rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/v2_7
    • spring
      • spring-integration-4.1/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/integration/v4_1
      • spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0
    • spymemcached-2.12/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spymemcached/v2_12
    • vaadin-14.2/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/v14_2

instrumentation/gwt-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/gwt/v2_0/GwtTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static void setup() throws Exception {
8080
Testcontainers.exposeHostPorts(port);
8181

8282
browser =
83-
new BrowserWebDriverContainer("selenium/standalone-chrome")
83+
new BrowserWebDriverContainer("selenium/standalone-chrome:4.43.0")
8484
.withLogConsumer(new Slf4jLogConsumer(logger));
8585
cleanup.deferAfterAll(browser::stop);
8686
browser.start();

instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ abstract class AbstractJms1Test {
6464
@BeforeAll
6565
static void setUp() throws JMSException {
6666
broker =
67-
new GenericContainer<>("rmohr/activemq:latest")
67+
new GenericContainer<>("apache/activemq-classic:5.19.2")
6868
.withExposedPorts(61616, 8161)
6969
.withLogConsumer(new Slf4jLogConsumer(logger));
7070
broker.start();

instrumentation/rabbitmq-2.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rabbitmq/v2_7/AbstractRabbitMqTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static <T> T experimental(T value) {
4242
@BeforeAll
4343
static void startRabbit() throws UnknownHostException {
4444
rabbitMqContainer =
45-
new GenericContainer<>("rabbitmq:latest")
45+
new GenericContainer<>("rabbitmq:4.2")
4646
.withExposedPorts(5672)
4747
.withLogConsumer(new Slf4jLogConsumer(logger))
4848
.waitingFor(Wait.forLogMessage(".*Server startup complete.*", 1))

instrumentation/spring/spring-integration-4.1/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/integration/v4_1/RabbitExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public <T> T getBean(String name, Class<T> requiredType) {
4848
@Override
4949
public void beforeEach(ExtensionContext context) {
5050
rabbitMqContainer =
51-
new GenericContainer<>("rabbitmq:latest")
51+
new GenericContainer<>("rabbitmq:4.2")
5252
.withExposedPorts(5672)
5353
.waitingFor(Wait.forLogMessage(".*Server startup complete.*", 1))
5454
.withStartupTimeout(Duration.ofMinutes(2));

instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/rabbit/v1_0/SpringRabbitMqTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class SpringRabbitMqTest {
7373
@BeforeAll
7474
static void setUp() throws UnknownHostException {
7575
rabbitMqContainer =
76-
new GenericContainer<>("rabbitmq:latest")
76+
new GenericContainer<>("rabbitmq:4.2")
7777
.withExposedPorts(5672)
7878
.waitingFor(Wait.forLogMessage(".*Server startup complete.*", 1))
7979
.withStartupTimeout(Duration.ofMinutes(2));

instrumentation/spymemcached-2.12/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spymemcached/v2_12/SpymemcachedTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class SpymemcachedTest {
8282
@BeforeAll
8383
static void setUp() {
8484
memcachedContainer =
85-
new GenericContainer<>("memcached:latest")
85+
new GenericContainer<>("memcached:1.6.41")
8686
.withExposedPorts(11211)
8787
.withStartupTimeout(Duration.ofMinutes(2));
8888
memcachedContainer.start();

instrumentation/vaadin-14.2/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/v14_2/AbstractVaadinTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected void setup() throws URISyntaxException {
8080
Testcontainers.exposeHostPorts(port);
8181

8282
browser =
83-
new BrowserWebDriverContainer("selenium/standalone-chrome")
83+
new BrowserWebDriverContainer("selenium/standalone-chrome:4.43.0")
8484
.withLogConsumer(new Slf4jLogConsumer(logger));
8585
browser.start();
8686

0 commit comments

Comments
 (0)