diff --git a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java index 2a9f9ab5d8c..ed08bfe9fd7 100644 --- a/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java +++ b/dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java @@ -92,12 +92,15 @@ public void reinitialize() { // So to get property/env we use this custom function private static boolean isLogCollectionEnabled() { // FIXME: For the initial rollout, we default log collection to true for IAST and CI Visibility - // users. This should be removed once we default to true. + // FIXME: For progressive rollout, we include by default Java < 11 hosts as product independent + // FIXME: sample users. + // FIXME: This should be removed once we default to true. final boolean defaultValue = isFlagEnabled("dd.iast.enabled", "DD_IAST_ENABLED", false) || isFlagEnabled("dd.civisibility.enabled", "DD_CIVISIBILITY_ENABLED", false) || isFlagEnabled( - "dd.dynamic.instrumentation.enabled", "DD_DYNAMIC_INSTRUMENTATION_ENABLED", false); + "dd.dynamic.instrumentation.enabled", "DD_DYNAMIC_INSTRUMENTATION_ENABLED", false) + || !Platform.isJavaVersionAtLeast(11); return isFlagEnabled( "dd.telemetry.log-collection.enabled", "DD_TELEMETRY_LOG_COLLECTION_ENABLED", defaultValue); } diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java index 90556c99c03..47badccd1e9 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -1993,13 +1993,17 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) debuggerThirdPartyExcludes = tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_EXCLUDES)); // FIXME: For the initial rollout, we default log collection to true for IAST and CI Visibility - // users. This should be removed once we default to true, and then it can also be moved up - // together with the rest of telemetry ocnfig. + // users. + // FIXME: For progressive rollout, we include by default Java < 11 hosts as product independent + // sample users. + // FIXME:This should be removed once we default to true, and then it can also be moved up + // together with the rest of telemetry config. final boolean telemetryLogCollectionEnabledDefault = instrumenterConfig.isTelemetryEnabled() && (instrumenterConfig.getIastActivation() == ProductActivation.FULLY_ENABLED || instrumenterConfig.isCiVisibilityEnabled() - || debuggerEnabled) + || debuggerEnabled + || !Platform.isJavaVersionAtLeast(11)) || DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED; isTelemetryLogCollectionEnabled = configProvider.getBoolean(