diff --git a/benchmark-e2e/src/main/resources/collector-config.yml b/benchmark-e2e/src/main/resources/collector-config.yml index 8fe4becd60..9a580c6c53 100644 --- a/benchmark-e2e/src/main/resources/collector-config.yml +++ b/benchmark-e2e/src/main/resources/collector-config.yml @@ -10,7 +10,6 @@ exporters: processors: batch: - queued_retry: extensions: health_check: diff --git a/examples/distro/smoke-tests/src/test/resources/otel.yaml b/examples/distro/smoke-tests/src/test/resources/otel.yaml index 3d1bbf0e58..a25201f896 100644 --- a/examples/distro/smoke-tests/src/test/resources/otel.yaml +++ b/examples/distro/smoke-tests/src/test/resources/otel.yaml @@ -13,7 +13,6 @@ receivers: processors: batch: - queued_retry: exporters: logging: @@ -26,7 +25,7 @@ service: pipelines: traces: receivers: [otlp, zipkin] - processors: [batch, queued_retry] + processors: [batch] exporters: [logging, otlp] extensions: [health_check, pprof, zpages] diff --git a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SmokeTest.groovy b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SmokeTest.groovy index 4a0616cefd..81fe5864ec 100644 --- a/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SmokeTest.groovy +++ b/smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SmokeTest.groovy @@ -26,6 +26,7 @@ import org.testcontainers.containers.output.Slf4jLogConsumer import org.testcontainers.containers.output.ToStringConsumer import org.testcontainers.containers.wait.strategy.Wait import org.testcontainers.containers.wait.strategy.WaitStrategy +import org.testcontainers.images.PullPolicy import org.testcontainers.utility.MountableFile import spock.lang.Shared import spock.lang.Specification @@ -73,6 +74,7 @@ abstract class SmokeTest extends Specification { .waitingFor(Wait.forHttp("/health").forPort(8080)) .withNetwork(network) .withNetworkAliases("backend") + .withImagePullPolicy(PullPolicy.alwaysPull()) .withLogConsumer(new Slf4jLogConsumer(logger)) backend.start() @@ -81,6 +83,7 @@ abstract class SmokeTest extends Specification { .withNetwork(network) .withNetworkAliases("collector") .withLogConsumer(new Slf4jLogConsumer(logger)) + .withImagePullPolicy(PullPolicy.alwaysPull()) .withCopyFileToContainer(MountableFile.forClasspathResource("/otel.yaml"), "/etc/otel.yaml") .withCommand("--config /etc/otel.yaml") collector.start() @@ -103,6 +106,7 @@ abstract class SmokeTest extends Specification { .withEnv("OTEL_BSP_SCHEDULE_DELAY_MILLIS", "10") .withEnv("OTEL_EXPORTER_OTLP_ENDPOINT", "collector:55680") .withEnv("OTEL_EXPORTER_OTLP_INSECURE", "true") + .withImagePullPolicy(PullPolicy.alwaysPull()) .withEnv(extraEnv) customizeContainer(target) diff --git a/smoke-tests/src/test/resources/otel.yaml b/smoke-tests/src/test/resources/otel.yaml index 95f02f9dba..8d38db49a8 100644 --- a/smoke-tests/src/test/resources/otel.yaml +++ b/smoke-tests/src/test/resources/otel.yaml @@ -16,7 +16,6 @@ receivers: processors: batch: - queued_retry: exporters: logging: @@ -29,7 +28,7 @@ service: pipelines: traces: receivers: [otlp, zipkin, jaeger] - processors: [batch, queued_retry] + processors: [batch] exporters: [logging, otlp] extensions: [health_check, pprof, zpages]