Implement Config Inversion with Default Strictness of Warning

build.gradle.kts

@@ -9,6 +9,7 @@ plugins {
   id("de.thetaphi.forbiddenapis") version "3.8"
 
   id("tracer-version")
+  id("config-inversion-linter")
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 
   id("com.gradleup.shadow") version "8.3.6" apply false

buildSrc/build.gradle.kts

@@ -30,6 +30,14 @@ gradlePlugin {
       id = "tracer-version"
       implementationClass = "datadog.gradle.plugin.version.TracerVersionPlugin"
     }
+    create("config-generation") {
+      id = "supported-config-generator"
+      implementationClass = "datadog.gradle.plugin.config.SupportedConfigPlugin"
+    }
+    create("supported-config-linter") {
+      id = "config-inversion-linter"
+      implementationClass = "datadog.gradle.plugin.config.ConfigInversionLinter"
+    }
   }
 }
 
@@ -52,6 +60,11 @@ dependencies {
   implementation("com.google.guava", "guava", "20.0")
   implementation("org.ow2.asm", "asm", "9.8")
   implementation("org.ow2.asm", "asm-tree", "9.8")
+
+  implementation(platform("com.fasterxml.jackson:jackson-bom:2.17.2"))
+  implementation("com.fasterxml.jackson.core:jackson-databind")
+  implementation("com.fasterxml.jackson.core:jackson-annotations")
+  implementation("com.fasterxml.jackson.core:jackson-core")
 }
 
 tasks.compileKotlin {

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

@@ -0,0 +1,126 @@
+package datadog.gradle.plugin.config
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.GradleException
+import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.SourceSetContainer
+import java.net.URLClassLoader
+import java.nio.file.Path
+
+class ConfigInversionLinter : Plugin<Project> {
+  override fun apply(target: Project) {
+    registerLogEnvVarUsages(target)
+    registerCheckEnvironmentVariablesUsage(target)
+  }
+}
+
+/** Registers `logEnvVarUsages` (scan for DD_/OTEL_ tokens and fail if unsupported). */
+private fun registerLogEnvVarUsages(target: Project) {
+  val ownerPath = ":utils:config-utils" // <-- change to the module that contains the generated class
+  val generatedFile = "datadog.config.GeneratedSupportedConfigurations"
+
+  // token check that uses the generated class instead of JSON
+  target.tasks.register("logEnvVarUsages") {
+    group = "verification"
+    description = "Scan Java files for DD_/OTEL_ tokens and fail if unsupported (using generated constants)"
+
+    val owner = target.project(ownerPath)
+    val sourceSets = owner.extensions.getByType(SourceSetContainer::class.java)
+    val main = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
+
+    // ensure the owner project generated/compiled the class
+    dependsOn(
+      owner.tasks.named("generateSupportedConfigurations"),
+      owner.tasks.named("classes") // compiles main (including generated sources)
+    )
+
+    // inputs for incrementality (your own source files, not the owner’s)
+    val javaFiles = target.fileTree(target.projectDir) {
+      include("**/src/main/java/**/*.java")
+      exclude("**/build/**", "**/dd-smoke-tests/**")
+    }
+    inputs.files(javaFiles)
+    outputs.upToDateWhen { true}
+    doLast {
+      // 1) Build classloader from the owner project’s runtime classpath
+      val urls = main.runtimeClasspath.files.map { it.toURI().toURL() }.toTypedArray()
+      URLClassLoader(urls, javaClass.classLoader).use { cl ->
+        // 2) Load the generated class + read static field
+        val clazz = Class.forName(generatedFile, true, cl)
+
+        @Suppress("UNCHECKED_CAST")
+        val supported: Set<String> = clazz.getField("SUPPORTED").get(null) as Set<String>
+
+        // 3) Scan our sources and compare
+        val repoRoot = target.projectDir.toPath()
+        val tokenRegex = Regex("\"(?:DD_|OTEL_)[A-Za-z0-9_]+\"")
+
+        val violations = mutableListOf<String>()
+        javaFiles.files.forEach { f ->
+          val rel = repoRoot.relativize(f.toPath()).toString()
+          var inBlock = false
+          f.readLines().forEachIndexed { i, raw ->
+            val trimmed = raw.trim()
+            if (trimmed.startsWith("//")) return@forEachIndexed
+            if (!inBlock && trimmed.contains("/*")) inBlock = true
+            if (inBlock) {
+              if (trimmed.contains("*/")) inBlock = false
+              return@forEachIndexed
+            }
+            tokenRegex.findAll(raw).forEach { m ->
+              val token = m.value.trim('"')
+              if (token !in supported) violations += "$rel:${i + 1} -> Unsupported token '$token'"
+            }
+          }
+        }
+
+        if (violations.isNotEmpty()) {
+          violations.forEach { target.logger.error(it) }
+          throw GradleException("Unsupported DD_/OTEL_ tokens found! See errors above.")
+        } else {
+          target.logger.lifecycle("All DD_/OTEL_ tokens are supported.")
+        }
+      }
+    }
+  }
+}
+
+/** Registers `checkEnvironmentVariablesUsage` (forbid EnvironmentVariables.get(...)). */
+private fun registerCheckEnvironmentVariablesUsage(project: Project) {
+  project.tasks.register("checkEnvironmentVariablesUsage") {
+    group = "verification"
+    description = "Scans src/main/java for direct usages of EnvironmentVariables.get(...)"
+
+    doLast {
+      val repoRoot: Path = project.projectDir.toPath()
+      val javaFiles = project.fileTree(project.projectDir) {
+        include("**/src/main/java/**/*.java")
+        exclude("**/build/**")
+        exclude("internal-api/src/main/java/datadog/trace/api/ConfigHelper.java")
+        exclude("dd-java-agent/agent-bootstrap/**")
+        exclude("dd-java-agent/src/main/java/datadog/trace/bootstrap/BootstrapInitializationTelemetry.java")
+      }
+
+      val pattern = Regex("""EnvironmentVariables\.get\s*\(""")
+      val matches = mutableListOf<String>()
+
+      javaFiles.forEach { f ->
+        val relative = repoRoot.relativize(f.toPath())
+        f.readLines().forEachIndexed { idx, line ->
+          if (pattern.containsMatchIn(line)) {
+            matches += "$relative:${idx + 1} -> ${line.trim()}"
+          }
+        }
+      }
+
+      if (matches.isNotEmpty()) {
+        project.logger.lifecycle("\nFound forbidden usages of EnvironmentVariables.get(...):")
+        matches.forEach { project.logger.lifecycle(it) }
+        throw GradleException("Forbidden usage of EnvironmentVariables.get(...) found in Java files.")
+      } else {
+        project.logger.lifecycle("No forbidden EnvironmentVariables.get(...) usages found in src/main/java.")
+      }
+    }
+  }
+}

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

@@ -0,0 +1,147 @@
+package datadog.gradle.plugin.config
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.ObjectMapper
+import java.io.File
+import java.io.FileInputStream
+import java.io.PrintWriter
+import javax.inject.Inject
+
+abstract class ParseSupportedConfigurationsTask  @Inject constructor(
+  private val objects: ObjectFactory
+) : DefaultTask() {
+  @InputFile
+  val jsonFile = objects.fileProperty()
+
+  @get:OutputDirectory
+  val destinationDirectory = objects.directoryProperty()
+
+  @Input
+  val className =  objects.property(String::class.java)
+
+  @TaskAction
+  fun generate() {
+    val input = jsonFile.get().asFile
+    val outputDir = destinationDirectory.get().asFile
+    val fqcn = className.get()
+    outputDir.mkdirs()
+
+    // Read JSON (directly from the file, not classpath)
+    val mapper = ObjectMapper()
+    val fileData: Map<String, Any?> = FileInputStream(input).use { inStream ->
+      mapper.readValue(inStream, object : TypeReference<Map<String, Any?>>() {})
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    val supported = fileData["supportedConfigurations"] as Map<String, List<String>>
+    @Suppress("UNCHECKED_CAST")
+    val aliases = fileData["aliases"] as Map<String, List<String>>
+    @Suppress("UNCHECKED_CAST")
+    val deprecated = (fileData["deprecations"] as? Map<String, String>) ?: emptyMap()
+
+    val aliasMapping = mutableMapOf<String, String>()
+    for ((canonical, alist) in aliases) {
+      for (alias in alist) aliasMapping[alias] = canonical
+    }
+
+    // Build the output .java path from the fully-qualified class name
+    val pkgPath = fqcn.substringBeforeLast('.', "").replace('.', File.separatorChar)
+    val simpleName = fqcn.substringAfterLast('.')
+    val pkgDir = if (pkgPath.isEmpty()) outputDir else File(outputDir, pkgPath).also { it.mkdirs() }
+    val generatedFile = File(pkgDir, "$simpleName.java").absolutePath
+
+    // Call your existing generator (same signature as in your Java code)
+    generateJavaFile(
+      generatedFile,
+      supported.keys,
+      aliases,
+      aliasMapping,
+      deprecated
+    )
+  }
+
+  private fun generateJavaFile(
+    outputPath: String,
+    supportedKeys: Set<String>,
+    aliases: Map<String, List<String>>,
+    aliasMapping: Map<String, String>,
+    deprecated: Map<String, String>
+  ) {
+    val outFile = File(outputPath)
+    outFile.parentFile?.mkdirs()
+
+    PrintWriter(outFile).use { out ->
+      // NOTE: adjust these if you want to match task's className
+      out.println("package datadog.config;")
+      out.println()
+      out.println("import java.util.*;")
+      out.println()
+      out.println("public final class GeneratedSupportedConfigurations {")
+      out.println()
+      out.println("  public static final Set<String> SUPPORTED;")
+      out.println()
+      out.println("  public static final Map<String, List<String>> ALIASES;")
+      out.println()
+      out.println("  public static final Map<String, String> ALIAS_MAPPING;")
+      out.println()
+      out.println("  public static final Map<String, String> DEPRECATED;")
+      out.println()
+      out.println("  static {")
+      out.println()
+
+      // SUPPORTED
+      out.print("    Set<String> supportedSet = new HashSet<>(Arrays.asList(")
+      val supportedIter = supportedKeys.toSortedSet().iterator()
+      while (supportedIter.hasNext()) {
+        val key = supportedIter.next()
+        out.print("\"${esc(key)}\"")
+        if (supportedIter.hasNext()) out.print(", ")
+      }
+      out.println("));")
+      out.println("    SUPPORTED = Collections.unmodifiableSet(supportedSet);")
+      out.println()
+
+      // ALIASES
+      out.println("    Map<String, List<String>> aliasesMap = new HashMap<>();")
+      for ((canonical, list) in aliases.toSortedMap()) {
+        out.printf(
+          "    aliasesMap.put(\"%s\", Collections.unmodifiableList(Arrays.asList(%s)));\n",
+          esc(canonical),
+          quoteList(list)
+        )
+      }
+      out.println("    ALIASES = Collections.unmodifiableMap(aliasesMap);")
+      out.println()
+
+      // ALIAS_MAPPING
+      out.println("    Map<String, String> aliasMappingMap = new HashMap<>();")
+      for ((alias, target) in aliasMapping.toSortedMap()) {
+        out.printf("    aliasMappingMap.put(\"%s\", \"%s\");\n", esc(alias), esc(target))
+      }
+      out.println("    ALIAS_MAPPING = Collections.unmodifiableMap(aliasMappingMap);")
+      out.println()
+
+      // DEPRECATED
+      out.println("    Map<String, String> deprecatedMap = new HashMap<>();")
+      for ((oldKey, note) in deprecated.toSortedMap()) {
+        out.printf("    deprecatedMap.put(\"%s\", \"%s\");\n", esc(oldKey), esc(note))
+      }
+      out.println("    DEPRECATED = Collections.unmodifiableMap(deprecatedMap);")
+      out.println()
+      out.println("  }")
+      out.println("}")
+    }
+  }
+
+  private fun quoteList(list: List<String>): String =
+    list.joinToString(", ") { "\"${esc(it)}\"" }
+
+  private fun esc(s: String): String =
+    s.replace("\\", "\\\\").replace("\"", "\\\"")
+}

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

@@ -0,0 +1,28 @@
+package datadog.gradle.plugin.config
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.SourceSetContainer
+
+class SupportedConfigPlugin : Plugin<Project> {
+  override fun apply(targetProject: Project) {
+    generateSupportedConfigurations(targetProject)
+  }
+
+  private fun generateSupportedConfigurations(targetProject: Project) {
+    val generateTask =
+      targetProject.tasks.register("generateSupportedConfigurations", ParseSupportedConfigurationsTask::class.java) {
+        jsonFile.set(project.file("src/main/resources/supported-configurations.json"))
+        destinationDirectory.set(project.layout.buildDirectory.dir("generated/supportedConfigurations"))
+        className.set("datadog.config.GeneratedSupportedConfigurations")
+      }
+
+    // Ensure Java compilation depends on the generated sources
+
+    val sourceset = targetProject.extensions.getByType(SourceSetContainer::class.java).named(SourceSet.MAIN_SOURCE_SET_NAME)
+    sourceset.configure {
+      java.srcDir(generateTask)
+    }
+  }
+}

communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java

@@ -15,8 +15,8 @@
 import datadog.communication.monitor.DDAgentStatsDClientManager;
 import datadog.communication.monitor.Monitoring;
 import datadog.communication.monitor.Recording;
+import datadog.config.util.Strings;
 import datadog.trace.api.telemetry.LogCollector;
-import datadog.trace.util.Strings;
 import java.nio.ByteBuffer;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashSet;

communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventFrameWriter.java

@@ -3,7 +3,7 @@
 import datadog.communication.serialization.EncodingCache;
 import datadog.communication.serialization.ValueWriter;
 import datadog.communication.serialization.Writable;
-import datadog.trace.util.Strings;
+import datadog.config.util.Strings;
 import datadog.trace.util.stacktrace.StackTraceFrame;
 
 public class StackTraceEventFrameWriter implements ValueWriter<StackTraceFrame> {

communication/src/main/java/datadog/communication/serialization/custom/stacktrace/StackTraceEventWriter.java

@@ -3,7 +3,7 @@
 import datadog.communication.serialization.EncodingCache;
 import datadog.communication.serialization.ValueWriter;
 import datadog.communication.serialization.Writable;
-import datadog.trace.util.Strings;
+import datadog.config.util.Strings;
 import datadog.trace.util.stacktrace.StackTraceEvent;
 
 public class StackTraceEventWriter implements ValueWriter<StackTraceEvent> {

communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy

@@ -3,7 +3,7 @@ package datadog.communication.ddagent
 import datadog.common.container.ContainerInfo
 import datadog.communication.monitor.Monitoring
 import datadog.trace.test.util.DDSpecification
-import datadog.trace.util.Strings
+import Strings
 import okhttp3.Call
 import okhttp3.Headers
 import okhttp3.HttpUrl

components/environment/src/main/java/datadog/environment/EnvironmentVariables.java

@@ -3,6 +3,7 @@
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.unmodifiableMap;
 
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -36,6 +37,7 @@ private EnvironmentVariables() {}
    * @return The environment variable value, {@code defaultValue} if missing, can't be retrieved or
    *     the environment variable name is {@code null}.
    */
+  @SuppressForbidden
   public static String getOrDefault(String name, String defaultValue) {
     if (name == null) {
       return defaultValue;
@@ -54,6 +56,7 @@ public static String getOrDefault(String name, String defaultValue) {
    * @return All environment variables captured in an unmodifiable {@link Map}, or an empty {@link
    *     Map} if they can't be retrieved.
    */
+  @SuppressForbidden
   public static Map<String, String> getAll() {
     try {
       return unmodifiableMap(new HashMap<>(System.getenv()));