Skip to content

Commit 0b04153

Browse files
committed
feat(errortracking): Enable error tracking for Java < 11 by default
This starts a progressive rollout using product independent sample.
1 parent b0e4869 commit 0b04153

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,15 @@ public void reinitialize() {
9292
// So to get property/env we use this custom function
9393
private static boolean isLogCollectionEnabled() {
9494
// FIXME: For the initial rollout, we default log collection to true for IAST and CI Visibility
95-
// users. This should be removed once we default to true.
95+
// FIXME: For progressive rollout, we include by default Java < 11 hosts as product independent
96+
// FIXME: sample users.
97+
// FIXME: This should be removed once we default to true.
9698
final boolean defaultValue =
9799
isFlagEnabled("dd.iast.enabled", "DD_IAST_ENABLED", false)
98100
|| isFlagEnabled("dd.civisibility.enabled", "DD_CIVISIBILITY_ENABLED", false)
99101
|| isFlagEnabled(
100-
"dd.dynamic.instrumentation.enabled", "DD_DYNAMIC_INSTRUMENTATION_ENABLED", false);
102+
"dd.dynamic.instrumentation.enabled", "DD_DYNAMIC_INSTRUMENTATION_ENABLED", false)
103+
|| !Platform.isJavaVersionAtLeast(11);
101104
return isFlagEnabled(
102105
"dd.telemetry.log-collection.enabled", "DD_TELEMETRY_LOG_COLLECTION_ENABLED", defaultValue);
103106
}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1988,13 +1988,17 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
19881988
debuggerThirdPartyExcludes = tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_EXCLUDES));
19891989

19901990
// FIXME: For the initial rollout, we default log collection to true for IAST and CI Visibility
1991-
// users. This should be removed once we default to true, and then it can also be moved up
1992-
// together with the rest of telemetry ocnfig.
1991+
// users.
1992+
// FIXME: For progressive rollout, we include by default Java < 11 hosts as product independent
1993+
// sample users.
1994+
// FIXME:This should be removed once we default to true, and then it can also be moved up
1995+
// together with the rest of telemetry config.
19931996
final boolean telemetryLogCollectionEnabledDefault =
19941997
instrumenterConfig.isTelemetryEnabled()
19951998
&& (instrumenterConfig.getIastActivation() == ProductActivation.FULLY_ENABLED
19961999
|| instrumenterConfig.isCiVisibilityEnabled()
1997-
|| debuggerEnabled)
2000+
|| debuggerEnabled
2001+
|| !Platform.isJavaVersionAtLeast(11))
19982002
|| DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED;
19992003
isTelemetryLogCollectionEnabled =
20002004
configProvider.getBoolean(

0 commit comments

Comments
 (0)