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 ed08bfe9fd7..6cc9aff09b1 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 @@ -91,12 +91,14 @@ public void reinitialize() { // DDLoggerFactory can be called at very early stage, before Config is loaded // 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 + // FIXME: For the initial rollout, we default log collection to true for IAST, Dynamic + // Instrumentation, and CI Visibility // 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.appsec.enabled", "DD_APPSEC_ENABLED", false) || isFlagEnabled("dd.civisibility.enabled", "DD_CIVISIBILITY_ENABLED", false) || isFlagEnabled( "dd.dynamic.instrumentation.enabled", "DD_DYNAMIC_INSTRUMENTATION_ENABLED", false) 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 042b20984f3..45f566c4184 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -2012,7 +2012,8 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) // together with the rest of telemetry config. final boolean telemetryLogCollectionEnabledDefault = instrumenterConfig.isTelemetryEnabled() - && (instrumenterConfig.getIastActivation() == ProductActivation.FULLY_ENABLED + && (instrumenterConfig.getAppSecActivation() == ProductActivation.FULLY_ENABLED + || instrumenterConfig.getIastActivation() == ProductActivation.FULLY_ENABLED || instrumenterConfig.isCiVisibilityEnabled() || debuggerEnabled || !Platform.isJavaVersionAtLeast(11))