Address comments

Author: jpbempel

dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/LoggerConfigInstrumentation.java

@@ -26,7 +26,7 @@ public LoggerConfigInstrumentation() {
   public boolean isApplicable(Set<TargetSystem> enabledSystems) {
     return (super.isApplicable(enabledSystems)
             && InstrumenterConfig.get().isAgentlessLogSubmissionEnabled())
-        || Config.get().isAppLogsCollectionEnabled();
+        || InstrumenterConfig.get().isAppLogsCollectionEnabled();
   }
 
   @Override

dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java

@@ -19,6 +19,7 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.api.Config;
+import datadog.trace.api.InstrumenterConfig;
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
@@ -64,7 +65,7 @@ public void methodAdvice(MethodTransformer transformer) {
             .and(takesArguments(1))
             .and(takesArgument(0, named("ch.qos.logback.classic.spi.ILoggingEvent"))),
         LogbackLoggerInstrumentation.class.getName() + "$CallAppendersAdvice");
-    if (Config.get().isAppLogsCollectionEnabled()) {
+    if (InstrumenterConfig.get().isAppLogsCollectionEnabled()) {
       transformer.applyAdvice(
           isMethod()
               .and(isPublic())
@@ -76,7 +77,7 @@ public void methodAdvice(MethodTransformer transformer) {
   }
 
   public static class CallAppendersAdvice {
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
       AgentSpan span = activeSpan();
 
@@ -88,7 +89,7 @@ public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
   }
 
   public static class CallAppendersAdvice2 {
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
       LogsIntakeHelper.log(event);
     }

dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java

@@ -122,6 +122,8 @@ public final class ConfigDefaults {
   // value to false if config is under breaking changes flag
   static final boolean DEFAULT_LOGS_INJECTION_ENABLED = true;
 
+  static final boolean DEFAULT_APP_LOGS_COLLECTION_ENABLED = false;
+
   static final String DEFAULT_APPSEC_ENABLED = "inactive";
   static final boolean DEFAULT_APPSEC_REPORTING_INBAND = false;
   static final int DEFAULT_APPSEC_TRACE_RATE_LIMIT = 100;

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

@@ -20,6 +20,7 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_TRACE_RATE_LIMIT;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_WAF_METRICS;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_WAF_TIMEOUT;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_APP_LOGS_COLLECTION_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CASSANDRA_KEYSPACE_STATEMENT_EXTRACTION_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_AGENTLESS_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_AUTO_CONFIGURATION_ENABLED;
@@ -1864,7 +1865,8 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
           configProvider.getBoolean(
               LOGS_INJECTION_ENABLED, DEFAULT_LOGS_INJECTION_ENABLED, LOGS_INJECTION);
     }
-    appLogsCollectionEnabled = configProvider.getBoolean(APP_LOGS_COLLECTION_ENABLED, false);
+    appLogsCollectionEnabled =
+        configProvider.getBoolean(APP_LOGS_COLLECTION_ENABLED, DEFAULT_APP_LOGS_COLLECTION_ENABLED);
 
     dogStatsDNamedPipe = configProvider.getString(DOGSTATSD_NAMED_PIPE);
 

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

@@ -2,6 +2,7 @@
 
 import static datadog.trace.api.ConfigDefaults.DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_ENABLED;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_APP_LOGS_COLLECTION_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DATA_JOBS_ENABLED;
@@ -27,6 +28,7 @@
 import static datadog.trace.api.config.AppSecConfig.APPSEC_ENABLED;
 import static datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.AGENTLESS_LOG_SUBMISSION_ENABLED;
+import static datadog.trace.api.config.GeneralConfig.APP_LOGS_COLLECTION_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.DATA_JOBS_ENABLED;
 import static datadog.trace.api.config.GeneralConfig.INTERNAL_EXIT_ON_FAILURE;
 import static datadog.trace.api.config.GeneralConfig.TELEMETRY_ENABLED;
@@ -206,6 +208,8 @@ public class InstrumenterConfig {
   private final boolean agentlessLogSubmissionEnabled;
   private final boolean apiSecurityEndpointCollectionEnabled;
 
+  private final boolean appLogsCollectionEnabled;
+
   static {
     // Bind telemetry collector to config module before initializing ConfigProvider
     OtelEnvMetricCollectorProvider.register(OtelEnvMetricCollectorImpl.getInstance());
@@ -351,6 +355,9 @@ private InstrumenterConfig() {
         configProvider.getBoolean(
             API_SECURITY_ENDPOINT_COLLECTION_ENABLED,
             DEFAULT_API_SECURITY_ENDPOINT_COLLECTION_ENABLED);
+
+    appLogsCollectionEnabled =
+        configProvider.getBoolean(APP_LOGS_COLLECTION_ENABLED, DEFAULT_APP_LOGS_COLLECTION_ENABLED);
   }
 
   public boolean isCodeOriginEnabled() {
@@ -658,6 +665,10 @@ public boolean isApiSecurityEndpointCollectionEnabled() {
     return apiSecurityEndpointCollectionEnabled;
   }
 
+  public boolean isAppLogsCollectionEnabled() {
+    return appLogsCollectionEnabled;
+  }
+
   // This has to be placed after all other static fields to give them a chance to initialize
   private static final InstrumenterConfig INSTANCE =
       new InstrumenterConfig(