Merge branch 'master' into mhlidd/config_inversion

Author: mhlidd

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout "cloudfoundry" branch
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
         with:
           ref: cloudfoundry
       - name: Get release version

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

@@ -3,9 +3,6 @@ name: Analyze changes
 on:
   push:
     branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
 
 # Cancel long-running jobs when a new commit is pushed
 concurrency:
@@ -15,8 +12,6 @@ concurrency:
 jobs:
   codeql:
     name: Analyze changes with GitHub CodeQL
-    # Don’t run on PR, only when pushing to master
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -25,12 +20,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
         with:
           submodules: 'recursive'
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: |
             ~/.gradle/caches
@@ -40,7 +35,7 @@ jobs:
             ${{ runner.os }}-gradle-
         
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
         with:
           languages: 'java'
           build-mode: 'manual'
@@ -57,12 +52,10 @@ 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@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
 
   trivy:
     name: Analyze changes with Trivy
-    # Don’t run on PR, only when pushing to master
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -71,12 +64,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
         with:
           submodules: 'recursive'
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: |
             ~/.gradle/caches
@@ -122,7 +115,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@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

.github/workflows/analyze-changes.yaml

@@ -15,13 +15,13 @@ jobs:
       group: APM Larger Runners
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
         with:
           submodules: 'recursive'
           fetch-depth: 0
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: |
             ~/.gradle/caches

.github/workflows/run-system-tests.yaml

@@ -25,7 +25,7 @@ jobs:
           policy: self.update-docker-build-image.create-pr
 
       - name: Checkout the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Define the Docker build image tag to use
         id: define-tag
         run: |

.github/workflows/update-docker-build-image.yaml

@@ -19,7 +19,7 @@ jobs:
           policy: self.update-gradle-dependencies.create-pr
 
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
         with:
           submodules: "recursive"
       - name: Download ghcommit CLI

.github/workflows/update-gradle-dependencies.yaml

@@ -19,7 +19,7 @@ jobs:
           policy: self.update-jmxfetch-submodule.create-pr
 
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
 
       - name: Update Submodule
         run: |

.github/workflows/update-jmxfetch-submodule.yaml

@@ -26,8 +26,8 @@ variables:
   DEPENDENCY_CACHE_POLICY: pull
   BUILD_CACHE_POLICY: pull
   GRADLE_VERSION: "8.14.3" # must match gradle-wrapper.properties
-  MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
-  GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
+  MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
+  GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
   BUILDER_IMAGE_VERSION_PREFIX: "v25.07-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")
   REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations"
   DEFAULT_TEST_JVMS: /^(8|11|17|21|stable)$/

.gitlab-ci.yml

@@ -2,13 +2,13 @@ package datadog.gradle.plugin.version
 
 import org.assertj.core.api.Assertions.assertThat
 import org.gradle.testkit.runner.GradleRunner
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.CleanupMode
 import org.junit.jupiter.api.io.TempDir
 import java.io.File
 import java.io.IOException
 
-
 class TracerVersionIntegrationTest {
 
   @Test
@@ -89,41 +89,25 @@ class TracerVersionIntegrationTest {
       projectDir,
       "1.53.0-SNAPSHOT-DIRTY",
       beforeGradle = {
-        exec(projectDir, "git", "init", "--initial-branch", "main")
-        exec(projectDir, "git", "config", "user.email", "[email protected]")
-        exec(projectDir, "git", "config", "user.name", "Test")
-        exec(projectDir, "git", "add", "-A")
-        exec(projectDir, "git", "commit", "-m", "A commit")
-        exec(projectDir, "git", "tag", "v1.52.0", "-m", "")
-
-        File(projectDir, "settings.gradle.kts").appendText("""
-          
-          // uncommitted change this file, 
-        """.trimIndent())
-      }
-    )
-  }
+        println("Setting up git repository in $projectDir")
+        File(projectDir, "gradle.properties").writeText(
+          """
+          tracerVersion.dirtiness=true
+          """.trimIndent()
+        )
 
-  @Test
-  fun `should ignore dirtiness if CI env`(@TempDir projectDir: File) { // CI patch some tracked files
-    assertTracerVersion(
-      projectDir,
-      "1.52.0",
-      beforeGradle = {
         exec(projectDir, "git", "init", "--initial-branch", "main")
         exec(projectDir, "git", "config", "user.email", "[email protected]")
         exec(projectDir, "git", "config", "user.name", "Test")
         exec(projectDir, "git", "add", "-A")
         exec(projectDir, "git", "commit", "-m", "A commit")
         exec(projectDir, "git", "tag", "v1.52.0", "-m", "")
 
-        // dirty file ignored
         File(projectDir, "settings.gradle.kts").appendText("""
           
           // uncommitted change this file, 
         """.trimIndent())
-      },
-      additionalEnv = mapOf("CI" to "true")
+      }
     )
   }
 
@@ -157,6 +141,12 @@ class TracerVersionIntegrationTest {
       projectDir,
       "1.53.0-SNAPSHOT-DIRTY",
       beforeGradle = {
+        File(projectDir, "gradle.properties").writeText(
+          """
+          tracerVersion.dirtiness=true
+          """.trimIndent()
+        )
+
         exec(projectDir, "git", "init", "--initial-branch", "main")
         exec(projectDir, "git", "config", "user.email", "[email protected]")
         exec(projectDir, "git", "config", "user.name", "Test")
@@ -268,7 +258,6 @@ class TracerVersionIntegrationTest {
     expectedVersion: String,
     beforeGradle: () -> Unit = {},
     workingDirectory: File = projectDir,
-    additionalEnv: Map<String, String> = mapOf("CI" to "false"),
   ) {
     File(projectDir, "settings.gradle.kts").writeText(
       """
@@ -296,7 +285,6 @@ class TracerVersionIntegrationTest {
       // .withGradleVersion(gradleVersion)  // Use current gradle version
       .withPluginClasspath()
       .withArguments("printVersion", "--quiet")
-      .withEnvironment(System.getenv() + additionalEnv)
       .withProjectDir(workingDirectory)
       // .withDebug(true)
       .build()

buildSrc/src/integTest/kotlin/datadog/gradle/plugin/version/TracerVersionIntegrationTest.kt

@@ -23,7 +23,9 @@ class TracerVersionPlugin @Inject constructor(
     val extension = targetProject.extensions.getByType(TracerVersionExtension::class.java)
 
     extension.detectDirty.set(
-      providerFactory.environmentVariable("CI").map { it != "true" }.orElse(true)
+       providerFactory.gradleProperty("tracerVersion.dirtiness")
+         .map { it.trim().toBoolean() }
+         .orElse(false)
     )
 
     val versionProvider = versionProvider(targetProject, extension)