Merge branch 'master' into alexeyk/spotless-attempt-2

AlexeyKuznetsov-DD · AlexeyKuznetsov-DD · commit 84c5e2d90270 · 2025-10-27T14:56:59.000-04:00
diff --git 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"
 
@@ -148,10 +148,11 @@ 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
+        - .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
@@ -174,6 +175,7 @@ default:
     - export GRADLE_USER_HOME=$(pwd)/.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
+    - 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
@@ -246,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
@@ -365,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"
@@ -393,7 +395,7 @@ test_published_artifacts:
   needs: [ build ]
   stage: tests
   variables:
-    CACHE_TYPE: lib
+    CACHE_TYPE: "lib"
   script:
     - *gitlab_base_ref_params
     - ./gradlew --version
@@ -429,6 +431,7 @@ check_inst:
   parallel: 4
   variables:
     GRADLE_TARGET: ":instrumentationCheck"
+    CACHE_TYPE: "inst"
 
 check_smoke:
   extends: .check_job
@@ -454,7 +457,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
@@ -476,7 +479,7 @@ muzzle-dep-report:
   needs: [ build_tests ]
   stage: tests
   variables:
-    CACHE_TYPE: inst
+    CACHE_TYPE: "inst"
   script:
     - export SKIP_BUILDSCAN="true"
     - ./gradlew --version
@@ -809,7 +812,7 @@ deploy_to_maven_central:
   stage: publish
   needs: [ build ]
   variables:
-    CACHE_TYPE: lib
+    CACHE_TYPE: "lib"
   rules:
     - if: '$POPULATE_CACHE'
       when: never
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,6 +13,10 @@ Check [Adding a New Instrumentation](docs/add_new_instrumentation.md) for instru
 
 Check [How Instrumentations Work](docs/how_instrumentations_work.md) for a deep dive into how instrumentations work.
 
+## Adding Configurations
+
+Check [Adding a New Configuration](docs/add_new_configurations.md) for instructions on adding a new configuration.
+
 ## Code contributions
 
 ### Development environment quick check
diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/propagation/StringModuleImpl.java
@@ -205,7 +205,7 @@ public void onStringConcatFactory(
     int offset = 0;
     for (int item : recipeOffsets) {
       if (item < 0) {
-        offset += -item;
+        offset -= item;
       } else {
         final String argument = args[item];
         final Range[] ranges = getRanges(getTainted(taintedObjects, argument));
diff --git a/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/jetty/JettyPerftest.java b/dd-java-agent/benchmark-integration/jetty-perftest/src/main/java/datadog/perftest/jetty/JettyPerftest.java
@@ -48,7 +48,7 @@ protected void doGet(final HttpServletRequest request, final HttpServletResponse
         throw new RuntimeException("some sync error");
       }
       final String workVal = request.getParameter("workTimeMS");
-      long workTimeMS = 0l;
+      long workTimeMS = 0L;
       if (null != workVal) {
         workTimeMS = Long.parseLong(workVal);
       }
diff --git a/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/ErpcTls.java b/dd-java-agent/cws-tls/src/main/java/datadog/cws/tls/ErpcTls.java
@@ -120,7 +120,7 @@ private void registerTls() {
 
     pointer.setLong(0, TLS_FORMAT);
     pointer.setLong(Native.LONG_SIZE, maxThreads);
-    pointer.setPointer(Native.LONG_SIZE * 2, tls);
+    pointer.setPointer(Native.LONG_SIZE * 2L, tls);
 
     sendRequest(request);
   }
diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle
@@ -221,16 +221,30 @@ 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"
+  ]
+
+  // Specify caches folder on CI.
+  if (providers.environmentVariable("CI").isPresent()) {
+    mvnArgs.add(1, "-Dmaven.repo.local=$rootDir/.mvn/caches")
+  }
+
+  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")
diff --git a/dd-java-agent/load-generator/src/main/java/datadog/loadgenerator/LoadGenerator.java b/dd-java-agent/load-generator/src/main/java/datadog/loadgenerator/LoadGenerator.java
@@ -68,7 +68,7 @@ public Integer call() throws Exception {
     }
 
     while (true) {
-      Thread.sleep(printInterval * 1000);
+      Thread.sleep(printInterval * 1000L);
 
       final long currentTracesSent = tracesSent.get();
       final long intervalEnd = System.currentTimeMillis();
diff --git a/dd-smoke-tests/jersey-3/src/main/java/smoketest/MainApp.java b/dd-smoke-tests/jersey-3/src/main/java/smoketest/MainApp.java
@@ -71,7 +71,8 @@ public static void main(String[] args) {
                     }
                   }));
 
-      System.out.println(String.format("Application started.%nStop the application using CTRL+C"));
+      System.out.println("Application started.");
+      System.out.println("Stop the application using CTRL+C");
 
       // block and wait shut down signal, like CTRL+C
       Thread.currentThread().join();
