Merge branch 'master' into alexeyk/debug-ci-timeout

Author: AlexeyKuznetsov-DD

.gitlab-ci.yml

@@ -60,6 +60,7 @@ workflow:
       - "11"
       - "17"
       - "21"
+      - "25"
       - "stable"
       - "semeru11"
       - "oracle8"

build.gradle

@@ -0,0 +1,144 @@
+import com.diffplug.gradle.spotless.SpotlessExtension
+
+plugins {
+  id("datadog.gradle-debug")
+  id("datadog.dependency-locking")
+
+  id("com.diffplug.spotless") version "6.13.0"
+  id("com.github.spotbugs") version "5.0.14"
+  id("de.thetaphi.forbiddenapis") version "3.8"
+
+  id("org.shipkit.shipkit-auto-version") version "2.1.2"
+  id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
+
+  id("com.gradleup.shadow") version "8.3.6" apply false
+  id("me.champeau.jmh") version "0.7.0" apply false
+  id("org.gradle.playframework") version "0.13" apply false
+  id("info.solidsoft.pitest") version "1.9.11" apply false
+}
+
+description = "dd-trace-java"
+
+val isCI = providers.environmentVariable("CI")
+
+apply(from = rootDir.resolve("gradle/repositories.gradle"))
+
+spotless {
+  // only resolve the spotless dependencies once in the build
+  predeclareDeps()
+}
+
+with(extensions["spotlessPredeclare"] as SpotlessExtension) {
+  // these need to align with the types and versions in gradle/spotless.gradle
+  java {
+    removeUnusedImports()
+
+    // This is the last Google Java Format version that supports Java 8
+    googleJavaFormat("1.7")
+  }
+  groovyGradle {
+    greclipse()
+  }
+  groovy {
+    greclipse()
+  }
+  kotlinGradle {
+    ktlint("0.41.0")
+  }
+  kotlin {
+    ktlint("0.41.0")
+  }
+  scala {
+    scalafmt("2.7.5")
+  }
+}
+apply(from = rootDir.resolve("gradle/spotless.gradle"))
+
+val compileTask = tasks.register("compile")
+
+val repoVersion = version
+
+allprojects {
+  group = "com.datadoghq"
+  version = repoVersion
+
+  if (isCI.isPresent) {
+    layout.buildDirectory = providers.provider {
+      val newProjectCIPath = projectDir.path.replace(
+        rootDir.path,
+        ""
+      )
+      rootDir.resolve("workspace/$newProjectCIPath/build/")
+    }
+  }
+
+  apply(from = rootDir.resolve("gradle/dependencies.gradle"))
+  apply(from = rootDir.resolve("gradle/util.gradle"))
+
+  compileTask.configure {
+    dependsOn(tasks.withType<AbstractCompile>())
+  }
+
+  tasks.configureEach {
+    if (this is JavaForkOptions) {
+      maxHeapSize = System.getProperty("datadog.forkedMaxHeapSize")
+      minHeapSize = System.getProperty("datadog.forkedMinHeapSize")
+      jvmArgs(
+        "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
+        "-XX:+HeapDumpOnOutOfMemoryError",
+        "-XX:HeapDumpPath=/tmp"
+      )
+    }
+  }
+}
+
+tasks.register("latestDepTest")
+
+nexusPublishing {
+  repositories {
+    val forceLocal = providers.gradleProperty("forceLocal").getOrElse("false").toBoolean()
+    if (forceLocal && !isCI.isPresent) {
+      // For testing, use with https://hub.docker.com/r/sonatype/nexus
+      // $ docker run --rm -d -p 8081:8081 --name nexus sonatype/nexus:oss
+      // $ ./gradlew publishToLocal -PforceLocal=true
+      // Doesn't work for testing releases though... (due to staging),
+      // however, it's possible to explore http://localhost:8081/nexus/
+      register("local") {
+        nexusUrl = uri("http://localhost:8081/nexus/content/repositories/releases/")
+        snapshotRepositoryUrl = uri("http://localhost:8081/nexus/content/repositories/snapshots/")
+        username = "admin"
+        password = "admin123"
+        allowInsecureProtocol = true
+      }
+    } else {
+      // see https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-central
+      // For official documentation:
+      // staging repo publishing https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/#configuration
+      // snapshot publishing https://central.sonatype.org/publish/publish-portal-snapshots/#publishing-via-other-methods
+      sonatype {
+        nexusUrl = uri("https://ossrh-staging-api.central.sonatype.com/service/local/")
+        snapshotRepositoryUrl = uri("https://central.sonatype.com/repository/maven-snapshots/")
+        username = providers.environmentVariable("MAVEN_CENTRAL_USERNAME")
+        password = providers.environmentVariable("MAVEN_CENTRAL_PASSWORD")
+      }
+    }
+  }
+}
+
+val writeMainVersionFileTask = tasks.register("writeMainVersionFile") {
+  val versionFile = rootProject.layout.buildDirectory.file("main.version")
+  inputs.property("version", project.version)
+  outputs.file(versionFile)
+  doFirst {
+    require(versionFile.get().asFile.parentFile.mkdirs() || versionFile.get().asFile.parentFile.isDirectory)
+    versionFile.get().asFile.writeText(project.version.toString())
+  }
+}
+
+allprojects {
+  tasks.withType<PublishToMavenLocal>().configureEach {
+    finalizedBy(writeMainVersionFileTask)
+  }
+}
+
+apply(from = "$rootDir/gradle/ci_jobs.gradle")

