Move CiEnvironmentVariables to config-utils

Author: nikita-tkachenko-datadog

components/environment/build.gradle.kts

@@ -30,9 +30,3 @@ val excludedClassesCoverage by extra {
 val excludedClassesBranchCoverage by extra {
   listOf("datadog.environment.CommandLine") // tested using forked process
 }
-
-dependencies {
-  implementation(libs.slf4j)
-
-  testImplementation("com.squareup.okhttp3:mockwebserver:${libs.versions.okhttp.legacy.get()}")
-}

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

@@ -4,13 +4,13 @@
 import datadog.communication.BackendApiFactory;
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.communication.util.IOUtils;
-import datadog.environment.CiEnvironmentVariables;
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
 import datadog.trace.api.civisibility.telemetry.tag.Command;
 import datadog.trace.api.git.GitInfoProvider;
 import datadog.trace.api.intake.Intake;
+import datadog.trace.bootstrap.config.provider.civisibility.CiEnvironmentVariables;
 import datadog.trace.civisibility.ci.CIProviderInfoFactory;
 import datadog.trace.civisibility.ci.env.CiEnvironment;
 import datadog.trace.civisibility.ci.env.CiEnvironmentImpl;

utils/config-utils/build.gradle.kts

@@ -59,4 +59,5 @@ dependencies {
 
   testImplementation(project(":utils:test-utils"))
   testImplementation("org.snakeyaml:snakeyaml-engine:2.9")
+  testImplementation("com.squareup.okhttp3:mockwebserver:${libs.versions.okhttp.legacy.get()}")
 }

utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java

@@ -4,10 +4,10 @@
 import static datadog.trace.api.ConfigSetting.NON_DEFAULT_SEQ_ID;
 import static datadog.trace.api.config.GeneralConfig.CONFIGURATION_FILE;
 
-import datadog.environment.CiEnvironmentVariables;
 import datadog.environment.SystemProperties;
 import datadog.trace.api.ConfigCollector;
 import datadog.trace.api.ConfigOrigin;
+import datadog.trace.bootstrap.config.provider.civisibility.CiEnvironmentVariables;
 import datadog.trace.util.ConfigStrings;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.File;

…/environment/CiEnvironmentVariables.java …civisibility/CiEnvironmentVariables.javacomponents/environment/src/main/java/datadog/environment/CiEnvironmentVariables.java renamed to utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariables.java components/environment/src/main/java/datadog/environment/CiEnvironmentVariables.java renamed to utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariables.java

@@ -1,5 +1,6 @@
-package datadog.environment;
+package datadog.trace.bootstrap.config.provider.civisibility;
 
+import datadog.environment.EnvironmentVariables;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

…ironment/CiEnvironmentVariablesTest.java …sibility/CiEnvironmentVariablesTest.javacomponents/environment/src/test/java/datadog/environment/CiEnvironmentVariablesTest.java renamed to utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariablesTest.java components/environment/src/test/java/datadog/environment/CiEnvironmentVariablesTest.java renamed to utils/config-utils/src/test/java/datadog/trace/bootstrap/config/provider/civisibility/CiEnvironmentVariablesTest.java

@@ -1,4 +1,4 @@
-package datadog.environment;
+package datadog.trace.bootstrap.config.provider.civisibility;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;