Merge branch 'master' into sarahchen6/move-macrobenchmarks

Author: sarahchen6

.github/workflows/analyze-changes.yaml

@@ -30,7 +30,7 @@ jobs:
             ${{ runner.os }}-gradle-
         
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
         with:
           languages: 'java'
           build-mode: 'manual'
@@ -49,7 +49,7 @@ 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@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
 
   trivy:
     name: Analyze changes with Trivy
@@ -114,7 +114,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@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
+        uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

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

@@ -21,6 +21,8 @@ jobs:
   build:
     runs-on:
       group: APM Larger Runners
+    environment:
+      name: ci-build
     steps:
       - name: Checkout repository
         uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # 6.0.0

.gitlab-ci.yml

@@ -367,6 +367,12 @@ spotless:
   extends: .gradle_build
   stage: tests
   needs: []
+  variables:
+    # TODO: Latest version of spotless is failing with OOM on CI only.
+    # Setting 8G memory solving this issue, but we need to solve it eventually.
+    GRADLE_MEM: 8G
+    KUBERNETES_MEMORY_REQUEST: 18Gi
+    KUBERNETES_MEMORY_LIMIT: 18Gi
   script:
     - ./gradlew --version
     - ./gradlew spotlessCheck $GRADLE_ARGS

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
   id("dd-trace-java.config-inversion-linter")
   id("dd-trace-java.ci-jobs")
 
-  id("com.diffplug.spotless") version "6.13.0"
+  id("com.diffplug.spotless") version "8.1.0"
   id("com.github.spotbugs") version "6.4.7"
   id("de.thetaphi.forbiddenapis") version "3.10"
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
@@ -36,7 +36,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
     removeUnusedImports()
 
     // This is the last Google Java Format version that supports Java 8
-    googleJavaFormat("1.7")
+    googleJavaFormat("1.32.0")
   }
   groovyGradle {
     greclipse()
@@ -45,13 +45,14 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
     greclipse()
   }
   kotlinGradle {
-    ktlint("0.41.0")
+    ktlint("1.8.0")
   }
   kotlin {
-    ktlint("0.41.0")
+    ktlint("1.8.0")
   }
   scala {
-    scalafmt("2.7.5")
+    // TODO: For some reason Scala format is working correctly with this version only.
+    scalafmt("3.8.6")
   }
 }
 apply(from = rootDir.resolve("gradle/spotless.gradle"))
@@ -145,7 +146,8 @@ testAggregate("instrumentation", listOf(":dd-java-agent:instrumentation"), empty
 testAggregate("profiling", listOf(":dd-java-agent:agent-profiling"), emptyList())
 testAggregate("debugger", listOf(":dd-java-agent:agent-debugger"), forceCoverage = true)
 testAggregate(
-  "base", listOf(":"),
+  "base",
+  listOf(":"),
   listOf(
     ":dd-java-agent:instrumentation",
     ":dd-smoke-tests",

buildSrc/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
   `java-gradle-plugin`
   `kotlin-dsl`
   `jvm-test-suite`
-  id("com.diffplug.spotless") version "6.13.0"
+  id("com.diffplug.spotless") version "8.1.0"
 }
 
 java {

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   java
   groovy
-  id("com.diffplug.spotless") version "6.13.0"
+  id("com.diffplug.spotless") version "8.1.0"
   id("com.gradleup.shadow") version "8.3.6"
 }
 
@@ -17,8 +17,7 @@ spotless {
     target("src/**/*.java")
     // ignore embedded test projects
     targetExclude("src/test/resources/**")
-    // This is the last Google Java Format version that supports Java 8
-    googleJavaFormat("1.7")
+    googleJavaFormat("1.32.0")
   }
 }
 

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ConfigInversionLinter.kt

@@ -26,6 +26,40 @@ class ConfigInversionLinter : Plugin<Project> {
   }
 }
 
