Merge branch 'master' into alexeyk/groovy-4

# Conflicts:
#	dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle
#	dd-java-agent/instrumentation/spring/spring-data-1.8/build.gradle
#	dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle
#	dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle
#	dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle

@@ -25,7 +25,6 @@ tasks.named("compileJava", JavaCompile) {
 }
 
 groovySpock {
-  configureDependencies("testImplementation")
   configureDependencies("testImplementation", libs.spock.spring.groovy4)
 }
 

internal-api/src/main/java/datadog/trace/api/TagMap.java

@@ -96,11 +96,12 @@ static Ledger ledger(int size) {
 
   /**
    * Deprecated in favor of typed getters like...
+   *
    * <ul>
-   * <li>{@link TagMap#getObject(String)}
-   * <li>{@link TagMap#getString(String)}
-   * <li>{@link TagMap#getBoolean(String)
-   * <li>...
+   *   <li>{@link TagMap#getObject(String)}
+   *   <li>{@link TagMap#getString(String)}
+   *   <li>{@link TagMap#getBoolean(String)}
+   *   <li>...
    * </ul>
    */
   @Deprecated

utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/StableConfigSource.java

@@ -28,16 +28,14 @@ public final class StableConfigSource extends ConfigProvider.Source {
   private final StableConfig config;
 
   StableConfigSource(String filePath, ConfigOrigin origin) {
+    StableConfig cfg = StableConfig.EMPTY;
     this.fileOrigin = origin;
-    File file = new File(filePath);
-    if (!file.exists()) {
-      this.config = StableConfig.EMPTY;
-      return;
-    }
-    StableConfig cfg;
     try {
+      File file = new File(filePath);
       log.debug("Stable configuration file found at path: {}", file);
-      cfg = StableConfigParser.parse(filePath);
+      if (file.exists()) {
+        cfg = StableConfigParser.parse(filePath);
+      }
     } catch (Throwable e) {
       if (e instanceof StableConfigMappingException
           || e instanceof IllegalArgumentException
@@ -55,8 +53,6 @@ public final class StableConfigSource extends ConfigProvider.Source {
             filePath,
             e.getMessage());
       }
-
-      cfg = StableConfig.EMPTY;
     }
     this.config = cfg;
   }