From 278cae46674ffadc408070a106371e7b6efaa329 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 20 Sep 2021 20:47:51 -0700 Subject: [PATCH] Don't use collector dev image (#4171) * Update collector config * Revert "Update collector config" This reverts commit 4a76a944af8c85fe57849b5ec0282d5ead412762. * Don't use -dev collector image --- .../test/java/com/example/javaagent/smoketest/SmokeTest.java | 2 +- .../java/com/example/javaagent/smoketest/IntegrationTest.java | 2 +- .../io/opentelemetry/smoketest/LinuxTestContainerManager.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java index 9360909bcd..09efec91d6 100644 --- a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java +++ b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java @@ -62,7 +62,7 @@ abstract class SmokeTest { backend.start(); collector = - new GenericContainer<>("otel/opentelemetry-collector-contrib-dev:latest") + new GenericContainer<>("otel/opentelemetry-collector-contrib:latest") .dependsOn(backend) .withNetwork(network) .withNetworkAliases("collector") diff --git a/examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java b/examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java index af78a179ac..32f5a9532e 100644 --- a/examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java +++ b/examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java @@ -67,7 +67,7 @@ abstract class IntegrationTest { backend.start(); collector = - new GenericContainer<>("otel/opentelemetry-collector-contrib-dev:latest") + new GenericContainer<>("otel/opentelemetry-collector-contrib:latest") .dependsOn(backend) .withNetwork(network) .withNetworkAliases("collector") diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java index cef6063326..7582150923 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java @@ -44,8 +44,7 @@ public class LinuxTestContainerManager extends AbstractTestContainerManager { backend.start(); collector = - new GenericContainer<>( - DockerImageName.parse("otel/opentelemetry-collector-contrib-dev:latest")) + new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:latest")) .dependsOn(backend) .withNetwork(network) .withNetworkAliases(COLLECTOR_ALIAS)