Skip to content

Commit 827b1c4

Browse files
fix: TEST_UNDECLARED_OUTPUTS_DIR access
1 parent 178f977 commit 827b1c4

3 files changed

Lines changed: 2 additions & 11 deletions

File tree

dd-trace-api/src/main/java/datadog/trace/api/config/CiVisibilityConfig.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,5 @@ public final class CiVisibilityConfig {
118118
public static final String TEST_OPTIMIZATION_PAYLOADS_IN_FILES =
119119
"test.optimization.payloads.in.files";
120120

121-
/** Bazel-provided directory where test output files (payloads) are written. */
122-
public static final String TEST_UNDECLARED_OUTPUTS_DIR = "TEST_UNDECLARED_OUTPUTS_DIR";
123-
124121
private CiVisibilityConfig() {}
125122
}

internal-api/src/main/java/datadog/trace/api/Config.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@
296296
import static datadog.trace.api.config.CiVisibilityConfig.TEST_OPTIMIZATION_MANIFEST_FILE;
297297
import static datadog.trace.api.config.CiVisibilityConfig.TEST_OPTIMIZATION_PAYLOADS_IN_FILES;
298298
import static datadog.trace.api.config.CiVisibilityConfig.TEST_SESSION_NAME;
299-
import static datadog.trace.api.config.CiVisibilityConfig.TEST_UNDECLARED_OUTPUTS_DIR;
300299
import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_AGENTLESS;
301300
import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_AGENTLESS_DEFAULT;
302301
import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_ERRORS_INTAKE_ENABLED;
@@ -1133,7 +1132,6 @@ public static String getHostName() {
11331132
private final boolean ciVisibilityFailedTestReplayEnabled;
11341133
private final String testOptimizationManifestFile;
11351134
private final boolean testOptimizationPayloadsInFiles;
1136-
private final String testUndeclaredOutputsDir;
11371135

11381136
private final boolean remoteConfigEnabled;
11391137
private final boolean remoteConfigIntegrityCheckEnabled;
@@ -2588,7 +2586,6 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
25882586
testOptimizationManifestFile = configProvider.getString(TEST_OPTIMIZATION_MANIFEST_FILE);
25892587
testOptimizationPayloadsInFiles =
25902588
configProvider.getBoolean(TEST_OPTIMIZATION_PAYLOADS_IN_FILES, false);
2591-
testUndeclaredOutputsDir = System.getenv(TEST_UNDECLARED_OUTPUTS_DIR);
25922589

25932590
remoteConfigEnabled =
25942591
configProvider.getBoolean(
@@ -4362,10 +4359,6 @@ public boolean isTestOptimizationPayloadsInFiles() {
43624359
return testOptimizationPayloadsInFiles;
43634360
}
43644361

4365-
public String getTestUndeclaredOutputsDir() {
4366-
return testUndeclaredOutputsDir;
4367-
}
4368-
43694362
public String getGitPullRequestBaseBranch() {
43704363
return gitPullRequestBaseBranch;
43714364
}

internal-api/src/main/java/datadog/trace/api/civisibility/config/BazelMode.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ public static BazelMode get() {
7575
}
7676

7777
payloadFilesEnabled = config.isTestOptimizationPayloadsInFiles();
78-
String undeclaredOutputsDir = config.getTestUndeclaredOutputsDir();
78+
// TEST_UNDECLARED_OUTPUTS_DIR is a Bazel-provided env var, not a DD configuration
79+
String undeclaredOutputsDir = ConfigHelper.env("TEST_UNDECLARED_OUTPUTS_DIR");
7980
if (payloadFilesEnabled) {
8081
if (Strings.isNotBlank(undeclaredOutputsDir)) {
8182
Path resolved = null;

0 commit comments

Comments
 (0)