build.gradle.kts

@@ -47,7 +47,7 @@ dependencies {
   implementation("org.ow2.asm", "asm-tree", "9.8")
 
   testImplementation(libs.spock.core)
-  testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17")
+  testImplementation(libs.groovy)
 }
 
 tasks.compileKotlin {

buildSrc/build.gradle.kts

@@ -39,7 +39,7 @@ dependencies {
   testImplementation("net.bytebuddy", "byte-buddy", "1.17.5")
   testImplementation(libs.spock.core)
   testImplementation("org.objenesis", "objenesis", "3.0.1")
-  testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17")
+  testImplementation(libs.groovy)
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
   testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")
 }

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -125,13 +125,15 @@ static PullRequestInfo buildPullRequestInfo(
     }
 
     // complete with CI vars if user didn't provide all information
-    PullRequestInfo ciInfo = PullRequestInfo.merge(userInfo, ciProviderInfo.buildPullRequestInfo());
+    PullRequestInfo ciInfo =
+        PullRequestInfo.coalesce(userInfo, ciProviderInfo.buildPullRequestInfo());
     String headSha = ciInfo.getHeadCommit().getSha();
     if (Strings.isNotBlank(headSha)) {
       // if head sha present try to populate author, committer and message info through git client
       try {
         CommitInfo commitInfo = gitClient.getCommitInfo(headSha, true);
-        return PullRequestInfo.merge(ciInfo, new PullRequestInfo(null, null, commitInfo, null));
+        return PullRequestInfo.coalesce(
+            ciInfo, new PullRequestInfo(null, null, null, commitInfo, null));
       } catch (Exception ignored) {
       }
     }
@@ -145,6 +147,7 @@ private static PullRequestInfo buildUserPullRequestInfo(
         new PullRequestInfo(
             config.getGitPullRequestBaseBranch(),
             config.getGitPullRequestBaseBranchSha(),
+            null,
             new CommitInfo(config.getGitCommitHeadSha()),
             null);
 
@@ -164,10 +167,11 @@ private static PullRequestInfo buildUserPullRequestInfo(
         new PullRequestInfo(
             null,
             mergeBase,
+            null,
             new CommitInfo(environment.get(Constants.DDCI_PULL_REQUEST_SOURCE_SHA)),
             null);
 
-    return PullRequestInfo.merge(userInfo, ddCiInfo);
+    return PullRequestInfo.coalesce(userInfo, ddCiInfo);
   }
 
   private static String getRepoRoot(CIInfo ciInfo, GitClient.Factory gitClientFactory) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java

@@ -91,6 +91,7 @@ public PullRequestInfo buildPullRequestInfo() {
       return new PullRequestInfo(
           normalizeBranch(environment.get(APPVEYOR_REPO_BRANCH)),
           null,
+          null,
           new CommitInfo(environment.get(APPVEYOR_PR_HEAD_COMMIT)),
           environment.get(APPVEYOR_PR_NUMBER));
     } else {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AppVeyorInfo.java

@@ -91,6 +91,7 @@ public PullRequestInfo buildPullRequestInfo() {
     return new PullRequestInfo(
         normalizeBranch(environment.get(AZURE_PR_TARGET_BRANCH)),
         null,
+        null,
         CommitInfo.NOOP,
         environment.get(AZURE_PR_NUMBER));
   }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AzurePipelinesInfo.java

@@ -79,6 +79,7 @@ public PullRequestInfo buildPullRequestInfo() {
     return new PullRequestInfo(
         normalizeBranch(environment.get(BITBUCKET_PR_DESTINATION_BRANCH)),
         null,
+        null,
         CommitInfo.NOOP,
         environment.get(BITBUCKET_PR_NUMBER));
   }

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitBucketInfo.java

@@ -76,6 +76,7 @@ public PullRequestInfo buildPullRequestInfo() {
     return new PullRequestInfo(
         normalizeBranch(environment.get(BITRISE_GIT_BRANCH_DEST)),
         null,
+        null,
         CommitInfo.NOOP,
         environment.get(BITRISE_PR_NUMBER));
   }