Updates based on PR review comments.

Author: AlexeyKuznetsov-DD

components/environment/build.gradle.kts

@@ -18,7 +18,6 @@ tasks.shadowJar {
  * Configure test coverage.
  */
 extra.set("minimumInstructionCoverage", 0.7)
-extra.set("minimumBranchCoverage", 0.7)
 val excludedClassesCoverage by extra {
   listOf(
     "datadog.environment.JavaVirtualMachine", // depends on OS and JVM vendor

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

@@ -38,21 +38,4 @@ public static String getOrDefault(@Nonnull String name, String defaultValue) {
       return defaultValue;
     }
   }
-
-  /**
-   * Gets an environment variable value, or default value if missing or can't be retrieved.
-   *
-   * @param name The environment variable name.
-   * @param defaultValue The default value to return if the environment variable is missing or can't
-   *     be retrieved.
-   * @return The environment variable value, {@code defaultValue} if missing or can't be retrieved.
-   */
-  public static int getOrDefault(@Nonnull String name, int defaultValue) {
-    try {
-      String value = System.getenv(name);
-      return value == null ? defaultValue : Integer.parseInt(value);
-    } catch (SecurityException | NumberFormatException e) {
-      return defaultValue;
-    }
-  }
 }

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

@@ -122,20 +122,32 @@ public void onError(Throwable t) {
       List<String> causes = new ArrayList<>();
 
       Throwable cause = t.getCause();
-      if (cause != null) {
-        while (cause != null) {
-          causes.add("error_type:" + cause.getClass().getName());
-          cause = cause.getCause();
-        }
+      while (cause != null) {
+        causes.add("error_type:" + cause.getClass().getName());
+        cause = cause.getCause();
       }
       causes.add("error_type:" + t.getClass().getName());
 
       // Limit the number of tags to avoid overpopulating the JSON payload.
-      int maxTags = EnvironmentVariables.getOrDefault("DD_TELEMETRY_FORWARDER_MAX_TAGS", 5);
-      int sz = causes.size();
-      int cnt = Math.min(maxTags, sz);
+      int maxTags = maxTags(5);
+      int numCauses = causes.size();
+      if (numCauses > maxTags) {
+        causes = causes.subList(numCauses - maxTags, numCauses);
+      }
+
+      onPoint("library_entrypoint.error", causes);
+    }
 
-      onPoint("library_entrypoint.error", causes.subList(sz - cnt, sz));
+    private int maxTags(int defaultValue) {
+      try {
+        String s =
+            EnvironmentVariables.getOrDefault(
+                "DD_TELEMETRY_FORWARDER_MAX_TAGS", String.valueOf(defaultValue));
+
+        return Integer.parseInt(s);
+      } catch (Exception e) {
+        return defaultValue;
+      }
     }
 
     @Override