Get rid of the predicates class

manuel-alvarez-alvarez · manuel-alvarez-alvarez · commit c34ff34e6c42 · 2025-11-27T11:36:08.000+01:00
diff --git a/components/environment/src/main/java/datadog/environment/JavaVirtualMachine.java b/components/environment/src/main/java/datadog/environment/JavaVirtualMachine.java
@@ -108,8 +108,12 @@ public static boolean isJ9() {
     return SystemProperties.getOrDefault("java.vm.name", "").contains("J9");
   }
 
+  public static boolean isIbm() {
+    return runtime.vendor.contains("IBM");
+  }
+
   public static boolean isIbm8() {
-    return isJavaVersion(8) && runtime.vendor.contains("IBM");
+    return isIbm() && isJavaVersion(8);
   }
 
   public static boolean isGraalVM() {
diff --git a/dd-smoke-tests/custom-systemloader/src/test/groovy/datadog/smoketest/CustomSystemLoaderSmokeTest.groovy b/dd-smoke-tests/custom-systemloader/src/test/groovy/datadog/smoketest/CustomSystemLoaderSmokeTest.groovy
@@ -1,7 +1,7 @@
 package datadog.smoketest
 
+import datadog.environment.JavaVirtualMachine
 import datadog.trace.test.util.Flaky
-import datadog.trace.test.util.Predicates.IBM
 
 import static java.util.concurrent.TimeUnit.SECONDS
 
@@ -30,7 +30,7 @@ class CustomSystemLoaderSmokeTest extends AbstractSmokeTest {
     return processBuilder
   }
 
-  @Flaky(value = 'Race condition with IMB. Check APMAPI-1194', condition = IBM)
+  @Flaky(value = 'Race condition with IMB. Check APMAPI-1194', condition = () -> JavaVirtualMachine.isIbm())
   def "resource types loaded by custom system class-loader are transformed"() {
     when:
     testedProcess.waitFor(TIMEOUT_SECS, SECONDS)
@@ -39,7 +39,8 @@ class CustomSystemLoaderSmokeTest extends AbstractSmokeTest {
     testedProcess.exitValue() == 0
     int loadedResources = 0
     int transformedResources = 0
-    forEachLogLine { String it ->
+    forEachLogLine {
+      String it ->
       if (it =~ /Loading sample.app.Resource[$]Test[1-3] from TestLoader/) {
         loadedResources++
       }
diff --git a/dd-smoke-tests/dynamic-config/build.gradle b/dd-smoke-tests/dynamic-config/build.gradle
@@ -13,6 +13,7 @@ dependencies {
   implementation libs.slf4j
 
   testImplementation project(':dd-smoke-tests')
+  testImplementation project(':utils:test-utils')
 }
 
 tasks.withType(Test).configureEach {
diff --git a/dd-smoke-tests/dynamic-config/src/test/groovy/datadog/smoketest/AppSecActivationSmokeTest.groovy b/dd-smoke-tests/dynamic-config/src/test/groovy/datadog/smoketest/AppSecActivationSmokeTest.groovy
@@ -1,12 +1,11 @@
 package datadog.smoketest
 
+import datadog.environment.JavaVirtualMachine
 import datadog.remoteconfig.Capabilities
 import datadog.remoteconfig.Product
 import datadog.smoketest.dynamicconfig.AppSecApplication
 import datadog.trace.test.util.Flaky
 
-import static datadog.trace.test.util.Predicates.ORACLE8
-
 class AppSecActivationSmokeTest extends AbstractSmokeTest {
 
   @Override
@@ -27,14 +26,17 @@ class AppSecActivationSmokeTest extends AbstractSmokeTest {
     processBuilder.directory(new File(buildDirectory))
   }
 
-  @Flaky(value = "Telemetry product change event flakes in oracle8", condition = ORACLE8)
+  @Flaky(value = "Telemetry product change event flakes in oracle8", condition = () ->JavaVirtualMachine.isOracleJDK8())
   void 'test activation via RC workflow'() {
     given:
     final asmRuleProducts = [Product.ASM, Product.ASM_DD, Product.ASM_DATA]
 
     when: 'appsec is enabled but inactive'
-    final request = waitForRcClientRequest {req ->
-      decodeProducts(req).find { asmRuleProducts.contains(it) } == null
+    final request = waitForRcClientRequest {
+      req ->
+      decodeProducts(req).find {
+        asmRuleProducts.contains(it)
+      } == null
     }
     final capabilities = decodeCapabilities(request)
 
@@ -48,23 +50,28 @@ class AppSecActivationSmokeTest extends AbstractSmokeTest {
     then: 'we should receive a product change for appsec'
     waitForTelemetryFlat {
       final configurations = (List<Map<String, Object>>) it?.payload?.configuration ?: []
-      final enabledConfig = configurations.find { it.name == 'appsec_enabled' }
+      final enabledConfig = configurations.find {
+        it.name == 'appsec_enabled'
+      }
       if (!enabledConfig) {
         return false
       }
       return enabledConfig.value == 'true' && enabledConfig .origin == 'remote_config'
     }
 
     and: 'we should have set the capabilities for ASM rules and data'
-    final newRequest = waitForRcClientRequest {req ->
+    final newRequest = waitForRcClientRequest {
+      req ->
       decodeProducts(req).containsAll(asmRuleProducts)
     }
     final newCapabilities = decodeCapabilities(newRequest)
     assert hasCapability(newCapabilities, Capabilities.CAPABILITY_ASM_CUSTOM_RULES)
   }
 
   private static Set<Product> decodeProducts(final Map<String, Object> request) {
-    return request.client.products.collect { Product.valueOf(it)}
+    return request.client.products.collect {
+      Product.valueOf(it)
+    }
   }
 
   private static long decodeCapabilities(final Map<String, Object> request) {
diff --git a/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy b/dd-smoke-tests/jersey-2/src/test/groovy/datadog/smoketest/Jersey2SmokeTest.groovy
@@ -3,7 +3,6 @@ package datadog.smoketest
 import datadog.environment.JavaVirtualMachine
 import datadog.trace.api.config.IastConfig
 import datadog.trace.test.util.Flaky
-import datadog.trace.test.util.Predicates.IBM8
 
 import static datadog.trace.api.iast.IastContext.Mode.GLOBAL
 
@@ -35,7 +34,7 @@ class Jersey2SmokeTest extends AbstractJerseySmokeTest {
     ]
   }
 
-  @Flaky(value = 'global context is flaky under IBM8', condition = IBM8)
+  @Flaky(value = 'global context is flaky under IBM8', condition = () -> JavaVirtualMachine.isIbm8())
   static class WithGlobalContext extends Jersey2SmokeTest {
     @Override
     protected List<String> iastJvmOpts() {
diff --git a/dd-smoke-tests/jersey-3/src/test/groovy/datadog/smoketest/Jersey3SmokeTest.groovy b/dd-smoke-tests/jersey-3/src/test/groovy/datadog/smoketest/Jersey3SmokeTest.groovy
@@ -1,6 +1,6 @@
 package datadog.smoketest
 
-import datadog.trace.test.util.Predicates.IBM8
+import datadog.environment.JavaVirtualMachine
 import datadog.trace.test.util.Flaky
 
 import static datadog.trace.api.config.IastConfig.*
@@ -31,7 +31,7 @@ class Jersey3SmokeTest extends AbstractJerseySmokeTest {
     ]
   }
 
-  @Flaky(value = 'global context is flaky under IBM8', condition = IBM8)
+  @Flaky(value = 'global context is flaky under IBM8', condition = () -> JavaVirtualMachine.isIbm8())
   static class WithGlobalContext extends Jersey3SmokeTest {
     @Override
     protected List<String> iastJvmOpts() {
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
@@ -2,14 +2,14 @@ package datadog.smoketest
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
+import datadog.environment.JavaVirtualMachine
 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
 
 /**
@@ -256,7 +256,7 @@ abstract class LogInjectionSmokeTest extends AbstractSmokeTest {
     return unmangled.split(" ")[1..2]
   }
 
-  @Flaky(condition = IBM8)
+  @Flaky(condition = () -> JavaVirtualMachine.isIbm8())
   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
@@ -1,9 +1,8 @@
 package datadog.smoketest
 
+import datadog.environment.JavaVirtualMachine
 import datadog.trace.test.util.Flaky
 
-import static datadog.trace.test.util.Predicates.IBM
-
 class SampleTraceSmokeTest extends AbstractSmokeTest {
 
   @Override
@@ -25,7 +24,7 @@ class SampleTraceSmokeTest extends AbstractSmokeTest {
     processBuilder.directory(new File(buildDirectory))
   }
 
-  @Flaky(condition = IBM)
+  @Flaky(condition = () -> JavaVirtualMachine.isIbm())
   def 'sample traces are sent'() {
     when:
     waitForTraceCount(10)
diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/src/test/groovy/IastSpringBootSmokeTest.groovy b/dd-smoke-tests/spring-boot-2.6-webmvc/src/test/groovy/IastSpringBootSmokeTest.groovy
@@ -1,13 +1,13 @@
+import datadog.environment.JavaVirtualMachine
 import datadog.smoketest.AbstractIastSpringBootTest
 import datadog.trace.api.config.IastConfig
-import datadog.trace.test.util.Predicates.IBM8
 import datadog.trace.test.util.Flaky
 
 import static datadog.trace.api.iast.IastContext.Mode.GLOBAL
 
 class IastSpringBootSmokeTest extends AbstractIastSpringBootTest {
 
-  @Flaky(value = 'global context is flaky under IBM8', condition = IBM8)
+  @Flaky(value = 'global context is flaky under IBM8', condition = () -> JavaVirtualMachine.isIbm8())
   static class WithGlobalContext extends IastSpringBootSmokeTest {
     @Override
     protected List<String> iastJvmOpts() {
diff --git a/dd-smoke-tests/springboot/src/test/groovy/datadog/smoketest/IastSpringBootSmokeTest.groovy b/dd-smoke-tests/springboot/src/test/groovy/datadog/smoketest/IastSpringBootSmokeTest.groovy
@@ -1,7 +1,7 @@
 package datadog.smoketest
 
+import datadog.environment.JavaVirtualMachine
 import datadog.trace.api.config.IastConfig
-import datadog.trace.test.util.Predicates.IBM8
 import datadog.trace.test.util.Flaky
 import groovy.transform.CompileDynamic
 import okhttp3.Request
@@ -54,7 +54,7 @@ class IastSpringBootSmokeTest extends AbstractIastSpringBootTest {
     }
   }
 
-  @Flaky(value = 'global context is flaky under IBM8', condition = IBM8)
+  @Flaky(value = 'global context is flaky under IBM8', condition = () -> JavaVirtualMachine.isIbm8())
   static class WithGlobalContext extends IastSpringBootSmokeTest {
     @Override
     protected List<String> iastJvmOpts() {
diff --git a/utils/test-utils/src/main/groovy/datadog/trace/test/util/FlakySpockExtension.groovy b/utils/test-utils/src/main/groovy/datadog/trace/test/util/FlakySpockExtension.groovy
@@ -92,11 +92,20 @@ class FlakySpockExtension extends AbstractGlobalExtension {
     return "true" == System.getProperty(RUN_FLAKY_TESTS_KEY)
   }
 
-  private static boolean isFlakySpec(final NodeInfo node, final Class<? extends Predicate<String>> condition) {
+  private static boolean isFlakySpec(final NodeInfo node, final Class<?> condition) {
     if (condition == null || condition === Flaky.True) {
       return true
     }
-    final closure = condition.newInstance()
-    return closure.test(node.name)
+    boolean isFlaky
+    if (Closure.isAssignableFrom(condition)) {
+      // Invoke the closure without owner or this, also the spec parameter is captured by the groovy compiler
+      // so we don't need to pass it along
+      final closure = condition.newInstance(null, null) as Closure<Boolean>
+      isFlaky = closure.doCall()
+    } else {
+      final closure = condition.newInstance() as Predicate<String>
+      isFlaky = closure.test(node.name)
+    }
+    return isFlaky
   }
 }
diff --git a/utils/test-utils/src/main/groovy/datadog/trace/test/util/Predicates.java b/utils/test-utils/src/main/groovy/datadog/trace/test/util/Predicates.java

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,12 @@ public static boolean isJ9() {`
`108`	`108`	`return SystemProperties.getOrDefault("java.vm.name", "").contains("J9");`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ public static boolean isIbm() {`
	`112`	`+ return runtime.vendor.contains("IBM");`
	`113`	`+ }`
	`114`	`+`
`111`	`115`	`public static boolean isIbm8() {`
`112`		`- return isJavaVersion(8) && runtime.vendor.contains("IBM");`
	`116`	`+ return isIbm() && isJavaVersion(8);`
`113`	`117`	`}`
`114`	`118`
`115`	`119`	`public static boolean isGraalVM() {`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ dependencies {`
`13`	`13`	`implementation libs.slf4j`
`14`	`14`
`15`	`15`	`testImplementation project(':dd-smoke-tests')`
	`16`	`+ testImplementation project(':utils:test-utils')`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`tasks.withType(Test).configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ package datadog.smoketest`
`3`	`3`	`import datadog.environment.JavaVirtualMachine`
`4`	`4`	`import datadog.trace.api.config.IastConfig`
`5`	`5`	`import datadog.trace.test.util.Flaky`
`6`		`-import datadog.trace.test.util.Predicates.IBM8`
`7`	`6`
`8`	`7`	`import static datadog.trace.api.iast.IastContext.Mode.GLOBAL`
`9`	`8`
`@@ -35,7 +34,7 @@ class Jersey2SmokeTest extends AbstractJerseySmokeTest {`
`35`	`34`	`]`
`36`	`35`	`}`
`37`	`36`
`38`		`- @Flaky(value = 'global context is flaky under IBM8', condition = IBM8)`
	`37`	`+ @Flaky(value = 'global context is flaky under IBM8', condition = () -> JavaVirtualMachine.isIbm8())`
`39`	`38`	`static class WithGlobalContext extends Jersey2SmokeTest {`
`40`	`39`	`@Override`
`41`	`40`	`protected List<String> iastJvmOpts() {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package datadog.smoketest`
`2`	`2`
`3`		`-import datadog.trace.test.util.Predicates.IBM8`
	`3`	`+import datadog.environment.JavaVirtualMachine`
`4`	`4`	`import datadog.trace.test.util.Flaky`
`5`	`5`
`6`	`6`	`import static datadog.trace.api.config.IastConfig.*`
`@@ -31,7 +31,7 @@ class Jersey3SmokeTest extends AbstractJerseySmokeTest {`
`31`	`31`	`]`
`32`	`32`	`}`
`33`	`33`
`34`		`- @Flaky(value = 'global context is flaky under IBM8', condition = IBM8)`
	`34`	`+ @Flaky(value = 'global context is flaky under IBM8', condition = () -> JavaVirtualMachine.isIbm8())`
`35`	`35`	`static class WithGlobalContext extends Jersey3SmokeTest {`
`36`	`36`	`@Override`
`37`	`37`	`protected List<String> iastJvmOpts() {`