Skip to content

Commit 9002326

Browse files
committed
feat(civis): Migrate CI Visibility to environment component
1 parent 9ae7f6a commit 9002326

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,17 @@ private static GitClient.Factory buildGitClientFactory(
144144

145145
@Nonnull
146146
private static CiEnvironment buildCiEnvironment(Config config, SharedCommunicationObjects sco) {
147+
CiEnvironment localEnvironment = CiEnvironmentImpl.local();
147148
String remoteEnvVarsProviderUrl = config.getCiVisibilityRemoteEnvVarsProviderUrl();
148149
if (remoteEnvVarsProviderUrl != null) {
149150
String remoteEnvVarsProviderKey = config.getCiVisibilityRemoteEnvVarsProviderKey();
150151
CiEnvironment remoteEnvironment =
151152
new CiEnvironmentImpl(
152153
getRemoteEnvironment(
153154
remoteEnvVarsProviderUrl, remoteEnvVarsProviderKey, sco.okHttpClient));
154-
CiEnvironment localEnvironment = new CiEnvironmentImpl(System.getenv());
155155
return new CompositeCiEnvironment(remoteEnvironment, localEnvironment);
156156
} else {
157-
return new CiEnvironmentImpl(System.getenv());
157+
return localEnvironment;
158158
}
159159
}
160160

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package datadog.trace.civisibility.ci.env;
22

3+
import java.util.Collections;
34
import java.util.Map;
45

56
public class CiEnvironmentImpl implements CiEnvironment {
@@ -10,6 +11,16 @@ public CiEnvironmentImpl(Map<String, String> env) {
1011
this.env = env;
1112
}
1213

14+
public static CiEnvironment local() {
15+
Map<String, String> env;
16+
try {
17+
env = System.getenv();
18+
} catch (SecurityException e) {
19+
env = Collections.emptyMap();
20+
}
21+
return new CiEnvironmentImpl(env);
22+
}
23+
1324
@Override
1425
public String get(String name) {
1526
return env.get(name);

dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package datadog.trace.instrumentation.maven3;
22

3+
import datadog.environment.EnvironmentVariables;
34
import datadog.trace.api.civisibility.domain.JavaAgent;
45
import datadog.trace.util.MethodHandles;
56
import datadog.trace.util.Strings;
@@ -65,7 +66,7 @@ public abstract class MavenUtils {
6566
* of the request object
6667
*/
6768
public static String getCommandLine(MavenSession session) {
68-
String mavenCmdLineArgsEnvVar = System.getenv(MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR);
69+
String mavenCmdLineArgsEnvVar = EnvironmentVariables.get(MAVEN_CMD_LINE_ARGS_ENVIRONMENT_VAR);
6970
if (mavenCmdLineArgsEnvVar != null) {
7071
return MVN_CMD_LINE_INVOCATION + mavenCmdLineArgsEnvVar;
7172
}

0 commit comments

Comments
 (0)