open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Trask Stalnaker 2021-09-21 13:47:59 -07:00 committed by GitHub
parent 0b9d8c37a5
commit c5a8920a56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java
View File

@ -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<GenericContainer<?>> containers;
private static final Logger logger = LoggerFactory.getLogger(AgentBenchmark.class);

4
examples/distro/smoke-tests/build.gradle
View File

@ -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")
}

2
examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java
View File

@ -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)

4
examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java
View File

@ -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

2
examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java
View File

@ -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)

4
examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java
View File

@ -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

2
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy
View File

@ -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

2
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/NoopApiSmokeTest.groovy
View File

@ -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

2
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy
View File

@ -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) {

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PropagationTest.groovy
View File

@ -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

2
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
View File

@ -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

2
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy
View File

@ -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

2
smoke-tests/src/test/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java
View File

@ -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)

2
smoke-tests/src/test/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java
View File

@ -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);
}