fixing merge conflicts

Author: mhlidd

components/environment/src/generator/resources/supported-configurations.json

@@ -394,6 +394,7 @@
     "DD_TELEMETRY_DEPENDENCY_RESOLUTION_PERIOD_MILLIS": ["A"],
     "DD_TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE": ["A"],
     "DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL": ["A"],
+    "DD_TELEMETRY_FORWARDER_MAX_TAGS": ["A"],
     "DD_TELEMETRY_FORWARDER_PATH": ["A"],
     "DD_TELEMETRY_HEARTBEAT_INTERVAL": ["A"],
     "DD_TELEMETRY_LOG_COLLECTION_ENABLED": ["A"],

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

@@ -7,15 +7,7 @@
 
 @SuppressForbidden
 public class ConfigHelper {
-  // Parse the supported-configurations JSON once using ParseSupportedConfigurations.
-
   public static Map<String, String> getEnvironmentVariables() {
-<<<<<<< HEAD
-=======
-    // TODO: Remove once JSON parsing is separate from data access
-    ParseSupportedConfigurations.loadSupportedConfigurations("supported-configurations.json");
-
->>>>>>> 0cfe49ee71 (init: adding System.getenv forbiddenAPI, ConfigHelper, ParseSupportedConfigurations, and DD_ linting logger)
     Map<String, String> env = System.getenv();
     Map<String, String> configs = new LinkedHashMap<>();
     for (Map.Entry<String, String> entry : env.entrySet()) {

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

@@ -13,11 +13,7 @@
 import static datadog.trace.util.Strings.propertyNameToSystemPropertyName;
 import static datadog.trace.util.Strings.toEnvVar;
 
-<<<<<<< HEAD
 import datadog.environment.ConfigHelper;
-=======
-import datadog.environment.EnvironmentVariables;
->>>>>>> 0cfe49ee71 (init: adding System.getenv forbiddenAPI, ConfigHelper, ParseSupportedConfigurations, and DD_ linting logger)
 import datadog.environment.JavaVirtualMachine;
 import datadog.environment.OperatingSystem;
 import datadog.trace.api.Config;

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

@@ -161,7 +161,7 @@ private static void agentmainImpl(
   static boolean getConfig(String configName) {
     switch (configName) {
       case LIB_INJECTION_ENABLED_ENV_VAR:
-        return EnvironmentVariables.get(LIB_INJECTION_ENABLED_ENV_VAR) != null;
+        return System.getenv(LIB_INJECTION_ENABLED_ENV_VAR) != null;
       case LIB_INJECTION_FORCE_SYS_PROP:
         {
           String envVarName =

dd-java-agent/src/main/java6/datadog/trace/bootstrap/AgentPreCheck.java

@@ -1,6 +1,5 @@
 package datadog.trace.bootstrap;
 
-import datadog.environment.EnvironmentVariables;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -103,7 +102,7 @@ static boolean compatible(String javaVersion, String javaHome, PrintStream outpu
 
     reportIncompatibleJava(javaVersion, javaHome, agentVersion, output);
 
-    String forwarderPath = EnvironmentVariables.get("DD_TELEMETRY_FORWARDER_PATH");
+    String forwarderPath = System.getenv("DD_TELEMETRY_FORWARDER_PATH");
     if (forwarderPath != null) {
       sendTelemetry(forwarderPath, javaVersion, agentVersion);
     }