diff --git 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,18 @@ 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"]
+
+  // Specify caches folder on CI.
+  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
@@ -13,9 +13,18 @@ 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"]
+
+  // Specify caches folder on CI.
+  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/docs/add_new_configurations.md b/docs/add_new_configurations.md
@@ -0,0 +1,59 @@
+# Add a New Configuration
+
+This doc will walk through how to properly add and document a new [configuration](https://docs.datadoghq.com/tracing/trace_collection/library_config/java/) in the Java Library.
+
+## Where Configurations Live
+
+All configurations in the Java Library are defined in the package `dd-trace-api/src/main/java/datadog/trace/api/config`. 
+Configurations are separated into different files based on the product they are related to. e.g. `CiVisiblity` related configurations live in `CiVisibilityConfig.java`, `Tracer` related in `TracerConfig.java`, etc. 
+Default values for configurations live in `ConfigDefaults.java`.  
+
+Configuration values are read and stored in `Config.java`, which utilizes helper methods in `ConfigProvider.java` to fetch the final value for a configuration after searching through all Configuration Sources and determining the final value based on Source priority. Below is the list of Sources that are queried for assigning Configuration values in order from highest to lowest priority:
+1. System Properties: JVM System Properties
+2. Stable Config - Fleet Automation: Now known as Declarative Configuration, this source reads a list of configurations through a `.yaml` file on Fleet Automation to take effect on all instances on a host.
+3. CI Environment Variables: Source for Configurations related to the `CiVisibility` product. 
+4. Environment Variables: JVM Environment Variables
+5. Properties File: By defining a filepath in `DD_TRACE_CONFIG`/`trace.config`, users can define Configuration key/value pairs in the file
+6. OpenTelemetry Environment Variables: A list of OpenTelemetry Configurations that are supported in the Java Library. See [OtelEnvironmentConfigSource.java](../utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/OtelEnvironmentConfigSource.java) for a list of supported OpenTelemetry Configurations.
+7. Stable Config - Local File: Now known as Declarative Configuration, this source reads a list of configurations through a local `.yaml` file on set by the user to take effect on all instances on a host.
+8. Captured Environment Variables: Auto-detects values for certain Configurations. Essentially setting "default" values for specific Configurations. 
+
+Additionally, `Config.java` also includes getters that can be used in other classes to get the value of a configuration. These getters should be the only method used to query the value of a configuration. Do **NOT** use `ConfigProvider.java` to re-query the values of a configuration.
+
+## Adding a Configuration
+
+In order to properly add a new configuration in the library, follow the below steps.
+1. Determine whether this configuration exists in another tracing library in the [Feature Parity Dashboard](https://feature-parity.us1.prod.dog/#/configurations?viewType=configurations). Developers can search by Environment Variable name or description of the configuration.
+   1. If the configuration exists in a separate tracing library, reuse the name of the existing configuration. If the configuration already exists in the Java Library, utilize that instead.
+2. Add the definition of the configuration to the appropriate "Config" class based on its related product.
+   1. When choosing a configuration definition, consider separating words by `.` and compound words by `-`. Note that `dd.` or `DD_` should not belong in the configuration definition as the base definitions are normalized to include those prefixes when querying the varying Configuration Sources. (e.g. `public static final String DOGSTATSD_START_DELAY = "dogstatsd.start-delay"`)
+3. If a non-null default value for the configuration exists, define the value in a static field in `ConfigDefaults.java`.
+4. Create a local field in `Config.java` to represent the configuration. In the constructor of `Config.java`, call the appropriate helper from `ConfigProvider.java` to query and assign the value of the configuration based off what datatype the Configuration expects to store. (e.g. `ConfigProvider::getString`, `ConfigProvider::getBoolean`, etc.)
+   1. This field should be final and not changed during runtime. If the value of a configuration needs to be changed, it can be done through a Snapshot with Dynamic Configuration. See [DynamicConfig.java](../internal-api/src/main/java/datadog/trace/api/DynamicConfig.java).
+5. Create a getter for the field in `Config.java` to allow other classes to access the value of the configuration.
+6. Add the configuration to the `toString()` method of `Config.java` for logging purposes.
+7. Add the Environment Variable name of the configuration to the `supportedConfigurations` key of `metadata/supported-configurations.json` in the format of `ENV_VAR: ["VERSION", ...]`. If the configuration already existed in another library, add the version listed on the Feature Parity Dashboard. If introducing a new configuration, provide a version of `A`.
+   1. If there are aliases of the Environment Variable, add them to the `aliases` key of the file. 
+
+See below for the format of the `supported-configurations.json` file.
+```
+{
+  "supportedConfigurations": {
+    "DD_ENV_VAR": ["A"],
+    "DD_TEST_VAR": ["A"]
+  },
+  "aliases": {
+    "DD_ENV_VAR": ["DD_ENV_ALIAS"]
+  },
+  "deprecations": {
+  }
+}
+```
+8. If the configuration is unique to all tracing libraries, add it to the [Feature Parity Dashboard](https://feature-parity.us1.prod.dog/#/configurations?viewType=configurations). This ensures that we have good documentation of all configurations supported in the library.
+
+For details on adding environment variables to `metadata/supported-configurations.json` or the Feature Parity Dashboard, refer to this [document](https://datadoghq.atlassian.net/wiki/spaces/APMINT/pages/5372248222/APM+-+Centralized+Configuration+Config+inversion#dd-trace-java).
+
+## Verifying the Configuration
+
+To verify a configuration has been correctly added, developers can modify existing test cases in `ConfigTest.groovy` to set the value of the configuration with various sources and confirm the internal value is correctly set in `Config.java`.
+Optionally, new test cases can be added for testing specific to the behavior of a configuration.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -31,7 +31,7 @@ moshi = '1.11.0'
 testcontainers = '1.21.3'
 jmc = "8.1.0"
 autoservice = "1.1.1"
-ddprof = "1.33.0"
+ddprof = "1.34.0"
 asm = "9.9"
 cafe_crypto = "0.1.0"
 lz4 = "1.7.1"
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -2381,7 +2381,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
     remoteConfigMaxPayloadSize =
         configProvider.getInteger(
                 REMOTE_CONFIG_MAX_PAYLOAD_SIZE, DEFAULT_REMOTE_CONFIG_MAX_PAYLOAD_SIZE)
-            * 1024;
+            * 1024L;
     remoteConfigTargetsKeyId =
         configProvider.getString(
             REMOTE_CONFIG_TARGETS_KEY_ID, DEFAULT_REMOTE_CONFIG_TARGETS_KEY_ID);
@@ -2441,7 +2441,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
         configProvider.getInteger(
                 DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE,
                 DEFAULT_DYNAMIC_INSTRUMENTATION_MAX_PAYLOAD_SIZE)
-            * 1024;
+            * 1024L;
     dynamicInstrumentationVerifyByteCode =
         configProvider.getBoolean(
             DYNAMIC_INSTRUMENTATION_VERIFY_BYTECODE,
diff --git a/internal-api/src/test/groovy/datadog/trace/api/ConfigCollectorTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ConfigCollectorTest.groovy
@@ -10,6 +10,7 @@ import datadog.trace.api.config.TracerConfig
 import datadog.trace.api.iast.telemetry.Verbosity
 import datadog.trace.api.naming.SpanNaming
 import datadog.trace.bootstrap.config.provider.ConfigProvider
+import datadog.trace.config.inversion.ConfigHelper
 import datadog.trace.test.util.DDSpecification
 import datadog.trace.util.ConfigStrings
 
@@ -276,6 +277,9 @@ class ConfigCollectorTest extends DDSpecification {
 
   def "config id is null for non-StableConfigSource"() {
     setup:
+    def strictness = ConfigHelper.get().configInversionStrictFlag()
+    ConfigHelper.get().setConfigInversionStrict(ConfigHelper.StrictnessPolicy.TEST)
+
     def key = "test.key"
     def value = "test-value"
     injectSysConfig(key, value)
@@ -292,6 +296,9 @@ class ConfigCollectorTest extends DDSpecification {
     setting.configId == null
     setting.value == value
     setting.origin == ConfigOrigin.JVM_PROP
+
+    cleanup:
+    ConfigHelper.get().setConfigInversionStrict(strictness)
   }
 
   def "default sources cannot be overridden"() {
diff --git a/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected void doGet(final HttpServletRequest request, final HttpServletResponse`
`48`	`48`	`throw new RuntimeException("some sync error");`
`49`	`49`	`}`
`50`	`50`	`final String workVal = request.getParameter("workTimeMS");`
`51`		`- long workTimeMS = 0l;`
	`51`	`+ long workTimeMS = 0L;`
`52`	`52`	`if (null != workVal) {`
`53`	`53`	`workTimeMS = Long.parseLong(workVal);`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ private void registerTls() {`
`120`	`120`
`121`	`121`	`pointer.setLong(0, TLS_FORMAT);`
`122`	`122`	`pointer.setLong(Native.LONG_SIZE, maxThreads);`
`123`		`- pointer.setPointer(Native.LONG_SIZE * 2, tls);`
	`123`	`+ pointer.setPointer(Native.LONG_SIZE * 2L, tls);`
`124`	`124`
`125`	`125`	`sendRequest(request);`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public Integer call() throws Exception {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`while (true) {`
`71`		`- Thread.sleep(printInterval * 1000);`
	`71`	`+ Thread.sleep(printInterval * 1000L);`
`72`	`72`
`73`	`73`	`final long currentTracesSent = tracesSent.get();`
`74`	`74`	`final long intervalEnd = System.currentTimeMillis();`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ public static void main(String[] args) {`
`71`	`71`	`}`
`72`	`72`	`}));`
`73`	`73`
`74`		`- System.out.println(String.format("Application started.%nStop the application using CTRL+C"));`
	`74`	`+ System.out.println("Application started.");`
	`75`	`+ System.out.println("Stop the application using CTRL+C");`
`75`	`76`
`76`	`77`	`// block and wait shut down signal, like CTRL+C`
`77`	`78`	`Thread.currentThread().join();`