From 670a1a17f45650a41fb9656a26bef2f7a6ef2fc0 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Sat, 18 Oct 2025 09:51:42 -0400
Subject: [PATCH 01/15] Cache for maven dependencies.

---
 .gitlab-ci.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9934c2b2dc4..76bfe4f9150 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,10 +148,12 @@ default:
   cache:
     - key: dependency-$CACHE_TYPE # Dependencies cache
       paths:
-        # Cached dependencies and wrappers for gradle
+        # Cached dependencies and wrappers for Gradle:
         - .gradle/wrapper
         - .gradle/caches
         - .gradle/notifications
+        # Cached dependencies for Maven:
+        - .mvn/caches
       policy: $DEPENDENCY_CACHE_POLICY
       unprotect: true
       fallback_keys: # Use fallback keys because all cache types are not populated. See note under: populate_dep_cache
@@ -179,6 +181,13 @@ default:
     - |
       # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
       sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
+    - export MAVEN_USER_HOME=$(pwd)/.mvn
+    - |
+      cat << EOF > .mvn/settings.xml
+      <settings>
+      <localRepository>$MAVEN_USER_HOME</localRepository>
+      </settings>
+      EOF
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
     - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
     - *normalize_node_index
@@ -190,6 +199,8 @@ default:
     - rm -rf .gradle
     - mv .gradle-copy .gradle
     - ls -la
+    - ls $MAVEN_USER_HOME
+    - cat $MAVEN_USER_HOME/settings.xml
     - gitlab_section_end "gradle-dance"
   after_script:
     - *cgroup_info

From 396a75537f6da933f94ab0322404a2ed8497bf74 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Sat, 18 Oct 2025 09:58:05 -0400
Subject: [PATCH 02/15] WIP

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76bfe4f9150..f190a4a52a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -182,10 +182,11 @@ default:
       # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
       sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
     - export MAVEN_USER_HOME=$(pwd)/.mvn
+    - mkdir -p .mvn/caches
     - |
       cat << EOF > .mvn/settings.xml
       <settings>
-      <localRepository>$MAVEN_USER_HOME</localRepository>
+      <localRepository>$MAVEN_USER_HOME/caches</localRepository>
       </settings>
       EOF
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
@@ -204,6 +205,7 @@ default:
     - gitlab_section_end "gradle-dance"
   after_script:
     - *cgroup_info
+    - ls $MAVEN_USER_HOME/caches
 
 # Check and fail early if maven central credentials are incorrect. When a new token is generated
 # on the central publisher portal, it invalidates the old one. This check prevents going further.

From 8addd2aca22dc7552bd4744ce6b1b5772353ee89 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Sat, 18 Oct 2025 10:04:37 -0400
Subject: [PATCH 03/15] WIP 2

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f190a4a52a9..80d2a49dadb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -186,7 +186,7 @@ default:
     - |
       cat << EOF > .mvn/settings.xml
       <settings>
-      <localRepository>$MAVEN_USER_HOME/caches</localRepository>
+      <localRepository>${MAVEN_USER_HOME}/caches</localRepository>
       </settings>
       EOF
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
@@ -205,7 +205,7 @@ default:
     - gitlab_section_end "gradle-dance"
   after_script:
     - *cgroup_info
-    - ls $MAVEN_USER_HOME/caches
+    - ls ${MAVEN_USER_HOME}/caches
 
 # Check and fail early if maven central credentials are incorrect. When a new token is generated
 # on the central publisher portal, it invalidates the old one. This check prevents going further.

From 3c81d2a19521cfd1e57499d2949d408c06a0a9f1 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Sat, 18 Oct 2025 10:31:09 -0400
Subject: [PATCH 04/15] WIP 3

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80d2a49dadb..109c9826a19 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -164,6 +164,7 @@ default:
         - .gradle/caches/$GRADLE_VERSION
         - .gradle/$GRADLE_VERSION/executionHistory
         - workspace
+        - .mvn/caches
       policy: $BUILD_CACHE_POLICY
       unprotect: true
   before_script:
@@ -205,7 +206,7 @@ default:
     - gitlab_section_end "gradle-dance"
   after_script:
     - *cgroup_info
