Improve Test Optimization's smoke tests clarity (#10028)

Author: daniel-mohedano

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy

@@ -4,6 +4,8 @@ import datadog.trace.api.Config
 import datadog.trace.api.civisibility.config.TestFQN
 import datadog.trace.api.config.CiVisibilityConfig
 import datadog.trace.api.config.GeneralConfig
+import datadog.trace.api.config.TraceInstrumentationConfig
+import datadog.trace.api.config.TracerConfig
 import spock.lang.Specification
 import spock.util.environment.Jvm
 
@@ -44,15 +46,18 @@ abstract class CiVisibilitySmokeTest extends Specification {
     argMap.put(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_ENABLED, "true")
     argMap.put(CiVisibilityConfig.CIVISIBILITY_CIPROVIDER_INTEGRATION_ENABLED, "false")
     argMap.put(CiVisibilityConfig.CIVISIBILITY_GIT_UPLOAD_ENABLED, "false")
+    argMap.put(CiVisibilityConfig.CIVISIBILITY_GIT_CLIENT_ENABLED, "false")
     argMap.put(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_ONLY_KNOWN_FLAKES, "true")
     argMap.put(CiVisibilityConfig.CIVISIBILITY_COMPILER_PLUGIN_VERSION, JAVAC_PLUGIN_VERSION)
+    argMap.put(TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED, "false")
     return argMap
   }
 
   private static Map<String, String> buildJvmArgMap(String mockBackendIntakeUrl, String serviceName, Map<String, String> additionalArgs) {
     Map<String, String> argMap = new HashMap<>(DEFAULT_TRACER_CONFIG)
     argMap.put(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_URL, mockBackendIntakeUrl)
     argMap.put(CiVisibilityConfig.CIVISIBILITY_INTAKE_AGENTLESS_URL, mockBackendIntakeUrl)
+    argMap.put(TracerConfig.TRACE_AGENT_URL, mockBackendIntakeUrl)
     argMap.putAll(additionalArgs)
 
     if (serviceName != null) {

dd-smoke-tests/gradle/build.gradle

@@ -1,3 +1,6 @@
+import java.time.Duration
+import java.time.temporal.ChronoUnit
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -17,6 +20,9 @@ tasks.named("test", Test) {
     events "passed", "skipped", "failed", "standardOut", "standardError"
   }
 
+  // Overriding the default timeout as Gradle smoke tests might run for a longer duration.
+  timeout = Duration.of(25, ChronoUnit.MINUTES)
+
   if (project.hasProperty("mavenRepositoryProxy")) {
     // propagate proxy URL to tests, to then propagate it to nested Gradle builds
     environment "MAVEN_REPOSITORY_PROXY", project.property("mavenRepositoryProxy")

dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/GradleLauncherSmokeTest.groovy

@@ -72,13 +72,23 @@ class GradleLauncherSmokeTest extends AbstractGradleTest {
       "DD_CIVISIBILITY_AGENTLESS_ENABLED" : "true",
       "DD_CIVISIBILITY_AGENTLESS_URL"     : "${mockBackend.intakeUrl}".toString(),
       "DD_CIVISIBILITY_GIT_UPLOAD_ENABLED": "false",
+      "DD_CIVISIBILITY_GIT_CLIENT_ENABLED": "false",
+      "DD_CODE_ORIGIN_FOR_SPANS_ENABLED"  : "false",
       "DD_API_KEY"                        : "dummy"
     ])
     String[] command = ["./gradlew", "--no-daemon", "--info"]
     if (gradleDaemonCmdLineParams) {
       command += "-Dorg.gradle.jvmargs=$gradleDaemonCmdLineParams".toString()
     }
-    return shellCommandExecutor.executeCommand(IOUtils::readFully, command)
+
+    try {
+      return shellCommandExecutor.executeCommand(IOUtils::readFully, command)
+    } catch (Exception e) {
+      println "=============================================================="
+      println "${new Date()}: $specificationContext.currentIteration.displayName - Gradle Launcher execution failed with exception:\n ${e.message}"
+      println "=============================================================="
+      throw e
+    }
   }
 
   private static boolean gradleDaemonStartCommandContains(String buildOutput, String... tokens) {