Merge branch 'master' into nikita-tkachenko/junit-5-failed-setup-teardown

Author: nikita-tkachenko-datadog

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/git/LocalFSGitInfoExtractorTest.groovy

@@ -50,7 +50,7 @@ class LocalFSGitInfoExtractorTest extends DDSpecification {
       )
   }
 
-  def "test git info extraction for local fs"() {
+  def "test git info extraction for local fs #gitFolder"() {
     setup:
     def sut = new LocalFSGitInfoExtractor()
 
@@ -119,7 +119,7 @@ class LocalFSGitInfoExtractorTest extends DDSpecification {
     fullMessage == null
   }
 
-  def "test repository url with different remotes"() {
+  def "test repository url with different remotes #gitFolder"() {
     setup:
     def sut = new LocalFSGitInfoExtractor()
 

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ipc/SerializerTest.groovy

@@ -154,6 +154,11 @@ class SerializerTest extends Specification {
       this.b = b
     }
 
+    @Override
+    String toString() {
+      "$a / $b"
+    }
+
     boolean equals(o) {
       if (this.is(o)) {
         return true

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/propagation/PropagationModuleTest.groovy

@@ -688,7 +688,7 @@ class PropagationModuleTest extends IastModuleImplTestBase {
   }
 
   private Date date(Source source = null, int mark = NOT_MARKED) {
-    final result = new Date()
+    final result = new Date(1234567890) // Use a fixed date
     if (source != null) {
       taintObject(result, source, mark)
     }

dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy

@@ -1,4 +1,5 @@
 import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.agent.test.server.http.TestHttpServer
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.iast.sink.SsrfModule
 import org.apache.http.HttpHost
@@ -31,7 +32,7 @@ class IastHttpClientInstrumentationTest extends AgentTestRunner {
     }
   }
 
-  void 'test ssrf httpClient execute method with args #args expecting call module'() {
+  void 'test ssrf httpClient execute method expecting call module #iterationIndex'() {
     given:
     final ssrf = Mock(SsrfModule)
     InstrumentationBridge.registerIastModule(ssrf)
@@ -68,7 +69,7 @@ class IastHttpClientInstrumentationTest extends AgentTestRunner {
     return new BasicHttpRequest("GET", server.address.toString())
   }
 
-  private static HttpHost getHttpHost(final server){
+  private static HttpHost getHttpHost(final TestHttpServer server){
     return new HttpHost(server.address.host, server.address.port, server.address.scheme)
   }
 }

dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy

@@ -296,7 +296,7 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
         NodeList versionList = doc.getElementsByTagName("latest")
         if (versionList.getLength() > 0) {
           def version = versionList.item(0).getTextContent()
-          if (!version.contains('alpha') && !version.contains('beta')) {
+          if (!version.contains('alpha') && !version.contains('beta') && !version.contains('rc')) {
             LOGGER.info("Will run the 'latest' tests with version ${version}")
             return version
           }