Refactored code duplication.

Author: AlexeyKuznetsov-DD

utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/MessageV1.java

@@ -89,30 +89,7 @@ private static void skipPayloadField(
         break;
       case 10:
         // Header-level attributes: same triplet encoding as span attributes.
-        int arraySize = unpacker.unpackArrayHeader();
-        if (arraySize % 3 != 0) {
-          throw new IllegalArgumentException(
-              "Attributes array size must be divisible by 3, got: " + arraySize);
-        }
-        int tripletCount = arraySize / 3;
-        for (int i = 0; i < tripletCount; i++) {
-          SpanV1.unpackStreamingString(unpacker, stringTable);
-          int valueType = unpacker.unpackInt();
-          switch (valueType) {
-            case SpanV1.STRING_VALUE_TYPE:
-              SpanV1.unpackStreamingString(unpacker, stringTable);
-              break;
-            case SpanV1.BOOL_VALUE_TYPE:
-              unpacker.unpackBoolean();
-              break;
-            case SpanV1.FLOAT_VALUE_TYPE:
-              unpacker.unpackDouble();
-              break;
-            default:
-              unpacker.skipValue();
-              break;
-          }
-        }
+        SpanV1.skipAttributes(unpacker, stringTable);
         break;
       default:
         unpacker.skipValue();

utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/SpanV1.java

@@ -324,6 +324,58 @@ private static void unpackAttributes(
     }
   }
 
+  static void skipAttributes(MessageUnpacker unpacker, List<String> stringTable)
+      throws IOException {
+    forEachAttribute(unpacker, stringTable, AttributeSkipper.INSTANCE);
+  }
+
+  private static void forEachAttribute(
+      MessageUnpacker unpacker, List<String> stringTable, AttributeConsumer consumer)
+      throws IOException {
+    int arraySize = unpacker.unpackArrayHeader();
+    // Array contains triplets (key, type, value), so size must be divisible by 3
+    if (arraySize % 3 != 0) {
+      throw new IllegalArgumentException(
+          "Attributes array size must be divisible by 3, got: " + arraySize);
+    }
+
+    int tripletCount = arraySize / 3;
+    for (int i = 0; i < tripletCount; i++) {
+      String key = unpackStreamingString(unpacker, stringTable);
+      int valueType = unpacker.unpackInt();
+      consumer.accept(unpacker, stringTable, key, valueType);
+    }
+  }
+
+  private interface AttributeConsumer {
+    void accept(MessageUnpacker unpacker, List<String> stringTable, String key, int valueType)
+        throws IOException;
+  }
+
+  private enum AttributeSkipper implements AttributeConsumer {
+    INSTANCE;
+
+    @Override
+    public void accept(
+        MessageUnpacker unpacker, List<String> stringTable, String key, int valueType)
+        throws IOException {
+      switch (valueType) {
+        case STRING_VALUE_TYPE:
+          unpackStreamingString(unpacker, stringTable);
+          break;
+        case BOOL_VALUE_TYPE:
+          unpacker.unpackBoolean();
+          break;
+        case FLOAT_VALUE_TYPE:
+          unpacker.unpackDouble();
+          break;
+        default:
+          unpacker.skipValue();
+          break;
+      }
+    }
+  }
+
   /**
    * Converts span kind integer to string representation.
    *

utils/test-agent-utils/decoder/src/main/java/datadog/trace/test/agent/decoder/v1/raw/TraceV1.java

@@ -65,7 +65,7 @@ private static TraceV1 unpackChunk(MessageUnpacker unpacker, List<String> string
           break;
         case 3:
           // chunk attributes (triplets array)
-          skipAttributes(unpacker, stringTable);
+          SpanV1.skipAttributes(unpacker, stringTable);
           break;
         case 4:
           spans = SpanV1.unpackSpans(unpacker, stringTable, traceId);
@@ -131,34 +131,6 @@ private static DecodedSpan[] withChunkFields(
     return updated;
   }
 
-  private static void skipAttributes(MessageUnpacker unpacker, List<String> stringTable)
-      throws IOException {
-    int arraySize = unpacker.unpackArrayHeader();
-    if (arraySize % 3 != 0) {
-      throw new IllegalArgumentException(
-          "Attributes array size must be divisible by 3, got: " + arraySize);
-    }
-    int tripletCount = arraySize / 3;
-    for (int i = 0; i < tripletCount; i++) {
-      SpanV1.unpackStreamingString(unpacker, stringTable);
-      int valueType = unpacker.unpackInt();
-      switch (valueType) {
-        case SpanV1.STRING_VALUE_TYPE:
-          SpanV1.unpackStreamingString(unpacker, stringTable);
-          break;
-        case SpanV1.BOOL_VALUE_TYPE:
-          unpacker.unpackBoolean();
-          break;
-        case SpanV1.FLOAT_VALUE_TYPE:
-          unpacker.unpackDouble();
-          break;
-        default:
-          unpacker.skipValue();
-          break;
-      }
-    }
-  }
-
   private final DecodedSpan[] spans;
   private final Integer chunkSamplingPriority;