-    - ls ${MAVEN_USER_HOME}/caches
+    - ls .mvn/caches
 
 # Check and fail early if maven central credentials are incorrect. When a new token is generated
 # on the central publisher portal, it invalidates the old one. This check prevents going further.

From 16cc6d7868044c52e3d063afa2472dd0c4697672 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Sat, 18 Oct 2025 19:09:50 -0400
Subject: [PATCH 05/15] WIP 4

---
 .gitlab-ci.yml                                | 19 ++++++-------------
 .../instrumentation/mule-4.5/build.gradle     | 19 ++++++++++++++++---
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 109c9826a19..0fa305cf384 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,8 +152,7 @@ default:
         - .gradle/wrapper
         - .gradle/caches
         - .gradle/notifications
-        # Cached dependencies for Maven:
-        - .mvn/caches
+        - .mvn/caches1
       policy: $DEPENDENCY_CACHE_POLICY
       unprotect: true
       fallback_keys: # Use fallback keys because all cache types are not populated. See note under: populate_dep_cache
@@ -164,7 +163,7 @@ default:
         - .gradle/caches/$GRADLE_VERSION
         - .gradle/$GRADLE_VERSION/executionHistory
         - workspace
-        - .mvn/caches
+        - .mvn/caches2
       policy: $BUILD_CACHE_POLICY
       unprotect: true
   before_script:
@@ -183,13 +182,8 @@ default:
       # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
       sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
     - export MAVEN_USER_HOME=$(pwd)/.mvn
-    - mkdir -p .mvn/caches
-    - |
-      cat << EOF > .mvn/settings.xml
-      <settings>
-      <localRepository>${MAVEN_USER_HOME}/caches</localRepository>
-      </settings>
-      EOF
+    - mkdir -p .mvn/caches1
+    - mkdir -p .mvn/caches2
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
     - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
     - *normalize_node_index
@@ -201,12 +195,11 @@ default:
     - rm -rf .gradle
     - mv .gradle-copy .gradle
     - ls -la
-    - ls $MAVEN_USER_HOME
-    - cat $MAVEN_USER_HOME/settings.xml
     - gitlab_section_end "gradle-dance"
   after_script:
     - *cgroup_info
-    - ls .mvn/caches
+    - ls .mvn/caches1
+    - ls .mvn/caches2
 
 # Check and fail early if maven central credentials are incorrect. When a new token is generated
 # on the central publisher portal, it invalidates the old one. This check prevents going further.
diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle
index bff78ffd553..c75b1af6311 100644
--- a/dd-java-agent/instrumentation/mule-4.5/build.gradle
+++ b/dd-java-agent/instrumentation/mule-4.5/build.gradle
@@ -221,16 +221,29 @@ tasks.register('extractLatestMuleServices', Sync) {
 
 // build the mule application via maven
 tasks.register('mvnPackage', Exec) {
-  workingDir "$appDir"
+  workingDir("$appDir")
   environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
-  commandLine "$rootDir/mvnw", "-Ddatadog.builddir=$buildDir", "-Ddatadog.name=mule-test-application", "-Ddatadog.version=$version", 'package'
+
+  List<String> mvnArgs = [
+    "$rootDir/mvnw",
+    "-Ddatadog.builddir=$buildDir",
+    "-Ddatadog.name=mule-test-application",
+    "-Ddatadog.version=$version",
+    "package"
+  ]
+
+  if (providers.environmentVariable("CI").isPresent()) {
+    mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches1")
+  }
+
+  commandLine(mvnArgs)
+
   outputs.dir("$buildDir/target")
   inputs.dir("$appDir/src")
   inputs.file("$appDir/pom.xml")
   inputs.file("$appDir/mule-artifact.json")
 }
 
-
 // generate a properties file so the test knows where to run mule, and what jar to deploy
 tasks.register('generateAppResources') {
   createAppResourceTask(it, "test")

From 197fc86073be16d59aa8264b8c2639cb9c5b203d Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Sat, 18 Oct 2025 19:25:10 -0400
Subject: [PATCH 06/15] WIP 5

---
 .gitlab-ci.yml                                      | 10 ++++------
 dd-java-agent/instrumentation/mule-4.5/build.gradle |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0fa305cf384..d7d8cb310ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,7 +152,7 @@ default:
         - .gradle/wrapper
         - .gradle/caches
         - .gradle/notifications
-        - .mvn/caches1
+        - .mvn/caches
       policy: $DEPENDENCY_CACHE_POLICY
       unprotect: true
       fallback_keys: # Use fallback keys because all cache types are not populated. See note under: populate_dep_cache
@@ -163,7 +163,7 @@ default:
         - .gradle/caches/$GRADLE_VERSION
         - .gradle/$GRADLE_VERSION/executionHistory
         - workspace
-        - .mvn/caches2
+        - .mvn/caches
       policy: $BUILD_CACHE_POLICY
       unprotect: true
   before_script:
@@ -182,8 +182,7 @@ default:
       # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
       sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
     - export MAVEN_USER_HOME=$(pwd)/.mvn
-    - mkdir -p .mvn/caches1
-    - mkdir -p .mvn/caches2
+    - mkdir -p .mvn/caches
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
     - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"
     - *normalize_node_index
@@ -198,8 +197,7 @@ default:
     - gitlab_section_end "gradle-dance"
   after_script:
     - *cgroup_info
-    - ls .mvn/caches1
-    - ls .mvn/caches2
+    - ls .mvn/caches
 
 # Check and fail early if maven central credentials are incorrect. When a new token is generated
 # on the central publisher portal, it invalidates the old one. This check prevents going further.
diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle
index c75b1af6311..2ff45f9afb9 100644
--- a/dd-java-agent/instrumentation/mule-4.5/build.gradle
+++ b/dd-java-agent/instrumentation/mule-4.5/build.gradle
@@ -233,7 +233,7 @@ tasks.register('mvnPackage', Exec) {
   ]
 
   if (providers.environmentVariable("CI").isPresent()) {
-    mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches1")
+    mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches")
   }
 
   commandLine(mvnArgs)

From 7b7c08096c9bbc3dc9de6fc6cd5f55db81aa82d1 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Sat, 18 Oct 2025 19:34:04 -0400
Subject: [PATCH 07/15] WIP 6

---
 .../springboot-openliberty-20/build.gradle          | 13 ++++++++++---
 .../springboot-openliberty-23/build.gradle          | 12 ++++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/dd-smoke-tests/springboot-openliberty-20/build.gradle b/dd-smoke-tests/springboot-openliberty-20/build.gradle
index f58da81f2cb..fb29b117d93 100644
--- a/dd-smoke-tests/springboot-openliberty-20/build.gradle
+++ b/dd-smoke-tests/springboot-openliberty-20/build.gradle
@@ -1,4 +1,3 @@
-
 apply from: "$rootDir/gradle/java.gradle"
 description = 'SpringBoot Open Liberty 20-22 Smoke Tests'
 
@@ -14,9 +13,17 @@ def mvnwCommand = isWindows ? 'mvnw.cmd' : 'mvnw'
 
 // compile the Open liberty spring boot server
 tasks.register('mvnStage', Exec) {
-  workingDir "$appDir"
+  workingDir("$appDir")
   environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
-  commandLine "$rootDir/${mvnwCommand}", 'package', "-Dtarget.dir=${buildDir}/application/target"
+
+  List<String> mvnArgs = ["$rootDir/${mvnwCommand}", "-Dtarget.dir=${buildDir}/application/target", "package"]
+
+  if (providers.environmentVariable("CI").isPresent()) {
+    mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches")
+  }
+
+  commandLine(mvnArgs)
+
   inputs.dir "$appDir/src"
   inputs.file "$appDir/pom.xml"
   outputs.file jarPath
diff --git a/dd-smoke-tests/springboot-openliberty-23/build.gradle b/dd-smoke-tests/springboot-openliberty-23/build.gradle
index 96e579da7f4..c7722679c0a 100644
--- a/dd-smoke-tests/springboot-openliberty-23/build.gradle
+++ b/dd-smoke-tests/springboot-openliberty-23/build.gradle
@@ -13,9 +13,17 @@ def mvnwCommand = isWindows ? 'mvnw.cmd' : 'mvnw'
 
 // compile the Open liberty spring boot server
 tasks.register('mvnStage', Exec) {
-  workingDir "$appDir"
+  workingDir("$appDir")
   environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
-  commandLine "$rootDir/${mvnwCommand}", 'package', "-Dtarget.dir=${buildDir}/application/target"
+
+  List<String> mvnArgs = ["$rootDir/${mvnwCommand}", "-Dtarget.dir=${buildDir}/application/target", "package"]
+
+  if (providers.environmentVariable("CI").isPresent()) {
+    mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches")
+  }
+
+  commandLine(mvnArgs)
+
   inputs.dir "$appDir/src"
   inputs.file "$appDir/pom.xml"
   outputs.file jarPath

From 4a192fdef96bc0b7bf6b232061f6a768938e99c9 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Mon, 20 Oct 2025 08:58:13 -0400
Subject: [PATCH 08/15] WIP 7

---
 .gitlab-ci.yml                                        | 6 +++---
 dd-java-agent/instrumentation/mule-4.5/build.gradle   | 1 +
 dd-smoke-tests/springboot-openliberty-20/build.gradle | 1 +
 dd-smoke-tests/springboot-openliberty-23/build.gradle | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7d8cb310ba..4c881b62d5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,7 +148,7 @@ default:
   cache:
     - key: dependency-$CACHE_TYPE # Dependencies cache
       paths:
-        # Cached dependencies and wrappers for Gradle:
+        # Cached dependencies and wrappers for Gradle and Maven:
         - .gradle/wrapper
         - .gradle/caches
         - .gradle/notifications
@@ -160,10 +160,11 @@ default:
         - 'dependency-lib'
     - key: $CI_PIPELINE_ID-$CACHE_TYPE # Incremental build cache. Shared by all jobs in the pipeline of the same type
       paths:
+        # Cached dependencies and wrappers for Gradle and Maven:
         - .gradle/caches/$GRADLE_VERSION
         - .gradle/$GRADLE_VERSION/executionHistory
-        - workspace
         - .mvn/caches
+        - workspace
       policy: $BUILD_CACHE_POLICY
       unprotect: true
   before_script:
@@ -197,7 +198,6 @@ default:
     - gitlab_section_end "gradle-dance"
   after_script:
     - *cgroup_info
-    - ls .mvn/caches
 
 # Check and fail early if maven central credentials are incorrect. When a new token is generated
 # on the central publisher portal, it invalidates the old one. This check prevents going further.
diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle
index 2ff45f9afb9..0064cf9caa1 100644
--- a/dd-java-agent/instrumentation/mule-4.5/build.gradle
+++ b/dd-java-agent/instrumentation/mule-4.5/build.gradle
@@ -232,6 +232,7 @@ tasks.register('mvnPackage', Exec) {
     "package"
   ]
 
+  // Specify caches folder on CI.
   if (providers.environmentVariable("CI").isPresent()) {
     mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches")
   }
diff --git a/dd-smoke-tests/springboot-openliberty-20/build.gradle b/dd-smoke-tests/springboot-openliberty-20/build.gradle
index fb29b117d93..1f1eb04979c 100644
--- a/dd-smoke-tests/springboot-openliberty-20/build.gradle
+++ b/dd-smoke-tests/springboot-openliberty-20/build.gradle
@@ -18,6 +18,7 @@ tasks.register('mvnStage', Exec) {
 
   List<String> mvnArgs = ["$rootDir/${mvnwCommand}", "-Dtarget.dir=${buildDir}/application/target", "package"]
 
+  // Specify caches folder on CI.
   if (providers.environmentVariable("CI").isPresent()) {
     mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches")
   }
diff --git a/dd-smoke-tests/springboot-openliberty-23/build.gradle b/dd-smoke-tests/springboot-openliberty-23/build.gradle
index c7722679c0a..c471d97700a 100644
--- a/dd-smoke-tests/springboot-openliberty-23/build.gradle
+++ b/dd-smoke-tests/springboot-openliberty-23/build.gradle
@@ -18,6 +18,7 @@ tasks.register('mvnStage', Exec) {
 
   List<String> mvnArgs = ["$rootDir/${mvnwCommand}", "-Dtarget.dir=${buildDir}/application/target", "package"]
 
+  // Specify caches folder on CI.
   if (providers.environmentVariable("CI").isPresent()) {
     mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches")
   }

From dffa656b6342e7df3b4fa0bd6d268da80b44d794 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Tue, 21 Oct 2025 18:43:35 -0400
Subject: [PATCH 09/15] WIP 10

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85dcef1a63e..a3d39d2e23f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -176,7 +176,6 @@ default:
     - mkdir -p .gradle
     # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
     - sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
-    - export MAVEN_USER_HOME=$(pwd)/.mvn
     - mkdir -p .mvn/caches
     - export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"
     - export GRADLE_ARGS=" --build-cache --stacktrace --no-daemon --parallel --max-workers=$GRADLE_WORKERS"

From 66d27ccbd1ff3261414cb896a9675a5dcac23dc7 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Fri, 24 Oct 2025 11:03:22 -0400
Subject: [PATCH 10/15] Fixed review comments.

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41df78974f7..a29fd994b1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,7 +163,6 @@ default:
         # Cached dependencies and wrappers for Gradle and Maven:
         - .gradle/caches/$GRADLE_VERSION
         - .gradle/$GRADLE_VERSION/executionHistory
-        - .mvn/caches
         - workspace
       policy: $BUILD_CACHE_POLICY
       unprotect: true

From 0c7115c1e12a21743018119892adeb1073af5bb9 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Fri, 24 Oct 2025 13:13:50 -0400
Subject: [PATCH 11/15] Testing how maven would be cached.

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a29fd994b1b..1ff1d400249 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,7 +146,7 @@ default:
     GIT_SUBMODULE_STRATEGY: normal
     GIT_SUBMODULE_DEPTH: 1
   cache:
-    - key: dependency-$CACHE_TYPE # Dependencies cache
+    - key: dependency-mvn-test-$CACHE_TYPE # Dependencies cache
       paths:
         # Cached dependencies and wrappers for Gradle and Maven:
         - .gradle/wrapper
@@ -160,7 +160,7 @@ default:
         - 'dependency-lib'
     - key: $CI_PIPELINE_ID-$CACHE_TYPE # Incremental build cache. Shared by all jobs in the pipeline of the same type
       paths:
-        # Cached dependencies and wrappers for Gradle and Maven:
+        # Cached dependencies and wrappers for Gradle:
         - .gradle/caches/$GRADLE_VERSION
         - .gradle/$GRADLE_VERSION/executionHistory
         - workspace

From b312a7eeb7586a45a3460b6c9b6dabc57d354cef Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Fri, 24 Oct 2025 14:50:46 -0400
Subject: [PATCH 12/15] Attempt to confirm that maven caches restored...

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ff1d400249..e820634d9e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -189,6 +189,9 @@ default:
     - mv .gradle-copy .gradle
     - ls -la
     - gitlab_section_end "gradle-dance"
+  script:
+    - ls -la .mvn/caches
+    - ls -la .gradle/caches
   after_script:
     - *cgroup_info
 

From 2d2bd7cc218407e0995487ef592fe85c3ae74943 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Fri, 24 Oct 2025 14:59:53 -0400
Subject: [PATCH 13/15] Attempt to confirm that maven caches restored 2

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e820634d9e2..b47ffe84527 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -188,10 +188,9 @@ default:
     - rm -rf .gradle
     - mv .gradle-copy .gradle
     - ls -la
-    - gitlab_section_end "gradle-dance"
-  script:
     - ls -la .mvn/caches
     - ls -la .gradle/caches
+    - gitlab_section_end "gradle-dance"
   after_script:
     - *cgroup_info
 

From 7a7eb613e5a2f505c5c633c8d41018dbd38ae574 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Fri, 24 Oct 2025 15:40:26 -0400
Subject: [PATCH 14/15] Change cache key: lib -> inst

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b47ffe84527..ccd46c6622a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -398,7 +398,7 @@ test_published_artifacts:
   needs: [ build ]
   stage: tests
   variables:
-    CACHE_TYPE: lib
+    CACHE_TYPE: inst
   script:
     - *gitlab_base_ref_params
     - ./gradlew --version

From 3a0825a53c54a0338857e75ca58bc268a8c597a0 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Fri, 24 Oct 2025 16:39:36 -0400
Subject: [PATCH 15/15] Finalizing changes.

---
 .gitlab-ci.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4effd13f5b..51f098aafe3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,7 +138,7 @@ default:
     KUBERNETES_CPU_REQUEST: 8
     KUBERNETES_MEMORY_REQUEST: 8Gi
     KUBERNETES_MEMORY_LIMIT: 8Gi
-    CACHE_TYPE: lib #default
+    CACHE_TYPE: "lib" #default
     FF_USE_FASTZIP: "true"
     CACHE_COMPRESSION_LEVEL: "slowest"
 
@@ -146,7 +146,7 @@ default:
     GIT_SUBMODULE_STRATEGY: normal
     GIT_SUBMODULE_DEPTH: 1
   cache:
-    - key: dependency-mvn-test-$CACHE_TYPE # Dependencies cache
+    - key: dependency-$CACHE_TYPE # Dependencies cache
       paths:
         # Cached dependencies and wrappers for Gradle and Maven:
         - .gradle/wrapper
@@ -160,7 +160,6 @@ default:
         - 'dependency-lib'
     - key: $CI_PIPELINE_ID-$CACHE_TYPE # Incremental build cache. Shared by all jobs in the pipeline of the same type
       paths:
-        # Cached dependencies and wrappers for Gradle:
         - .gradle/caches/$GRADLE_VERSION
         - .gradle/$GRADLE_VERSION/executionHistory
         - workspace
@@ -188,8 +187,6 @@ default:
     - rm -rf .gradle
     - mv .gradle-copy .gradle
     - ls -la
-    - ls -la .mvn/caches
-    - ls -la .gradle/caches
     - gitlab_section_end "gradle-dance"
   after_script:
     - *cgroup_info
@@ -251,7 +248,7 @@ build:
   extends: .gradle_build
   variables:
     BUILD_CACHE_POLICY: push
-    CACHE_TYPE: lib
+    CACHE_TYPE: "lib"
     DEPENDENCY_CACHE_POLICY: pull
   script:
     - if [ $CI_PIPELINE_SOURCE == "schedule" ] ; then ./gradlew resolveAndLockAll --write-locks $GRADLE_ARGS; fi
@@ -370,7 +367,7 @@ test_published_artifacts:
   stage: tests
   needs: [ build ]
   variables:
-    CACHE_TYPE: lib
+    CACHE_TYPE: "lib"
   script:
     - mvn_local_repo=$(./mvnw help:evaluate -Dexpression=settings.localRepository -q -DforceStdout)
     - rm -rf "${mvn_local_repo}/com/datadoghq"
@@ -398,7 +395,7 @@ test_published_artifacts:
   needs: [ build ]
   stage: tests
   variables:
-    CACHE_TYPE: inst
+    CACHE_TYPE: "inst"
   script:
     - *gitlab_base_ref_params
     - ./gradlew --version
@@ -459,7 +456,7 @@ muzzle:
     matrix:
       - CI_SPLIT: ["1/8", "2/8", "3/8", "4/8", "5/8", "6/8", "7/8", "8/8"]
   variables:
-    CACHE_TYPE: inst
+    CACHE_TYPE: "inst"
   script:
     - export SKIP_BUILDSCAN="true"
     - ./gradlew --version
@@ -481,7 +478,7 @@ muzzle-dep-report:
   needs: [ build_tests ]
   stage: tests
   variables:
-    CACHE_TYPE: inst
+    CACHE_TYPE: "inst"
   script:
     - export SKIP_BUILDSCAN="true"
     - ./gradlew --version
@@ -814,7 +811,7 @@ deploy_to_maven_central:
   stage: publish
   needs: [ build ]
   variables:
-    CACHE_TYPE: lib
+    CACHE_TYPE: "lib"
   rules:
     - if: '$POPULATE_CACHE'
       when: never