manually handling rebase issues

Author: mhlidd

dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy

@@ -3,7 +3,6 @@ package datadog.trace.civisibility
 import com.fasterxml.jackson.databind.ObjectMapper
 import datadog.communication.serialization.GrowableBuffer
 import datadog.communication.serialization.msgpack.MsgPackWriter
-import datadog.environment.EnvironmentVariables
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.agent.test.asserts.ListWriterAssert
 import datadog.trace.api.Config
@@ -368,7 +367,7 @@ abstract class CiVisibilityInstrumentationTest extends InstrumentationSpecificat
 
     def additionalIgnoredTags = CiVisibilityTestUtils.IGNORED_TAGS + ignoredTags
 
-    if (EnvironmentVariables.get("GENERATE_TEST_FIXTURES") != null) {
+    if (System.getenv().get("GENERATE_TEST_FIXTURES") != null) {
       return generateTestFixtures(testcaseName, events, coverages, additionalReplacements, additionalIgnoredTags)
     }
 

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy

@@ -1,6 +1,5 @@
 package datadog.trace.civisibility
 
-import datadog.environment.EnvironmentVariables
 import datadog.trace.api.Config
 import datadog.trace.api.civisibility.config.TestFQN
 import datadog.trace.api.config.CiVisibilityConfig
@@ -22,9 +21,9 @@ abstract class CiVisibilitySmokeTest extends Specification {
 
   protected static String buildJavaHome() {
     if (Jvm.current.isJava8()) {
-      return EnvironmentVariables.get("JAVA_8_HOME")
+      return System.getenv("JAVA_8_HOME")
     }
-    return EnvironmentVariables.get("JAVA_" + Jvm.current.getJavaSpecificationVersion() + "_HOME")
+    return System.getenv("JAVA_" + Jvm.current.getJavaSpecificationVersion() + "_HOME")
   }
 
   protected static String javaPath() {
@@ -68,10 +67,10 @@ abstract class CiVisibilitySmokeTest extends Specification {
     Map<String, String> argMap = buildJvmArgMap(mockBackendIntakeUrl, serviceName, additionalArgs)
 
     // for convenience when debugging locally
-    if (EnvironmentVariables.get("DD_CIVISIBILITY_SMOKETEST_DEBUG_PARENT") != null) {
+    if (System.getenv("DD_CIVISIBILITY_SMOKETEST_DEBUG_PARENT") != null) {
       arguments +=  "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
     }
-    if (EnvironmentVariables.get("DD_CIVISIBILITY_SMOKETEST_DEBUG_CHILD") != null) {
+    if (System.getenv("DD_CIVISIBILITY_SMOKETEST_DEBUG_CHILD") != null) {
       argMap.put(CiVisibilityConfig.CIVISIBILITY_DEBUG_PORT, "5055")
     }
 
@@ -84,7 +83,7 @@ abstract class CiVisibilitySmokeTest extends Specification {
   protected verifyEventsAndCoverages(String projectName, String toolchain, String toolchainVersion, List<Map<String, Object>> events, List<Map<String, Object>> coverages, List<String> additionalDynamicTags = []) {
     def additionalReplacements = ["content.meta.['test.toolchain']": "$toolchain:$toolchainVersion"]
 
-    if (EnvironmentVariables.get("GENERATE_TEST_FIXTURES") != null) {
+    if (System.getenv().get("GENERATE_TEST_FIXTURES") != null) {
       def baseTemplatesPath = CiVisibilitySmokeTest.classLoader.getResource(projectName).toURI().schemeSpecificPart.replace('build/resources/test', 'src/test/resources')
       CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements.keySet() + additionalDynamicTags, SMOKE_IGNORED_TAGS)
     } else {

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy

@@ -7,7 +7,6 @@ import com.jayway.jsonpath.JsonPath
 import com.jayway.jsonpath.Option
 import com.jayway.jsonpath.ReadContext
 import com.jayway.jsonpath.WriteContext
-import datadog.environment.EnvironmentVariables
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.civisibility.config.LibraryCapability
 import datadog.trace.api.civisibility.config.TestFQN
@@ -163,7 +162,7 @@ abstract class CiVisibilityTestUtils {
   }
 
   private static void compareJson(String expectedJson, String actualJson) {
-    def environment = EnvironmentVariables.getAll()
+    def environment = System.getenv()
     def ciRun = environment.get("GITHUB_ACTION") != null || environment.get("GITLAB_CI") != null
     def comparisonMode = ciRun ? JSONCompareMode.LENIENT : JSONCompareMode.NON_EXTENSIBLE
 

dd-smoke-tests/concurrent/java-25/src/test/groovy/datadog/smoketest/concurrent/AbstractStructuredConcurrencyTest.groovy

@@ -1,6 +1,5 @@
 package datadog.smoketest.concurrent
 
-import datadog.environment.EnvironmentVariables
 import datadog.smoketest.AbstractSmokeTest
 import datadog.trace.test.agent.decoder.DecodedSpan
 import datadog.trace.test.agent.decoder.DecodedTrace
@@ -18,7 +17,7 @@ abstract class AbstractStructuredConcurrencyTest extends AbstractSmokeTest {
   ProcessBuilder createProcessBuilder() {
     def jarPath = System.getProperty("datadog.smoketest.shadowJar.path")
     def command = new ArrayList<String>()
-    command.add(Paths.get(EnvironmentVariables.get("JAVA_25_HOME"), "bin", "java").toString())
+    command.add(Paths.get(System.getenv("JAVA_25_HOME"), "bin", "java").toString())
     command.addAll(defaultJavaProperties)
     command.add("--enable-preview")
     command.add("-Ddd.trace.otel.enabled=true")

dd-smoke-tests/profiling-integration-tests/src/test/java/datadog/smoketest/CodeHotspotsTest.java

@@ -11,7 +11,6 @@
 import static org.openjdk.jmc.common.unit.UnitLookup.NUMBER;
 import static org.openjdk.jmc.common.unit.UnitLookup.PLAIN_TEXT;
 
-import datadog.environment.EnvironmentVariables;
 import datadog.environment.OperatingSystem;
 import datadog.smoketest.profiling.CodeHotspotsApplication;
 import datadog.smoketest.profiling.GenerativeStackTraces;
@@ -66,7 +65,7 @@ public final class CodeHotspotsTest {
   @BeforeAll
   static void setupAll() throws Exception {
     assumeFalse(
-        OperatingSystem.isMacOs() || EnvironmentVariables.get("TEST_LIBDDPROF") == null,
+        OperatingSystem.isMacOs() || System.getenv("TEST_LIBDDPROF") == null,
         "Test skipped. Set TEST_LIBDDPROF env variable to point to MacOS version of libjavaProfiler.so, and rerun.");
     Files.createDirectories(LOG_FILE_BASE);
   }