feat(environment): Add boostrap dedicated Gradle configuration

Author: PerfectSlayer

components/environment/build.gradle.kts

@@ -1,9 +1,22 @@
 plugins {
   `java-library`
+  id("com.gradleup.shadow")
 }
 
 apply(from = "$rootDir/gradle/java.gradle")
 
+/*
+ * Add an addition gradle configuration to be consumed by bootstrap only.
+ * "datadog.trace." prefix is required to be excluded from Jacoco instrumentation.
+ * See ConfigDefaults.DEFAULT_CIVISIBILITY_JACOCO_PLUGIN_EXCLUDES for more details.
+ */
+tasks.shadowJar {
+  relocate("datadog.environment", "datadog.trace.bootstrap.environment")
+}
+
+/*
+ * Configure test coverage.
+ */
 extra.set("minimumInstructionCoverage", 0.7)
 val excludedClassesCoverage by extra {
   listOf(

dd-java-agent/build.gradle

@@ -250,7 +250,8 @@ tasks.withType(GenerateMavenPom).configureEach { task ->
 
 dependencies {
   implementation project(path: ':components:json')
-  implementation project(path: ':components:environment')
+  // Depend on the bootstrap-specific shadow configuration to avoid having the same component reused by both bootstrap and agent
+  implementation project(path: ':components:environment', configuration: 'shadow')
   modules {
     module("com.squareup.okio:okio") {
       replacedBy("com.datadoghq.okio:okio") // embed our patched fork
@@ -270,6 +271,7 @@ dependencies {
   testImplementation group: 'io.opentracing', name: 'opentracing-util', version: '0.31.0'
 
   // Includes for the top level shadow jar
+  shadowInclude project(path: ':components:environment', configuration: 'shadow')
   shadowInclude project(path: ':dd-java-agent:agent-bootstrap')
   shadowInclude project(path: ':dd-java-agent:agent-debugger:debugger-bootstrap')
   shadowInclude project(path: ':dd-java-agent:agent-otel:otel-bootstrap', configuration: 'shadow')

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

@@ -2,9 +2,9 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import datadog.environment.EnvironmentVariables;
-import datadog.environment.JavaVirtualMachine;
-import datadog.environment.SystemProperties;
+import datadog.trace.bootstrap.environment.EnvironmentVariables;
+import datadog.trace.bootstrap.environment.JavaVirtualMachine;
+import datadog.trace.bootstrap.environment.SystemProperties;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.BufferedReader;
 import java.io.File;