PR comments

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

@@ -23,7 +23,7 @@ public void afterScopeActivated() {}
   public void afterScopeActivated(
       DDTraceId traceId, long localRootSpanId, long spanId, TraceConfig traceConfig) {
     if (traceConfig != null && traceConfig.isLogsInjectionEnabled()) {
-      if (traceId.toHighOrderLong() != 0 && InstrumenterConfig.get().isLogs128bTraceIdEnabled()) {
+      if (InstrumenterConfig.get().isLogs128bTraceIdEnabled() && traceId.toHighOrderLong() != 0) {
         add(CorrelationIdentifier.getTraceIdKey(), traceId.toHexString());
       } else {
         add(CorrelationIdentifier.getTraceIdKey(), traceId.toString());

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

@@ -271,7 +271,6 @@ public static class CoreTracerBuilder {
     private ProfilingContextIntegration profilingContextIntegration =
         ProfilingContextIntegration.NoOp.INSTANCE;
     private boolean pollForTracingConfiguration;
-    private boolean logsInjectionEnabled;
 
     public CoreTracerBuilder serviceName(String serviceName) {
       this.serviceName = serviceName;
@@ -395,11 +394,6 @@ public CoreTracerBuilder pollForTracingConfiguration() {
       return this;
     }
 
-    public CoreTracerBuilder logsInjectionEnabled(boolean logsInjectionEnabled) {
-      this.logsInjectionEnabled = logsInjectionEnabled;
-      return this;
-    }
-
     public CoreTracerBuilder() {
       // Apply the default values from config.
       config(Config.get());
@@ -429,7 +423,6 @@ public CoreTracerBuilder config(final Config config) {
       baggageMapping(config.getBaggageMapping());
       partialFlushMinSpans(config.getPartialFlushMinSpans());
       strictTraceWrites(config.isTraceStrictWritesEnabled());
-      logsInjectionEnabled(config.isLogsInjectionEnabled());
 
       return this;
     }
@@ -459,8 +452,7 @@ public CoreTracer build() {
           timeSource,
           dataStreamsMonitoring,
           profilingContextIntegration,
-          pollForTracingConfiguration,
-          logsInjectionEnabled);
+          pollForTracingConfiguration);
     }
   }
 
@@ -489,8 +481,7 @@ private CoreTracer(
       final TimeSource timeSource,
       final DataStreamsMonitoring dataStreamsMonitoring,
       final ProfilingContextIntegration profilingContextIntegration,
-      final boolean pollForTracingConfiguration,
-      final boolean logsInjectionEnabled) {
+      final boolean pollForTracingConfiguration) {
 
     assert localRootSpanTags != null;
     assert defaultSpanTags != null;

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

@@ -3611,6 +3611,8 @@ public String toString() {
         + elasticsearchBodyAndParamsEnabled
         + ", traceFlushInterval="
         + traceFlushIntervalSeconds
+        + ", logsInjectionEnabled="
+        + logsInjectionEnabled
         + '}';
   }
 }