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

Author: AlexeyKuznetsov-DD

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

@@ -26,18 +26,7 @@ jobs:
 
       - name: Checkout the repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Download ghcommit CLI
-        run: |
-          curl https://github.com/planetscale/ghcommit/releases/download/v0.1.48/ghcommit_linux_amd64 -o /usr/local/bin/ghcommit -L
-          chmod +x /usr/local/bin/ghcommit
-      - name: Pick a branch name
-        id: define-branch
-        run: echo "branch=ci/update-docker-build-image-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
-      - name: Create branch
-        run: |
-          git checkout -b ${{ steps.define-branch.outputs.branch }}
-          git push -u origin ${{ steps.define-branch.outputs.branch }} --force
-      - name: Define the Docker build image tage to use
+      - name: Define the Docker build image tag to use
         id: define-tag
         run: |
           if [ -n "${{ github.event.inputs.tag }}" ]; then
@@ -59,12 +48,38 @@ jobs:
       - name: Update the Docker build image in GitLab CI config
         run: |
           sed -i -E 's|(BUILDER_IMAGE_VERSION_PREFIX:)[^#]*([#].*)|\1 "${{ steps.define-tag.outputs.tag }}-" \2|' .gitlab-ci.yml
+      - name: Check if changes should be committed
+        id: check-changes
+        run: |
+          if [[ -z "$(git status -s)" ]]; then
+            echo "No changes to commit, exiting."
+            echo "commit_changes=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          else
+            echo "commit_changes=true" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Download ghcommit CLI
+        if: steps.check-changes.outputs.commit_changes == 'true'
+        run: |
+          curl https://github.com/planetscale/ghcommit/releases/download/v0.1.48/ghcommit_linux_amd64 -o /usr/local/bin/ghcommit -L
+          chmod +x /usr/local/bin/ghcommit
+      - name: Pick a branch name
+        if: steps.check-changes.outputs.commit_changes == 'true'
+        id: define-branch
+        run: echo "branch=ci/update-docker-build-image-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
+      - name: Create branch
+        if: steps.check-changes.outputs.commit_changes == 'true'
+        run: |
+          git checkout -b ${{ steps.define-branch.outputs.branch }}
+          git push -u origin ${{ steps.define-branch.outputs.branch }} --force
       - name: Commit and push changes
+        if: steps.check-changes.outputs.commit_changes == 'true'
         env:
           GITHUB_TOKEN: ${{ steps.octo-sts.outputs.token }}
         run: |
           ghcommit --repository ${{ github.repository }} --branch ${{ steps.define-branch.outputs.branch }} --add .gitlab-ci.yml --message "feat(ci): Update Docker build image"
       - name: Create pull request
+        if: steps.check-changes.outputs.commit_changes == 'true'
         env:
           GH_TOKEN: ${{ steps.octo-sts.outputs.token }}
         run: |

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

@@ -24,28 +24,37 @@ jobs:
       - name: Update Submodule
         run: |
           git submodule update --remote -- dd-java-agent/agent-jmxfetch/integrations-core
+      - name: Check if changes should be committed
+        id: check-changes
+        run: |
+          if [[ -z "$(git status -s)" ]]; then
+            echo "No changes to commit, exiting."
+            echo "commit_changes=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          else
+            echo "commit_changes=true" >> "$GITHUB_OUTPUT"
+          fi
       - name: Pick a branch name
+        if: steps.check-changes.outputs.commit_changes == 'true'
         id: define-branch
         run: echo "branch=ci/update-jmxfetch-submodule-$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
       - name: Create branch
+        if: steps.check-changes.outputs.commit_changes == 'true'
         run: |
           git checkout -b ${{ steps.define-branch.outputs.branch }}
           git push -u origin ${{ steps.define-branch.outputs.branch }} --force
       - name: Commit and push changes
+        if: steps.check-changes.outputs.commit_changes == 'true'
         env:
           GITHUB_TOKEN: ${{ steps.octo-sts.outputs.token }}
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          if [[ -z "$(git status -s)" ]]; then
-            echo "No changes to commit, exiting."
-            exit 0;
-          fi
-          git checkout -b ${{ steps.define-branch.outputs.branch }}
           git add dd-java-agent/agent-jmxfetch/integrations-core
           git commit -m "Update agent-jmxfetch submodule"
           git push origin ${{ steps.define-branch.outputs.branch }}
       - name: Create pull request
+        if: steps.check-changes.outputs.commit_changes == 'true'
         env:
           GH_TOKEN: ${{ steps.octo-sts.outputs.token }}
         run: |

dd-smoke-tests/log-injection/build.gradle

@@ -4,11 +4,6 @@ plugins {
   id 'com.gradleup.shadow'
 }
 
-ext {
-  // TODO: Fix for Java 25. Gradle Test Executor failed. Update givenGradleVersionIsCompatibleWithCurrentJvm() when Gradle releases Java 25 support: https://docs.gradle.org/current/userguide/compatibility.html#java_runtime
-  maxJavaVersionForTests = JavaVersion.VERSION_24
-}
-
 apply from: "$rootDir/gradle/java.gradle"
 description = 'Log injection Smoke Tests.'
 
@@ -357,6 +352,11 @@ generateTestingJar('Flogger', 'Slf4jToLogbackLatest',
 
 tasks.withType(Test).configureEach {
   dependsOn tasks.withType(ShadowJar)
+
+  // Runtime.getRuntime().availableProcessors() is used to scale the parallelism by default,
+  // but it returns weird values in Gitlab/kubernetes, so fix to a specific value when available
+  def override = System.getenv("RUNTIME_AVAILABLE_PROCESSORS_OVERRIDE")
+  maxParallelForks = override?.toInteger() ?: Math.max(1, (Runtime.runtime.availableProcessors() / 2).toInteger())
 }
 
 

dd-smoke-tests/log-injection/src/test/resources/SpockConfig.groovy

@@ -10,7 +10,7 @@ spock = "2.3-groovy-3.0"
 spock24 = "2.4-M6-groovy-3.0"
 groovy = "3.0.24"
 junit5 = "5.9.2"
-logback = "1.2.9"
+logback = "1.2.13"
 bytebuddy = "1.17.5"
 scala = "2.11.12" # Last version to support Java 7 (2.12+ require Java 8+)
 scala211 = "2.11.12"