suggestions

amarziali · amarziali · commit dde2240cc2d9 · 2025-10-03T11:44:02.000+02:00
diff --git a/communication/src/main/java/datadog/communication/serialization/Mapper.java b/communication/src/main/java/datadog/communication/serialization/Mapper.java
@@ -1,6 +1,6 @@
 package datadog.communication.serialization;
 
-// TODO @FunctionalInterface
+@FunctionalInterface
 public interface Mapper<T> {
   void map(T data, Writable packer);
 
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_4.java
@@ -56,18 +56,10 @@ MetaWriter withWritable(Writable writable) {
       return this;
     }
 
-    MetaWriter forFirstSpanInTrace(final boolean firstSpanInTrace) {
-      this.firstSpanInTrace = firstSpanInTrace;
-      return this;
-    }
-
-    MetaWriter forLastSpanInTrace(final boolean lastSpanInTrace) {
-      this.lastSpanInTrace = lastSpanInTrace;
-      return this;
-    }
-
-    MetaWriter forFirstSpanInPayload(final boolean firstSpanInPayload) {
-      this.firstSpanInPayload = firstSpanInPayload;
+    MetaWriter forSpan(boolean firstInTrace, boolean lastInTrace, boolean firstInPayload) {
+      this.firstSpanInTrace = firstInTrace;
+      this.lastSpanInTrace = lastInTrace;
+      this.firstSpanInPayload = firstInPayload;
       return this;
     }
 
@@ -306,9 +298,7 @@ public void map(List<? extends CoreSpan<?>> trace, final Writable writable) {
       span.processTagsAndBaggage(
           metaWriter
               .withWritable(writable)
-              .forFirstSpanInPayload(!firstSpanWritten)
-              .forFirstSpanInTrace(i == 0)
-              .forLastSpanInTrace(i == trace.size() - 1));
+              .forSpan(i == 0, i == trace.size() - 1, !firstSpanWritten));
       if (!metaStruct.isEmpty()) {
         /* 13 */
         metaStructWriter.withWritable(writable).write(metaStruct);
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_5.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/TraceMapperV0_5.java
@@ -79,9 +79,7 @@ public void map(final List<? extends CoreSpan<?>> trace, final Writable writable
       span.processTagsAndBaggage(
           metaWriter
               .withWritable(writable)
-              .forFirstSpanInTrace(i == 0)
-              .forLastSpanInTrace(i == trace.size() - 1)
-              .forFirstSpanInPayload(!firstSpanWritten));
+              .forSpan(i == 0, i == trace.size() - 1, !firstSpanWritten));
       /* 12 */
       writeDictionaryEncoded(writable, span.getType());
       firstSpanWritten = true;
@@ -193,18 +191,10 @@ MetaWriter withWritable(final Writable writable) {
       return this;
     }
 
-    MetaWriter forFirstSpanInTrace(final boolean firstSpanInTrace) {
-      this.firstSpanInTrace = firstSpanInTrace;
-      return this;
-    }
-
-    MetaWriter forLastSpanInTrace(final boolean lastSpanInTrace) {
-      this.lastSpanInTrace = lastSpanInTrace;
-      return this;
-    }
-
-    MetaWriter forFirstSpanInPayload(final boolean firstSpanInPayload) {
-      this.firstSpanInPayload = firstSpanInPayload;
+    MetaWriter forSpan(boolean firstInTrace, boolean lastInTrace, boolean firstInPayload) {
+      this.firstSpanInTrace = firstInTrace;
+      this.lastSpanInTrace = lastInTrace;
+      this.firstSpanInPayload = firstInPayload;
       return this;
     }
 
