Skip to content

Enable telemetry logs for IAST, CI Visibility and Dynamic Instrumentation users #7017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smola merged 2 commits into from
May 30, 2024
Merged

Enable telemetry logs for IAST, CI Visibility and Dynamic Instrumentation users #7017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99e8647
Enable telemetry logs for IAST and CI Visibility users
smola May 13, 2024
5b6984f
Merge branch 'master' into smola/telemetry-logs-partial-rollout-1
smola May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions ...ava-agent/agent-logging/src/main/java/datadog/trace/logging/ddlogger/DDLoggerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

public class DDLoggerFactory implements ILoggerFactory, LogLevelSwitcher {

private final boolean telemetryLogCollectionEnabled = getLogCollectionEnabled(false);
private final boolean telemetryLogCollectionEnabled = isLogCollectionEnabled();

private volatile LoggerHelperFactory helperFactory = null;
private volatile LogLevel override = null;
Expand Down Expand Up @@ -88,17 +88,30 @@ public void reinitialize() {
helperFactory = null;
}

// DDLoggerFactory can be called at very early stage, before Config loaded
// 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 getLogCollectionEnabled(boolean defaultValue) {
String value = System.getProperty("dd.telemetry.log-collection.enabled");
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.
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);
return isFlagEnabled(
"dd.telemetry.log-collection.enabled", "DD_TELEMETRY_LOG_COLLECTION_ENABLED", defaultValue);
}

private static boolean isFlagEnabled(
final String systemProperty, final String envVar, final boolean defaultValue) {
String value = System.getProperty(systemProperty);
if ("true".equalsIgnoreCase(value)) {
return true;
}
if ("false".equalsIgnoreCase(value)) {
return false;
}
value = System.getenv("DD_TELEMETRY_LOG_COLLECTION_ENABLED");
value = System.getenv(envVar);
if ("true".equalsIgnoreCase(value)) {
return true;
}
Expand Down
17 changes: 13 additions & 4 deletions internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,10 +1595,6 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
configProvider.getBoolean(
TELEMETRY_DEPENDENCY_COLLECTION_ENABLED,
DEFAULT_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED);

isTelemetryLogCollectionEnabled =
configProvider.getBoolean(
TELEMETRY_LOG_COLLECTION_ENABLED, DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED);
telemetryDependencyResolutionQueueSize =
configProvider.getInteger(
TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE,
Expand Down Expand Up @@ -1910,6 +1906,19 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
debuggerThirdPartyIncludes = tryMakeImmutableSet(configProvider.getList(THIRD_PARTY_INCLUDES));
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.
final boolean telemetryLogCollectionEnabledDefault =
instrumenterConfig.isTelemetryEnabled()
&& (instrumenterConfig.getIastActivation() == ProductActivation.FULLY_ENABLED
|| instrumenterConfig.isCiVisibilityEnabled()
|| debuggerEnabled)
|| DEFAULT_TELEMETRY_LOG_COLLECTION_ENABLED;
isTelemetryLogCollectionEnabled =
configProvider.getBoolean(
TELEMETRY_LOG_COLLECTION_ENABLED, telemetryLogCollectionEnabledDefault);

awsPropagationEnabled = isPropagationEnabled(true, "aws", "aws-sdk");
sqsPropagationEnabled = isPropagationEnabled(true, "sqs");

Expand Down