OTLP logs proto doesn't include the remote trace flag

Author: mcculls

dd-trace-core/src/main/java/datadog/trace/core/otlp/logs/OtlpLogsProto.java

@@ -12,8 +12,6 @@
 import static datadog.trace.core.otlp.common.OtlpCommonProto.writeString;
 import static datadog.trace.core.otlp.common.OtlpCommonProto.writeTag;
 import static datadog.trace.core.otlp.common.OtlpCommonProto.writeVarInt;
-import static datadog.trace.core.otlp.trace.OtlpTraceProto.NO_TRACE_FLAGS;
-import static datadog.trace.core.otlp.trace.OtlpTraceProto.REMOTE_TRACE_FLAG;
 import static datadog.trace.core.otlp.trace.OtlpTraceProto.SAMPLED_TRACE_FLAG;
 import static datadog.trace.core.otlp.trace.OtlpTraceProto.writeSpanId;
 import static datadog.trace.core.otlp.trace.OtlpTraceProto.writeTraceId;
@@ -76,16 +74,9 @@ public static byte[] recordLogRecordMessage(GrowableBuffer buf, OtlpLogRecord lo
       writeTag(buf, 10, LEN_WIRE_TYPE);
       writeSpanId(buf, logRecord.spanContext.getSpanId());
 
-      int traceFlags = NO_TRACE_FLAGS;
       if (logRecord.spanContext.getSamplingPriority() > 0) {
-        traceFlags |= SAMPLED_TRACE_FLAG;
-      }
-      if (logRecord.spanContext.isRemote()) {
-        traceFlags |= REMOTE_TRACE_FLAG;
-      }
-      if (traceFlags != NO_TRACE_FLAGS) {
         writeTag(buf, 8, I32_WIRE_TYPE);
-        writeI32(buf, traceFlags);
+        writeI32(buf, SAMPLED_TRACE_FLAG);
       }
     }
 

dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java

@@ -4,7 +4,6 @@
 import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.DOUBLE_ATTRIBUTE;
 import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.LONG_ATTRIBUTE;
 import static datadog.trace.bootstrap.otlp.common.OtlpAttributeVisitor.STRING_ATTRIBUTE;
-import static datadog.trace.core.otlp.trace.OtlpTraceProto.REMOTE_TRACE_FLAG;
 import static datadog.trace.core.otlp.trace.OtlpTraceProto.SAMPLED_TRACE_FLAG;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
@@ -116,12 +115,6 @@ static final class LogSpec {
     /** event_name (proto field 12); {@code null} → field absent. */
     @Nullable final String eventName;
 
-    /**
-     * If true, wraps the span's IDs in a remote {@link ExtractedContext} so that {@code isRemote()}
-     * returns true, setting {@code REMOTE_TRACE_FLAG}.
-     */
-    boolean useRemoteContext;
-
     /**
      * If true, the span at {@code spanContextIndex} is started under a known 128-bit trace ID so
      * the high-order bytes of trace_id are non-zero.
@@ -149,11 +142,6 @@ static final class LogSpec {
       this.eventName = eventName;
     }
 
-    LogSpec remoteContext() {
-      this.useRemoteContext = true;
-      return this;
-    }
-
     LogSpec use128BitTraceId() {
       this.use128BitTraceId = true;
       return this;
@@ -298,9 +286,6 @@ static Stream<Arguments> cases() {
         Arguments.of(
             "log with 128-bit trace ID — high-order trace_id bytes non-zero",
             asList(contextLog("128-bit trace", 0).use128BitTraceId())),
-        Arguments.of(
-            "log with remote span context — REMOTE flag set in flags field",
-            asList(contextLog("remote context", 0).remoteContext())),
 
         // ── event name ────────────────────────────────────────────────────────
         Arguments.of(
@@ -487,24 +472,15 @@ private static List<DDSpan> buildSpans(List<LogSpec> specs) {
   }
 
   /**
-   * Resolves the {@link AgentSpanContext} for a spec: null if no context, remote {@link
-   * ExtractedContext} if {@code useRemoteContext}, or the span's own context otherwise.
+   * Resolves the {@link AgentSpanContext} for a spec: the span's own context, or null if no
+   * context.
    */
   @Nullable
   private static AgentSpanContext resolveContext(List<DDSpan> spans, LogSpec spec) {
     if (spec.spanContextIndex < 0) {
       return null;
     }
     DDSpan span = spans.get(spec.spanContextIndex);
-    if (spec.useRemoteContext) {
-      return new ExtractedContext(
-          span.getTraceId(),
-          span.getSpanId(),
-          PrioritySampling.USER_KEEP,
-          null,
-          PropagationTags.factory().empty(),
-          TracePropagationStyle.DATADOG);
-    }
     return span.context();
   }
 
@@ -718,11 +694,6 @@ private static void verifyLogRecord(
             (parsedFlags & SAMPLED_TRACE_FLAG) != 0,
             "SAMPLED flag must be set in flags [" + caseName + "]");
       }
-      if (ctx.isRemote()) {
-        assertTrue(
-            (parsedFlags & REMOTE_TRACE_FLAG) != 0,
-            "REMOTE flag must be set in flags [" + caseName + "]");
-      }
       if (spec.use128BitTraceId) {
         long highOrderBytes = readBigEndianLong(parsedTraceId);
         assertNotEquals(