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

Always pull ghrc.io/open-telemetry/opentelemetry-java/* images (#4656) 

* Always pull ghrc.io/open-telemetry/opentelemetry-java/* images

* Unused import

* Add error logging to collector

* unused imports

* spot

* revert error logging
This commit is contained in:
jack-berg 2022-08-07 15:56:07 -05:00 committed by GitHub
parent 35680960cb
commit 5def2f7fb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftIntegrationTest.java
View File

@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.images.PullPolicy;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@ -46,6 +47,7 @@ class JaegerThriftIntegrationTest {
@Container
public static GenericContainer<?> jaegerContainer =
new GenericContainer<>("ghcr.io/open-telemetry/opentelemetry-java/jaeger:1.32")
.withImagePullPolicy(PullPolicy.alwaysPull())
.withExposedPorts(THRIFT_HTTP_PORT, THRIFT_UDP_PORT, QUERY_PORT, HEALTH_PORT)
.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("jaeger")))
.waitingFor(Wait.forHttp("/").forPort(HEALTH_PORT));

2
exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerIntegrationTest.java
View File

@ -24,6 +24,7 @@ import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.images.PullPolicy;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@ -40,6 +41,7 @@ class JaegerIntegrationTest {
@Container
public static GenericContainer<?> jaegerContainer =
new GenericContainer<>("ghcr.io/open-telemetry/opentelemetry-java/jaeger:1.32")
.withImagePullPolicy(PullPolicy.alwaysPull())
.withExposedPorts(COLLECTOR_PORT, QUERY_PORT, HEALTH_PORT)
.waitingFor(Wait.forHttp("/").forPort(HEALTH_PORT));

2
integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java
View File

@ -87,6 +87,7 @@ import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.images.PullPolicy;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile;
@ -132,6 +133,7 @@ abstract class OtlpExporterIntegrationTest {
collector =
new GenericContainer<>(DockerImageName.parse(COLLECTOR_IMAGE))
.withImagePullPolicy(PullPolicy.alwaysPull())
.withEnv("LOGGING_EXPORTER_LOG_LEVEL", "INFO")
.withCopyFileToContainer(
MountableFile.forHostPath(serverTls.certificateFile().toPath(), 0555),

3
perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java
View File

@ -48,6 +48,7 @@ import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.images.PullPolicy;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.utility.DockerImageName;
@ -69,6 +70,7 @@ public class OtlpPipelineStressTest {
public static GenericContainer<?> collectorContainer =
new GenericContainer<>(
DockerImageName.parse("ghcr.io/open-telemetry/opentelemetry-java/otel-collector"))
.withImagePullPolicy(PullPolicy.alwaysPull())
.withNetwork(network)
.withNetworkAliases("otel-collector")
.withExposedPorts(OTLP_RECEIVER_PORT)
@ -94,6 +96,7 @@ public class OtlpPipelineStressTest {
public static GenericContainer<?> toxiproxyContainer =
new GenericContainer<>(
DockerImageName.parse("ghcr.io/open-telemetry/opentelemetry-java/toxiproxy"))
.withImagePullPolicy(PullPolicy.alwaysPull())
.withNetwork(network)
.withNetworkAliases("toxiproxy")
.withExposedPorts(TOXIPROXY_CONTROL_PORT, COLLECTOR_PROXY_PORT)

2
sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerIntegrationTest.java
View File

@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.images.PullPolicy;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
@ -36,6 +37,7 @@ class JaegerRemoteSamplerIntegrationTest {
@Container
public static GenericContainer<?> jaegerContainer =
new GenericContainer<>("ghcr.io/open-telemetry/opentelemetry-java/jaeger:1.32")
.withImagePullPolicy(PullPolicy.alwaysPull())
.withCommand("--sampling.strategies-file=/sampling.json")
.withExposedPorts(COLLECTOR_PORT, QUERY_PORT, HEALTH_PORT)
.waitingFor(Wait.forHttp("/").forPort(HEALTH_PORT))