File tree Expand file tree Collapse file tree 3 files changed +16
-4
lines changed
dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base
dd-smoke-tests/custom-systemloader/src/test/groovy/datadog/smoketest
utils/test-utils/src/main/groovy/datadog/trace/test/util Expand file tree Collapse file tree 3 files changed +16
-4
lines changed Original file line number Diff line number Diff line change @@ -1748,6 +1748,7 @@ abstract class HttpServerTest<SERVER> extends WithHttpServer<SERVER> {
17481748 requestBodyNoStreaming ? IG_BODY_CONVERTED_HEADER : IG_BODY_END_BLOCK_HEADER
17491749 }
17501750
1751+ @Flaky (value = " APPSEC-56822" , suites = [" PlayScalaAsyncServerTest" ])
17511752 def ' user blocking' () {
17521753 setup :
17531754 assumeTrue(testUserBlocking())
Original file line number Diff line number Diff line change 11package datadog.smoketest
22
3+ import datadog.trace.test.util.Flaky
4+ import datadog.trace.test.util.Predicates.IBM
5+
36import static java.util.concurrent.TimeUnit.SECONDS
47
58class CustomSystemLoaderSmokeTest extends AbstractSmokeTest {
@@ -27,6 +30,7 @@ class CustomSystemLoaderSmokeTest extends AbstractSmokeTest {
2730 return processBuilder
2831 }
2932
33+ @Flaky (value = ' Race condition with IMB. Check APMAPI-1194' , condition = IBM )
3034 def " resource types loaded by custom system class-loader are transformed" () {
3135 when :
3236 testedProcess. waitFor(TIMEOUT_SECS , SECONDS )
Original file line number Diff line number Diff line change @@ -7,14 +7,21 @@ public abstract class Predicates {
77
88 private Predicates () {}
99
10- public static final class IBM8 implements Predicate <String > {
11- private static final String VENDOR_STRING = "IBM" ;
10+ public static class IBM implements Predicate <String > {
11+ private static final String IBM_VENDOR_STRING = "IBM" ;
12+
13+ @ Override
14+ public boolean test (String s ) {
15+ return System .getProperty ("java.vendor" , "" ).contains (IBM_VENDOR_STRING );
16+ }
17+ }
18+
19+ public static final class IBM8 extends IBM {
1220 private static final BigDecimal VERSION = new BigDecimal ("1.8" );
1321
1422 @ Override
1523 public boolean test (final String spec ) {
16- final String vendor = System .getProperty ("java.vendor" , "" );
17- if (!vendor .contains (VENDOR_STRING )) {
24+ if (!super .test (spec )) {
1825 return false ;
1926 }
2027 final BigDecimal version =
You can’t perform that action at this time.
0 commit comments