Implement Config Inversion with Default Strictness of Warning

build.gradle.kts

@@ -53,6 +53,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
   }
 }
 apply(from = rootDir.resolve("gradle/spotless.gradle"))
+apply(from = rootDir.resolve("gradle/configInversionLinter.gradle"))
 
 val compileTask = tasks.register("compile")
 

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()));

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

@@ -24,6 +24,7 @@ dependencies {
   api project(':dd-java-agent:agent-debugger:debugger-bootstrap')
   api project(':components:environment')
   api project(':components:json')
+  api project(':utils:test-utils')
   api libs.slf4j
   // ^ Generally a bad idea for libraries, but we're shadowing.
 

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -1,5 +1,9 @@
 package datadog.trace.bootstrap;
 
+import static datadog.config.StableConfigSource.FLEET;
+import static datadog.config.StableConfigSource.LOCAL;
+import static datadog.config.util.Strings.propertyNameToSystemPropertyName;
+import static datadog.config.util.Strings.toEnvVar;
 import static datadog.environment.JavaVirtualMachine.isJavaVersionAtLeast;
 import static datadog.environment.JavaVirtualMachine.isOracleJDK8;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_STARTUP_LOGS_ENABLED;
@@ -8,15 +12,12 @@
 import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
 import static datadog.trace.bootstrap.Library.WILDFLY;
 import static datadog.trace.bootstrap.Library.detectLibraries;
-import static datadog.trace.bootstrap.config.provider.StableConfigSource.FLEET;
-import static datadog.trace.bootstrap.config.provider.StableConfigSource.LOCAL;
 import static datadog.trace.util.AgentThreadFactory.AgentThread.JMX_STARTUP;
 import static datadog.trace.util.AgentThreadFactory.AgentThread.PROFILER_STARTUP;
 import static datadog.trace.util.AgentThreadFactory.AgentThread.TRACE_STARTUP;
 import static datadog.trace.util.AgentThreadFactory.newAgentThread;
-import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
-import static datadog.trace.util.Strings.toEnvVar;
 
+import datadog.config.StableConfigSource;
 import datadog.environment.EnvironmentVariables;
 import datadog.environment.JavaVirtualMachine;
 import datadog.environment.OperatingSystem;
@@ -47,7 +48,6 @@
 import datadog.trace.api.profiling.ProfilingEnablement;
 import datadog.trace.api.scopemanager.ScopeListener;
 import datadog.trace.bootstrap.benchmark.StaticEventLogger;
-import datadog.trace.bootstrap.config.provider.StableConfigSource;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI;
 import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Constants.java

@@ -19,6 +19,7 @@ public final class Constants {
     "datadog.environment",
     "datadog.json",
     "datadog.yaml",
+    "datadog.generator",
     "datadog.appsec.api",
     "datadog.trace.api",
     "datadog.trace.bootstrap",

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/QueueTimerHelper.java

@@ -1,13 +1,13 @@
 package datadog.trace.bootstrap.instrumentation.java.concurrent;
 
+import datadog.config.ConfigProvider;
 import datadog.trace.api.Platform;
 import datadog.trace.api.config.ProfilingConfig;
 import datadog.trace.api.profiling.QueueTiming;
 import datadog.trace.api.profiling.Timer;
 import datadog.trace.api.profiling.Timing;
 import datadog.trace.api.sampling.PerRecordingRateLimiter;
 import datadog.trace.bootstrap.ContextStore;
-import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.jfr.InstrumentationBasedProfiling;
 import java.time.Duration;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityRepoServices.java

@@ -1,6 +1,7 @@
 package datadog.trace.civisibility;
 
 import datadog.communication.BackendApi;
+import datadog.config.util.Strings;
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
 import datadog.trace.api.civisibility.telemetry.tag.Provider;
@@ -35,7 +36,6 @@
 import datadog.trace.civisibility.source.SourcePathResolver;
 import datadog.trace.civisibility.source.index.RepoIndexProvider;
 import datadog.trace.civisibility.source.index.RepoIndexSourcePathResolver;
-import datadog.trace.util.Strings;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Map;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ProcessHierarchy.java

@@ -1,9 +1,9 @@
 package datadog.trace.civisibility;
 
+import static datadog.config.util.Strings.propertyNameToSystemPropertyName;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_HOST;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_SIGNAL_SERVER_PORT;
 import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
-import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
 
 import datadog.environment.SystemProperties;
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/AppVeyorInfo.java

@@ -4,12 +4,12 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.config.util.Strings;
 import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.api.git.PersonInfo;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
-import datadog.trace.util.Strings;
 import javax.annotation.Nonnull;
 
 class AppVeyorInfo implements CIProviderInfo {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/BitBucketInfo.java

@@ -5,11 +5,11 @@
 import static datadog.trace.api.git.GitUtils.normalizeTag;
 import static datadog.trace.civisibility.utils.FileUtils.expandTilde;
 
+import datadog.config.util.Strings;
 import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
-import datadog.trace.util.Strings;
 import javax.annotation.Nonnull;
 
 class BitBucketInfo implements CIProviderInfo {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/GithubActionsInfo.java

@@ -9,11 +9,11 @@
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 import com.squareup.moshi.Types;
+import datadog.config.util.Strings;
 import datadog.trace.api.civisibility.telemetry.tag.Provider;
 import datadog.trace.api.git.CommitInfo;
 import datadog.trace.api.git.GitInfo;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
-import datadog.trace.util.Strings;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/ci/PullRequestInfo.java

@@ -1,7 +1,7 @@
 package datadog.trace.civisibility.ci;
 
+import datadog.config.util.Strings;
 import datadog.trace.api.git.CommitInfo;
-import datadog.trace.util.Strings;
 import java.util.Objects;
 import javax.annotation.Nonnull;
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java

@@ -1,5 +1,6 @@
 package datadog.trace.civisibility.config;
 
+import datadog.config.util.Strings;
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.CIConstants;
 import datadog.trace.api.civisibility.CiVisibilityWellKnownTags;
@@ -12,7 +13,6 @@
 import datadog.trace.civisibility.git.tree.GitClient;
 import datadog.trace.civisibility.git.tree.GitDataUploader;
 import datadog.trace.civisibility.git.tree.GitRepoUnshallow;
-import datadog.trace.util.Strings;
 import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.Collections;