rebasing

Author: mhlidd

build.gradle

@@ -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")
 

build.gradle.kts

@@ -1,7 +1,6 @@
 package datadog.environment;
 
 import de.thetaphi.forbiddenapis.SuppressForbidden;
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**

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

@@ -1,7 +1,5 @@
 package datadog.trace.civisibility;
 
-import static datadog.environment.ConfigHelper.getEnvironmentVariables;
-
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
 import com.squareup.moshi.Types;
@@ -36,7 +34,6 @@
 import datadog.trace.civisibility.source.LinesResolver;
 import datadog.trace.civisibility.source.index.*;
 import datadog.trace.civisibility.utils.ShellCommandExecutor;
-import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.File;
 import java.lang.reflect.Type;
 import java.net.InetSocketAddress;

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

@@ -1,7 +1,7 @@
 package datadog.trace.logging.ddlogger;
 
-import datadog.environment.SystemProperties;
 import datadog.environment.ConfigHelper;
+import datadog.environment.SystemProperties;
 import datadog.trace.api.Platform;
 import datadog.trace.logging.LogLevel;
 import datadog.trace.logging.LogLevelSwitcher;

dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java

@@ -17,7 +17,6 @@
 import com.amazonaws.services.lambda.runtime.RequestHandler;
 import com.google.auto.service.AutoService;
 import datadog.environment.ConfigHelper;
-import datadog.environment.EnvironmentVariables;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.bootstrap.CallDepthThreadLocalMap;

dd-java-agent/instrumentation/aws-lambda-handler/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java

@@ -1,9 +1,9 @@
 package datadog.trace.bootstrap;
 
-import datadog.environment.ConfigHelper;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
+import datadog.environment.ConfigHelper;
 import datadog.json.JsonWriter;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.Closeable;

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

@@ -1,7 +1,6 @@
 package datadog.trace.bootstrap.config.provider;
 
 import datadog.environment.ConfigHelper;
-import datadog.environment.EnvironmentVariables;
 import datadog.environment.SystemProperties;
 import datadog.trace.util.Strings;
 import java.util.Map;

internal-api/src/main/java/datadog/trace/bootstrap/config/provider/AgentArgsInjector.java

@@ -17,7 +17,6 @@
 import static datadog.trace.util.Strings.toEnvVar;
 
 import datadog.environment.ConfigHelper;
-import datadog.environment.EnvironmentVariables;
 import datadog.environment.SystemProperties;
 import datadog.trace.api.ConfigOrigin;
 import datadog.trace.api.TracePropagationStyle;