Cleanup

Author: mcculls

dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java

@@ -6,6 +6,7 @@
 import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_PRODUCER;
 import static datadog.trace.bootstrap.instrumentation.api.Tags.SPAN_KIND_SERVER;
 import static java.util.Arrays.asList;
+import static java.util.Arrays.copyOfRange;
 import static java.util.Collections.emptyList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -131,6 +132,9 @@ static final class SpanSpec {
      */
     boolean use128BitTraceId;
 
+    /** Trace origin carried in the extracted parent context; {@code null} = no origin. */
+    String origin;
+
     SpanSpec(
         String resourceName,
         String operationName,
@@ -183,9 +187,6 @@ SpanSpec origin(String origin) {
       this.origin = origin;
       return this;
     }
-
-    /** Trace origin carried in the extracted parent context; {@code null} = no origin. */
-    String origin;
   }
 
   /**
@@ -219,6 +220,13 @@ static final class LinkSpec {
   private static final long BASE_MICROS = 1_700_000_000_000_000L;
   private static final long DURATION_MICROS = 500_000L; // 500 ms
 
+  /**
+   * A known 128-bit trace ID used by {@link SpanSpec#use128BitTraceId} test cases. High-order bits
+   * are non-zero so the test can assert the proto encodes them correctly.
+   */
+  static final DD128bTraceId TRACE_ID_128BIT =
+      DD128bTraceId.from(0x0123456789abcdefL, 0xfedcba9876543210L);
+
   private static SpanSpec span(String resourceName, String operationName, String spanType) {
     return new SpanSpec(
         resourceName,
@@ -353,10 +361,6 @@ private static SpanSpec linkedSpan(String resourceName, int... targetIndices) {
         links);
   }
 
-  /**
-   * A span with one {@link SpanLink} pointing to the span at {@code targetIndex}, carrying the
-   * given {@link SpanAttributes}.
-   */
   /**
    * A span with one {@link SpanLink} pointing to the span at {@code targetIndex}, carrying the
    * given {@link SpanAttributes}.
@@ -617,13 +621,6 @@ void testCollectSpans(String caseName, List<SpanSpec> specs) throws IOException
 
   // ── span construction ─────────────────────────────────────────────────────
 
-  /**
-   * A known 128-bit trace ID used by {@link SpanSpec#use128BitTraceId} test cases. High-order bits
-   * are non-zero so the test can assert the proto encodes them correctly.
-   */
-  static final DD128bTraceId TRACE_ID_128BIT =
-      DD128bTraceId.from(0x0123456789abcdefL, 0xfedcba9876543210L);
-
   /** Builds {@link DDSpan} instances from the given specs, collecting them in order. */
   private static List<DDSpan> buildSpans(List<SpanSpec> specs) {
     List<DDSpan> spans = new ArrayList<>(specs.size());
@@ -642,7 +639,7 @@ private static List<DDSpan> buildSpans(List<SpanSpec> specs) {
       } else if (spec.origin != null) {
         ExtractedContext parentWithOrigin =
             new ExtractedContext(
-                DDTraceId.from(1L),
+                DDTraceId.ONE,
                 0L,
                 PrioritySampling.UNSET,
                 spec.origin,
@@ -848,8 +845,7 @@ private static void verifySpan(CodedInputStream sp, DDSpan span, SpanSpec spec,
     assertEquals(16, parsedTraceId.length, "trace_id must be 16 bytes [" + caseName + "]");
     if (spec.use128BitTraceId) {
       // high-order bytes occupy parsedTraceId[8..15] (little-endian in the wire format)
-      long highOrderBytes =
-          readLittleEndianLong(java.util.Arrays.copyOfRange(parsedTraceId, 8, 16));
+      long highOrderBytes = readLittleEndianLong(copyOfRange(parsedTraceId, 8, 16));
       assertNotEquals(
           0L,
           highOrderBytes,