diff --git a/dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy b/dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy index e36b922ab78..f1f8211f0c6 100644 --- a/dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy +++ b/dd-smoke-tests/log-injection/src/test/groovy/datadog/smoketest/LogInjectionSmokeTest.groovy @@ -3,11 +3,13 @@ package datadog.smoketest import com.squareup.moshi.Moshi import com.squareup.moshi.Types import datadog.trace.api.config.GeneralConfig +import datadog.trace.test.util.Flaky import spock.lang.AutoCleanup import spock.lang.Shared import static datadog.trace.api.config.TraceInstrumentationConfig.TRACE_128_BIT_TRACEID_LOGGING_ENABLED import static datadog.trace.api.config.TracerConfig.TRACE_128_BIT_TRACEID_GENERATION_ENABLED +import static datadog.trace.test.util.Predicates.IBM8 import static java.util.concurrent.TimeUnit.SECONDS /** @@ -254,6 +256,7 @@ abstract class LogInjectionSmokeTest extends AbstractSmokeTest { return unmangled.split(" ")[1..2] } + @Flaky(condition = IBM8) def "check raw file injection"() { when: def count = waitForTraceCount(2) diff --git a/dd-smoke-tests/sample-trace/src/test/groovy/datadog/smoketest/SampleTraceSmokeTest.groovy b/dd-smoke-tests/sample-trace/src/test/groovy/datadog/smoketest/SampleTraceSmokeTest.groovy index cab3fa97596..e7ee1d7211d 100644 --- a/dd-smoke-tests/sample-trace/src/test/groovy/datadog/smoketest/SampleTraceSmokeTest.groovy +++ b/dd-smoke-tests/sample-trace/src/test/groovy/datadog/smoketest/SampleTraceSmokeTest.groovy @@ -1,5 +1,9 @@ package datadog.smoketest +import datadog.trace.test.util.Flaky + +import static datadog.trace.test.util.Predicates.IBM8 + class SampleTraceSmokeTest extends AbstractSmokeTest { @Override @@ -21,6 +25,7 @@ class SampleTraceSmokeTest extends AbstractSmokeTest { processBuilder.directory(new File(buildDirectory)) } + @Flaky(condition = IBM8) def 'sample traces are sent'() { when: waitForTraceCount(10)