From c5a8920a569869063c998d7f9bff74c9bb37cb72 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 21 Sep 2021 13:47:59 -0700 Subject: [PATCH] Use repo scoped ghcr package (#4166) * smoke-test-spring-boot * smoke-test-fake-backend * smoke-test-grpc * smoke-test-play * Fix example distro build * Fix formatting --- .../java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java | 2 +- examples/distro/smoke-tests/build.gradle | 4 ++-- .../test/java/com/example/javaagent/smoketest/SmokeTest.java | 2 +- .../com/example/javaagent/smoketest/SpringBootSmokeTest.java | 4 ++-- .../java/com/example/javaagent/smoketest/IntegrationTest.java | 2 +- .../javaagent/smoketest/SpringBootIntegrationTest.java | 4 ++-- .../groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy | 2 +- .../groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy | 2 +- .../groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy | 2 +- .../groovy/io/opentelemetry/smoketest/PropagationTest.groovy | 4 ++-- .../io/opentelemetry/smoketest/SpringBootSmokeTest.groovy | 2 +- .../smoketest/SpringBootWithSamplingSmokeTest.groovy | 2 +- .../io/opentelemetry/smoketest/LinuxTestContainerManager.java | 2 +- .../smoketest/windows/WindowsTestContainerManager.java | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java b/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java index af9a6c2e42..dff1554a4d 100644 --- a/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java +++ b/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java @@ -29,7 +29,7 @@ public class AgentBenchmark { System.getenv() .getOrDefault( "APP_IMAGE", - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk8-20201204.400701583"); + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk8-20210918.1248928124"); private List> containers; private static final Logger logger = LoggerFactory.getLogger(AgentBenchmark.class); diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle index 49b3cbddc7..39454fae3a 100644 --- a/examples/distro/smoke-tests/build.gradle +++ b/examples/distro/smoke-tests/build.gradle @@ -7,8 +7,8 @@ dependencies { testImplementation("com.fasterxml.jackson.core:jackson-databind:2.11.2") testImplementation("com.google.protobuf:protobuf-java-util:3.12.4") testImplementation("com.squareup.okhttp3:okhttp:3.12.12") - testImplementation("io.opentelemetry:opentelemetry-proto:1.0.0-alpha") - testImplementation("io.opentelemetry:opentelemetry-api:1.0.0") + testImplementation("io.opentelemetry:opentelemetry-proto:1.6.0-alpha") + testImplementation("io.opentelemetry:opentelemetry-api:1.6.0") testImplementation("ch.qos.logback:logback-classic:1.2.3") } 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 c4d24bfec6..8d88b7052e 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 @@ -52,7 +52,7 @@ abstract class SmokeTest { static void setupSpec() { backend = new GenericContainer<>( - "ghcr.io/open-telemetry/java-test-containers:smoke-fake-backend-20210324.684269693") + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20210918.1248928123") .withExposedPorts(8080) .waitingFor(Wait.forHttp("/health").forPort(8080)) .withNetwork(network) diff --git a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java index c33120abb7..3ee4dbe4f2 100644 --- a/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java +++ b/examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java @@ -15,9 +15,9 @@ class SpringBootSmokeTest extends SmokeTest { @Override protected String getTargetImage(int jdk) { - return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk" + return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk" + jdk - + "-20210915.1238472439"; + + "-20210918.1248928124"; } @Test 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 e9945e6787..26f33f86de 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 @@ -57,7 +57,7 @@ abstract class IntegrationTest { static void setupSpec() { backend = new GenericContainer<>( - "ghcr.io/open-telemetry/java-test-containers:smoke-fake-backend-20210324.684269693") + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20210918.1248928123") .withExposedPorts(8080) .waitingFor(Wait.forHttp("/health").forPort(8080)) .withNetwork(network) diff --git a/examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java b/examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java index 3bade1b709..3219339b60 100644 --- a/examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java +++ b/examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java @@ -15,9 +15,9 @@ class SpringBootIntegrationTest extends IntegrationTest { @Override protected String getTargetImage(int jdk) { - return "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk" + return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk" + jdk - + "-20210915.1238472439"; + + "-20210918.1248928124"; } @Test diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy index 7a62d9b700..ac6d8d86e1 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy @@ -21,7 +21,7 @@ import static java.util.stream.Collectors.toSet class GrpcSmokeTest extends SmokeTest { protected String getTargetImage(String jdk) { - "ghcr.io/open-telemetry/java-test-containers:smoke-grpc-jdk$jdk-20210915.1238472435" + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$jdk-20210917.1246635135" } @Unroll diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy index 841c5827ff..051769e059 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy @@ -16,7 +16,7 @@ import java.util.jar.JarFile class NoopApiSmokeTest extends SmokeTest { protected String getTargetImage(String jdk) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439" + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20210918.1248928124" } @Override diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy index 16d6a65d53..76110b0ad7 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy @@ -12,7 +12,7 @@ import spock.lang.IgnoreIf class PlaySmokeTest extends SmokeTest { protected String getTargetImage(String jdk) { - "ghcr.io/open-telemetry/java-test-containers:smoke-play-jdk$jdk-20210915.1238703013" + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk$jdk-20210917.1246460868" } def "play smoke test on JDK #jdk"(int jdk) { diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy index 94198d3aed..d44713952b 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy @@ -15,7 +15,7 @@ abstract class PropagationTest extends SmokeTest { @Override protected String getTargetImage(String jdk) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439" + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20210918.1248928124" } def "Should propagate test"() { @@ -82,7 +82,7 @@ class JaegerPropagationTest extends PropagationTest { class OtTracePropagationTest extends SmokeTest { @Override protected String getTargetImage(String jdk) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439" + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20210918.1248928124" } // OtTracer only propagates lower half of trace ID so we have to mangle the trace IDs similar to diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy index e4f372ab8d..ac971ed1c1 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy @@ -19,7 +19,7 @@ import static java.util.stream.Collectors.toSet class SpringBootSmokeTest extends SmokeTest { protected String getTargetImage(String jdk) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439" + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20210918.1248928124" } @Override diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy index 7b13814e3f..e56181a794 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy @@ -16,7 +16,7 @@ class SpringBootWithSamplingSmokeTest extends SmokeTest { static final int ALLOWED_DEVIATION = 0.1 * NUM_TRIES protected String getTargetImage(String jdk) { - "ghcr.io/open-telemetry/java-test-containers:smoke-springboot-jdk$jdk-20210915.1238472439" + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20210918.1248928124" } @Override 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 0d7b65c10d..9ee75362b2 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java @@ -33,7 +33,7 @@ public class LinuxTestContainerManager extends AbstractTestContainerManager { backend = new GenericContainer<>( DockerImageName.parse( - "ghcr.io/open-telemetry/java-test-containers:smoke-fake-backend-20210611.927888723")) + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20210918.1248928123")) .withExposedPorts(BACKEND_PORT) .waitingFor(Wait.forHttp("/health").forPort(BACKEND_PORT)) .withNetwork(network) diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java index fd770830c4..29ab3fcd16 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java @@ -78,7 +78,7 @@ public class WindowsTestContainerManager extends AbstractTestContainerManager { String backendSuffix = "-windows-20210611.927888723"; String backendImageName = - "ghcr.io/open-telemetry/java-test-containers:smoke-fake-backend" + backendSuffix; + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:20210918.1248928123"; if (!imageExists(backendImageName)) { pullImage(backendImageName); }