logInjectionEnabled -> logsInjectionEnabled

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/log/LogContextScopeListener.java

@@ -20,7 +20,7 @@ public void afterScopeActivated() {}
   @Override
   public void afterScopeActivated(
       DDTraceId traceId, long localRootSpanId, long spanId, TraceConfig traceConfig) {
-    if (traceConfig != null && traceConfig.isLogInjectionEnabled()) {
+    if (traceConfig != null && traceConfig.isLogsInjectionEnabled()) {
       add(CorrelationIdentifier.getTraceIdKey(), CorrelationIdentifier.getTraceId());
       add(CorrelationIdentifier.getSpanIdKey(), CorrelationIdentifier.getSpanId());
     }

dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java

@@ -86,7 +86,7 @@ public static void getMdcValue(
           InstrumentationContext.get(ExtLogRecord.class, AgentSpan.Context.class).get(record);
 
       // Nothing to add so return early
-      if (context == null && !AgentTracer.traceConfig().isLogInjectionEnabled()) {
+      if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
         return;
       }
 
@@ -145,7 +145,7 @@ public static void onExit(
           InstrumentationContext.get(ExtLogRecord.class, AgentSpan.Context.class).get(record);
 
       // Nothing to add so return early
-      if (context == null && !AgentTracer.traceConfig().isLogInjectionEnabled()) {
+      if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
         return;
       }
 

dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java

@@ -54,7 +54,7 @@ public static boolean attachContext(@Advice.Argument(0) ExtLogRecord record) {
 
       if (span != null) {
         TraceConfig traceConfig = span.traceConfig();
-        if (traceConfig != null && traceConfig.isLogInjectionEnabled()) {
+        if (traceConfig != null && traceConfig.isLogsInjectionEnabled()) {
           InstrumentationContext.get(ExtLogRecord.class, AgentSpan.Context.class)
               .put(record, span.context());
         }

dd-java-agent/instrumentation/log4j-2.7/src/main/java/datadog/trace/instrumentation/log4j27/SpanDecoratingContextDataInjector.java

@@ -34,7 +34,7 @@ public StringMap injectContextData(List<Property> list, StringMap reusable) {
 
     AgentSpan span = activeSpan();
 
-    if (!AgentTracer.traceConfig(activeSpan()).isLogInjectionEnabled()) {
+    if (!AgentTracer.traceConfig(activeSpan()).isLogsInjectionEnabled()) {
       return contextData;
     }
 

dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/CategoryInstrumentation.java

@@ -58,7 +58,7 @@ public static void onEnter(@Advice.Argument(0) LoggingEvent event) {
       if (span != null) {
         TraceConfig traceConfig = span.traceConfig();
 
-        if (traceConfig != null && traceConfig.isLogInjectionEnabled()) {
+        if (traceConfig != null && traceConfig.isLogsInjectionEnabled()) {
           InstrumentationContext.get(LoggingEvent.class, AgentSpan.Context.class)
               .put(event, span.context());
         }

dd-java-agent/instrumentation/log4j1/src/main/java/datadog/trace/instrumentation/log4j1/LoggingEventInstrumentation.java

@@ -69,7 +69,7 @@ public static void getMdcValue(
           InstrumentationContext.get(LoggingEvent.class, AgentSpan.Context.class).get(event);
 
       // Nothing to add so return early
-      if (context == null && !AgentTracer.traceConfig().isLogInjectionEnabled()) {
+      if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
         return;
       }
 
@@ -130,7 +130,7 @@ public static void onEnter(
             InstrumentationContext.get(LoggingEvent.class, AgentSpan.Context.class).get(event);
 
         // Nothing to add so return early
-        if (context == null && !AgentTracer.traceConfig().isLogInjectionEnabled()) {
+        if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
           return;
         }
 

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

@@ -60,7 +60,7 @@ public static void onEnter(@Advice.Argument(0) ILoggingEvent event) {
       if (span != null) {
         TraceConfig traceConfig = span.traceConfig();
 
-        if (traceConfig != null && traceConfig.isLogInjectionEnabled()) {
+        if (traceConfig != null && traceConfig.isLogsInjectionEnabled()) {
           InstrumentationContext.get(ILoggingEvent.class, AgentSpan.Context.class)
               .put(event, span.context());
         }

dd-java-agent/instrumentation/logback-1/src/main/java/datadog/trace/instrumentation/logback/LoggingEventInstrumentation.java

@@ -80,7 +80,7 @@ public static void onExit(
           InstrumentationContext.get(ILoggingEvent.class, AgentSpan.Context.class).get(event);
 
       // Nothing to add so return early
-      if (context == null && !AgentTracer.traceConfig().isLogInjectionEnabled()) {
+      if (context == null && !AgentTracer.traceConfig().isLogsInjectionEnabled()) {
         return;
       }
 

dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

@@ -270,7 +270,7 @@ public static class CoreTracerBuilder {
     private ProfilingContextIntegration profilingContextIntegration =
         ProfilingContextIntegration.NoOp.INSTANCE;
     private boolean pollForTracingConfiguration;
-    private boolean logInjectionEnabled;
+    private boolean logsInjectionEnabled;
 
     public CoreTracerBuilder serviceName(String serviceName) {
       this.serviceName = serviceName;
@@ -394,8 +394,8 @@ public CoreTracerBuilder pollForTracingConfiguration() {
       return this;
     }
 
-    public CoreTracerBuilder logInjectionEnabled(boolean logInjectionEnabled) {
-      this.logInjectionEnabled = logInjectionEnabled;
+    public CoreTracerBuilder logsInjectionEnabled(boolean logsInjectionEnabled) {
+      this.logsInjectionEnabled = logsInjectionEnabled;
       return this;
     }
 
@@ -428,7 +428,7 @@ public CoreTracerBuilder config(final Config config) {
       baggageMapping(config.getBaggageMapping());
       partialFlushMinSpans(config.getPartialFlushMinSpans());
       strictTraceWrites(config.isTraceStrictWritesEnabled());
-      logInjectionEnabled(config.isLogsInjectionEnabled());
+      logsInjectionEnabled(config.isLogsInjectionEnabled());
 
       return this;
     }
@@ -459,7 +459,7 @@ public CoreTracer build() {
           dataStreamsMonitoring,
           profilingContextIntegration,
           pollForTracingConfiguration,
-          logInjectionEnabled);
+          logsInjectionEnabled);
     }
   }
 
@@ -489,7 +489,7 @@ private CoreTracer(
       final DataStreamsMonitoring dataStreamsMonitoring,
       final ProfilingContextIntegration profilingContextIntegration,
       final boolean pollForTracingConfiguration,
-      final boolean logInjectionEnabled) {
+      final boolean logsInjectionEnabled) {
 
     assert localRootSpanTags != null;
     assert defaultSpanTags != null;
@@ -510,7 +510,7 @@ private CoreTracer(
             .setServiceMapping(serviceNameMappings)
             .setTaggedHeaders(taggedHeaders)
             .setBaggageMapping(baggageMapping)
-            .setLogInjectionEnabled(logInjectionEnabled)
+            .setLogsInjectionEnabled(logsInjectionEnabled)
             .apply();
     this.sampler = sampler;
     this.injector = injector;

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

@@ -483,7 +483,7 @@ static class HostNameHolder {
   private final Set<TracePropagationStyle> tracePropagationStylesToExtract;
   private final Set<TracePropagationStyle> tracePropagationStylesToInject;
   private final int clockSyncPeriod;
-  private final boolean logInjectionEnabled;
+  private final boolean logsInjectionEnabled;
 
   private final String dogStatsDNamedPipe;
   private final int dogStatsDStartDelay;
@@ -1076,7 +1076,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
 
     clockSyncPeriod = configProvider.getInteger(CLOCK_SYNC_PERIOD, DEFAULT_CLOCK_SYNC_PERIOD);
 
-    logInjectionEnabled =
+    logsInjectionEnabled =
         configProvider.getBoolean(LOGS_INJECTION_ENABLED, DEFAULT_LOGS_INJECTION_ENABLED);
 
     dogStatsDNamedPipe = configProvider.getString(DOGSTATSD_NAMED_PIPE);
@@ -1908,7 +1908,7 @@ public int getTracerMetricsMaxPending() {
   }
 
   public boolean isLogsInjectionEnabled() {
-    return logInjectionEnabled;
+    return logsInjectionEnabled;
   }
 
   public boolean isReportHostName() {

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

@@ -45,19 +45,19 @@ public final class Builder {
     Map<String, String> serviceMapping;
     Map<String, String> taggedHeaders;
     Map<String, String> baggageMapping;
-    boolean logInjectionEnabled;
+    boolean logsInjectionEnabled;
 
     Builder(State state) {
       if (null == state) {
         this.serviceMapping = Collections.emptyMap();
         this.taggedHeaders = Collections.emptyMap();
         this.baggageMapping = Collections.emptyMap();
-        this.logInjectionEnabled = ConfigDefaults.DEFAULT_LOGS_INJECTION_ENABLED;
+        this.logsInjectionEnabled = ConfigDefaults.DEFAULT_LOGS_INJECTION_ENABLED;
       } else {
         this.serviceMapping = state.serviceMapping;
         this.taggedHeaders = state.taggedHeaders;
         this.baggageMapping = state.baggageMapping;
-        this.logInjectionEnabled = state.logInjectionEnabled;
+        this.logsInjectionEnabled = state.logsInjectionEnabled;
       }
     }
 
@@ -76,8 +76,8 @@ public Builder setBaggageMapping(Map<String, String> baggageMapping) {
       return this;
     }
 
-    public Builder setLogInjectionEnabled(boolean logInjectionEnabled) {
-      this.logInjectionEnabled = logInjectionEnabled;
+    public Builder setLogsInjectionEnabled(boolean logsInjectionEnabled) {
+      this.logsInjectionEnabled = logsInjectionEnabled;
       return this;
     }
 
@@ -123,13 +123,13 @@ static final class State implements TraceConfig {
     final Map<String, String> serviceMapping;
     final Map<String, String> taggedHeaders;
     final Map<String, String> baggageMapping;
-    final boolean logInjectionEnabled;
+    final boolean logsInjectionEnabled;
 
     State(Builder builder) {
       this.serviceMapping = builder.serviceMapping;
       this.taggedHeaders = builder.taggedHeaders;
       this.baggageMapping = builder.baggageMapping;
-      this.logInjectionEnabled = builder.logInjectionEnabled;
+      this.logsInjectionEnabled = builder.logsInjectionEnabled;
     }
 
     public Map<String, String> getServiceMapping() {
@@ -144,8 +144,8 @@ public Map<String, String> getBaggageMapping() {
       return baggageMapping;
     }
 
-    public boolean isLogInjectionEnabled() {
-      return logInjectionEnabled;
+    public boolean isLogsInjectionEnabled() {
+      return logsInjectionEnabled;
     }
   }
 }

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

@@ -11,5 +11,5 @@ public interface TraceConfig {
 
   Map<String, String> getBaggageMapping();
 
-  boolean isLogInjectionEnabled();
+  boolean isLogsInjectionEnabled();
 }