Merge branch 'master' into nikita-tkachenko/junit-6

Author: nikita-tkachenko-datadog

.github/workflows/add-release-to-cloudfoundry.yaml

@@ -43,7 +43,7 @@ jobs:
         run: |
           echo "${{ steps.get-release-version.outputs.VERSION }}: ${{ steps.get-release-url.outputs.URL }}" >> index.yml
       - name: Commit and push changes
-        uses: planetscale/ghcommit-action@7c35caed9937939812c7d4242ffab823e9b3b1fa # v0.2.16
+        uses: planetscale/ghcommit-action@322be9669498a4be9ce66efc1169f8f43f6bd883 # v0.2.17
         with:
           commit_message: "chore: Add version ${{ steps.get-release-version.outputs.VERSION }} to Cloud Foundry"
           repo: ${{ github.repository }}

.github/workflows/analyze-changes.yaml

@@ -40,7 +40,7 @@ jobs:
             ${{ runner.os }}-gradle-
         
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
+        uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         with:
           languages: 'java'
           build-mode: 'manual'
@@ -57,7 +57,7 @@ jobs:
             --build-cache --parallel --stacktrace --no-daemon --max-workers=4
 
       - name: Perform CodeQL Analysis and upload results to GitHub Security tab
-        uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
+        uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
 
   trivy:
     name: Analyze changes with Trivy
@@ -122,7 +122,7 @@ jobs:
           TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
+        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

.gitlab-ci.yml

@@ -60,6 +60,7 @@ workflow:
       - "11"
       - "17"
       - "21"
+      - "25"
       - "stable"
       - "semeru11"
       - "oracle8"
@@ -601,11 +602,12 @@ agent_integration_tests:
     GRADLE_TARGET: "traceAgentTest"
     CACHE_TYPE: "base"
   services:
-    - name: datadog/agent:7.34.0
+    - name: registry.ddbuild.io/images/mirror/datadog/agent:7.40.1
       alias: local-agent
       variables:
         DD_APM_ENABLED: "true"
         DD_BIND_HOST: "0.0.0.0"
+        DD_HOSTNAME: "local-agent"
         DD_API_KEY: "invalid_key_but_this_is_fine"
 
 test_base:

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

@@ -1,6 +1,5 @@
 package datadog.environment;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
@@ -32,7 +31,7 @@ private EnvironmentVariables() {}
    * @return The environment variable value, {@code defaultValue} if missing, can't be retrieved or
    *     the environment variable name is {@code null}.
    */
-  public static String getOrDefault(@Nonnull String name, String defaultValue) {
+  public static String getOrDefault(String name, String defaultValue) {
     if (name == null) {
       return defaultValue;
     }