+// Data class for fields from generated class
+private data class LoadedConfigFields(
+  val supported: Set<String>,
+  val aliasMapping: Map<String, String> = emptyMap()
+)
+
+// Cache for fields from generated class
+private var cachedConfigFields: LoadedConfigFields? = null
+
+// Helper function to load fields from the generated class
+private fun loadConfigFields(
+  mainSourceSetOutput: org.gradle.api.file.FileCollection,
+  generatedClassName: String
+): LoadedConfigFields {
+  return cachedConfigFields ?: run {
+    val urls = mainSourceSetOutput.files.map { it.toURI().toURL() }.toTypedArray()
+    URLClassLoader(urls, LoadedConfigFields::class.java.classLoader).use { cl ->
+      val clazz = Class.forName(generatedClassName, true, cl)
+
+      val supportedField = clazz.getField("SUPPORTED").get(null)
+      @Suppress("UNCHECKED_CAST")
+      val supportedSet = when (supportedField) {
+        is Set<*> -> supportedField as Set<String>
+        is Map<*, *> -> supportedField.keys as Set<String>
+        else -> throw IllegalStateException("SUPPORTED field must be either Set<String> or Map<String, Any>, but was ${supportedField?.javaClass}")
+      }
+
+      @Suppress("UNCHECKED_CAST")
+      val aliasMappingMap = clazz.getField("ALIAS_MAPPING").get(null) as Map<String, String>
+      LoadedConfigFields(supportedSet, aliasMappingMap)
+    }.also { cachedConfigFields = it }
+  }
+}
+
 /** Registers `logEnvVarUsages` (scan for DD_/OTEL_ tokens and fail if unsupported). */
 private fun registerLogEnvVarUsages(target: Project, extension: SupportedTracerConfigurations) {
   val ownerPath = extension.configOwnerPath
@@ -52,16 +86,11 @@ private fun registerLogEnvVarUsages(target: Project, extension: SupportedTracerC
     inputs.files(javaFiles)
     outputs.upToDateWhen { true }
     doLast {
-      // 1) Build classloader from the owner project’s runtime classpath
-      val urls = mainSourceSetOutput.get().get().files.map { it.toURI().toURL() }.toTypedArray()
-      val supported: Set<String> = URLClassLoader(urls, javaClass.classLoader).use { cl ->
-        // 2) Load the generated class + read static field
-        val clazz = Class.forName(generatedFile.get(), true, cl)
-        @Suppress("UNCHECKED_CAST")
-        clazz.getField("SUPPORTED").get(null) as Set<String>
-      }
+      // 1) Load configuration fields from the generated class
+      val configFields = loadConfigFields(mainSourceSetOutput.get().get(), generatedFile.get())
+      val supported = configFields.supported
 
-      // 3) Scan our sources and compare
+      // 2) Scan our sources and compare
       val repoRoot = target.projectDir.toPath()
       val tokenRegex = Regex("\"(?:DD_|OTEL_)[A-Za-z0-9_]+\"")
 
@@ -79,7 +108,7 @@ private fun registerLogEnvVarUsages(target: Project, extension: SupportedTracerC
             }
             tokenRegex.findAll(raw).forEach { m ->
               val token = m.value.trim('"')
-              if (token !in supported) add("$rel:${i + 1} -> Unsupported token'$token'")
+              if (token !in supported) add("$rel:${i + 1} -> Unsupported token '$token'")
             }
           }
         }
@@ -167,15 +196,9 @@ private fun registerCheckConfigStringsTask(project: Project, extension: Supporte
         throw GradleException("Config directory not found: ${configDir.absolutePath}")
       }
 
-      val urls = mainSourceSetOutput.get().get().files.map { it.toURI().toURL() }.toTypedArray()
-      val (supported, aliasMapping) = URLClassLoader(urls, javaClass.classLoader).use { cl ->
-        val clazz = Class.forName(generatedFile.get(), true, cl)
-        @Suppress("UNCHECKED_CAST")
-        val supportedSet = clazz.getField("SUPPORTED").get(null) as Set<String>
-        @Suppress("UNCHECKED_CAST")
-        val aliasMappingMap = clazz.getField("ALIAS_MAPPING").get(null) as Map<String, String>
-        Pair(supportedSet, aliasMappingMap)
-      }
+      val configFields = loadConfigFields(mainSourceSetOutput.get().get(), generatedFile.get())
+      val supported = configFields.supported
+      val aliasMapping = configFields.aliasMapping
 
       var parserConfig = ParserConfiguration()
       parserConfig.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_8)
@@ -192,23 +215,23 @@ private fun registerCheckConfigStringsTask(project: Project, extension: Supporte
               .map { it as? FieldDeclaration }
               .ifPresent { field ->
                 if (field.hasModifiers(Modifier.Keyword.PUBLIC, Modifier.Keyword.STATIC, Modifier.Keyword.FINAL) &&
-                varDecl.typeAsString == "String") {
+                  varDecl.typeAsString == "String") {
 
-                val fieldName = varDecl.nameAsString
-                if (fieldName.endsWith("_DEFAULT")) return@ifPresent
-                val init = varDecl.initializer.orElse(null) ?: return@ifPresent
+                  val fieldName = varDecl.nameAsString
+                  if (fieldName.endsWith("_DEFAULT")) return@ifPresent
+                  val init = varDecl.initializer.orElse(null) ?: return@ifPresent
 
-                if (init !is StringLiteralExpr) return@ifPresent
-                val rawValue = init.value
+                  if (init !is StringLiteralExpr) return@ifPresent
+                  val rawValue = init.value
 
-                val normalized = normalize(rawValue)
-                if (normalized !in supported && normalized !in aliasMapping) {
-                  val line = varDecl.range.map { it.begin.line }.orElse(1)
-                  add("$fileName:$line -> Config '$rawValue' normalizes to '$normalized' " +
-                      "which is missing from '${extension.jsonFile.get()}'")
+                  val normalized = normalize(rawValue)
+                  if (normalized !in supported && normalized !in aliasMapping) {
+                    val line = varDecl.range.map { it.begin.line }.orElse(1)
+                    add("$fileName:$line -> Config '$rawValue' normalizes to '$normalized' " +
+                        "which is missing from '${extension.jsonFile.get()}'")
+                  }
                 }
               }
-            }
           }
         }
       }

components/context/src/main/java/datadog/context/ContextKey.java

@@ -10,8 +10,10 @@
  */
 public final class ContextKey<T> {
   private static final AtomicInteger NEXT_INDEX = new AtomicInteger(0);
+
   /** The key name, for debugging purpose only. */
   private final String name;
+
   /** The key unique context, related to {@link IndexedContext} implementation. */
   final int index;
 

components/context/src/main/java/datadog/context/propagation/Concern.java

@@ -8,8 +8,10 @@
 public class Concern {
   /** The concern default priority. */
   public static final int DEFAULT_PRIORITY = 100;
+
   /** The concern name, for debugging purpose only. */
   private final String name;
+
   /** The concern priority, lower value means higher priority. */
   private final int priority;
 

dd-java-agent/agent-bootstrap/build.gradle

@@ -73,5 +73,4 @@ tasks.withType(Test).configureEach {
     JavaVersion.VERSION_16,
     ['--add-opens', 'java.base/java.net=ALL-UNNAMED'] // for HostNameResolverForkedTest
     )
-
 }