Skip to content

Commit 03b34b3

Browse files
committed
Make error intake upload optin
1 parent 399f8cc commit 03b34b3

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/CrashUploader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public void upload(@Nonnull Path file) {
243243
log.error("Unable to print the error crash as a log message", t);
244244
}
245245
try {
246-
remoteUpload(fileContent, true, true);
246+
remoteUpload(fileContent, true, config.isCrashTrackingErrorsIntakeEnabled());
247247
} finally {
248248
uploadClient.dispatcher().cancelAll();
249249
}

dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/CrashUploaderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ public void testTelemetryHappyPath(String log) throws Exception {
257257
// When
258258
uploader = new CrashUploader(config, crashConfig);
259259
server.enqueue(new MockResponse().setResponseCode(200));
260-
uploader.remoteUpload(readFileAsString(log), true, false);
260+
uploader.upload(getResourcePath(log));
261261

262262
final RecordedRequest recordedRequest = server.takeRequest(5, TimeUnit.SECONDS);
263263

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ public final class CrashTrackingConfig {
2424
public static final String CRASH_TRACKING_AGENTLESS = "crashtracking.agentless";
2525
public static final boolean CRASH_TRACKING_AGENTLESS_DEFAULT = false;
2626

27+
public static final String CRASH_TRACKING_ERRORS_INTAKE_ENABLED =
28+
"crashtracking.errors-intake.enabled";
29+
public static final boolean CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT = false;
30+
2731
public static final String CRASH_TRACKING_START_EARLY = "crashtracking.debug.start-force-first";
2832
public static final boolean CRASH_TRACKING_START_EARLY_DEFAULT = false;
2933

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@
299299
import static datadog.trace.api.config.CiVisibilityConfig.TEST_SESSION_NAME;
300300
import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_AGENTLESS;
301301
import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_AGENTLESS_DEFAULT;
302+
import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_ERRORS_INTAKE_ENABLED;
303+
import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT;
302304
import static datadog.trace.api.config.CrashTrackingConfig.CRASH_TRACKING_TAGS;
303305
import static datadog.trace.api.config.CwsConfig.CWS_ENABLED;
304306
import static datadog.trace.api.config.CwsConfig.CWS_TLS_REFRESH;
@@ -976,6 +978,7 @@ public static String getHostName() {
976978

977979
private final boolean crashTrackingAgentless;
978980
private final Map<String, String> crashTrackingTags;
981+
private final boolean crashTrackingErrorsIntakeEnabled;
979982

980983
private final boolean clientIpEnabled;
981984

@@ -2123,6 +2126,9 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
21232126
crashTrackingAgentless =
21242127
configProvider.getBoolean(CRASH_TRACKING_AGENTLESS, CRASH_TRACKING_AGENTLESS_DEFAULT);
21252128
crashTrackingTags = configProvider.getMergedMap(CRASH_TRACKING_TAGS);
2129+
crashTrackingErrorsIntakeEnabled =
2130+
configProvider.getBoolean(
2131+
CRASH_TRACKING_ERRORS_INTAKE_ENABLED, CRASH_TRACKING_ERRORS_INTAKE_ENABLED_DEFAULT);
21262132

21272133
float telemetryInterval =
21282134
configProvider.getFloat(TELEMETRY_HEARTBEAT_INTERVAL, DEFAULT_TELEMETRY_HEARTBEAT_INTERVAL);
@@ -3690,6 +3696,10 @@ public boolean isCrashTrackingAgentless() {
36903696
return crashTrackingAgentless;
36913697
}
36923698

3699+
public boolean isCrashTrackingErrorsIntakeEnabled() {
3700+
return crashTrackingErrorsIntakeEnabled;
3701+
}
3702+
36933703
public boolean isTelemetryEnabled() {
36943704
return instrumenterConfig.isTelemetryEnabled();
36953705
}
@@ -5897,6 +5907,8 @@ public String toString() {
58975907
+ crashTrackingTags
58985908
+ ", crashTrackingAgentless="
58995909
+ crashTrackingAgentless
5910+
+ ", crashTrackingErrorsIntakeEnabled="
5911+
+ crashTrackingErrorsIntakeEnabled
59005912
+ ", remoteConfigEnabled="
59015913
+ remoteConfigEnabled
59025914
+ ", remoteConfigUrl="

0 commit comments

Comments
 (0)