rebase + use new converters

spotless

Author: jpbempel

dd-trace-core/src/test/java/datadog/trace/common/writer/PrioritizationTest.java

@@ -17,7 +17,7 @@
 import datadog.trace.common.writer.ddagent.PrioritizationStrategy;
 import datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult;
 import datadog.trace.core.DDSpan;
-import datadog.trace.junit.utils.tabletest.PrioritySamplingConverter;
+import datadog.trace.junit.utils.converter.PrioritySamplingConverter;
 import datadog.trace.test.util.DDJavaSpecification;
 import java.util.Collections;
 import java.util.List;

dd-trace-core/src/test/java/datadog/trace/common/writer/TraceMapperTest.java

@@ -35,7 +35,7 @@ void testTraceMapperV05() throws Exception {
                 .withTag("elasticsearch.version", "7.0")
                 .start();
     span.setBaggageItem("baggage", "item");
-    span.context().setDataTop("mydata", "[1,2,3]");
+    span.spanContext().setDataTop("mydata", "[1,2,3]");
     List<DDSpan> trace = Collections.singletonList(span);
 
     TraceMapperV0_5 traceMapper = new TraceMapperV0_5();

dd-trace-core/src/test/java/datadog/trace/common/writer/TraceProcessingWorkerTest.java

@@ -19,7 +19,7 @@
 import datadog.trace.core.DDSpanContext;
 import datadog.trace.core.PendingTrace;
 import datadog.trace.core.monitor.HealthMetrics;
-import datadog.trace.junit.utils.tabletest.PrioritySamplingConverter;
+import datadog.trace.junit.utils.converter.PrioritySamplingConverter;
 import datadog.trace.test.util.DDJavaSpecification;
 import java.lang.reflect.Method;
 import java.util.ArrayList;

dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV04PayloadTest.java

@@ -350,20 +350,21 @@ public void accept(int messageCount, ByteBuffer buffer) {
                   metrics.put(key, metricValue);
                 }
               }
-              metrics.forEach((key, value) -> {
-                if (value instanceof Double || value instanceof Float) {
-                  assertEquals(
-                      ((Number) expectedSpan.getTag(key)).doubleValue(),
-                      value.doubleValue(),
-                      0.001);
-                } else {
-                  // Groovy compared numerically, Java requires explicit long comparison to avoid
-                  // Long/Integer type mismatch from different msgpack integer encoding widths
-                  assertEquals(
-                      ((Number) expectedSpan.getTag(key)).longValue(),
-                      value.longValue());
-                }
-              });
+              metrics.forEach(
+                  (key, value) -> {
+                    if (value instanceof Double || value instanceof Float) {
+                      assertEquals(
+                          ((Number) expectedSpan.getTag(key)).doubleValue(),
+                          value.doubleValue(),
+                          0.001);
+                    } else {
+                      // Groovy compared numerically, Java requires explicit long comparison to
+                      // avoid
+                      // Long/Integer type mismatch from different msgpack integer encoding widths
+                      assertEquals(
+                          ((Number) expectedSpan.getTag(key)).longValue(), value.longValue());
+                    }
+                  });
               assertEquals("meta", unpacker.unpackString());
               int metaSize = unpacker.unpackMapHeader();
               HashMap<String, String> meta = new HashMap<>();

dd-trace-core/src/test/java/datadog/trace/common/writer/ddagent/TraceMapperV1PayloadTest.java

@@ -29,7 +29,7 @@
 import datadog.trace.common.writer.Payload;
 import datadog.trace.common.writer.TraceGenerator;
 import datadog.trace.core.MetadataConsumer;
-import datadog.trace.junit.utils.tabletest.SamplingMechanismConverter;
+import datadog.trace.junit.utils.converter.SamplingMechanismConverter;
 import datadog.trace.test.util.DDJavaSpecification;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -194,11 +194,11 @@ void testPayloadContainsExpectedHeaderAndChunkFields() throws IOException {
   }
 
   @TableTest({
-    "scenario        | decisionMakerTag | expectedSamplingMechanism",
-    "null tag        |                  | SamplingMechanism.DEFAULT",
-    "simple negative | '-3'             | 3                        ",
-    "compound        | '934086a686-7'   | 7                        ",
-    "invalid         | 'invalid'        | SamplingMechanism.DEFAULT"
+    "scenario        | decisionMakerTag | expectedSamplingMechanism        ",
+    "null tag        |                  | SamplingMechanism.DEFAULT        ",
+    "simple negative | '-3'             | SamplingMechanism.LOCAL_USER_RULE",
+    "compound        | '934086a686-7'   | 7                                ",
+    "invalid         | 'invalid'        | SamplingMechanism.DEFAULT        "
   })
   void testSamplingMechanismNormalizationFromDdPDm(
       String decisionMakerTag,
@@ -937,13 +937,6 @@ public void processTagsAndBaggage(MetadataConsumer consumer) {
       processTagsAndBaggageCount++;
       super.processTagsAndBaggage(consumer);
     }
-
-    @Override
-    public void processTagsAndBaggage(
-        MetadataConsumer consumer, boolean injectLinksAsTags, boolean injectBaggageAsTags) {
-      processTagsAndBaggageCount++;
-      super.processTagsAndBaggage(consumer, injectLinksAsTags, injectBaggageAsTags);
-    }
   }
 
   private static class ByteArrayChannel implements WritableByteChannel {

utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/AbstractClassConstantConvertor.java

@@ -32,9 +32,12 @@ public T convert(Object source, ParameterContext context) {
       s = s.substring(length + 1);
     }
     T mappedValue = mapping().get(s);
-    if (mappedValue == null && throwsOnUnsupportedValue()) {
-      throw new ArgumentConversionException(
-          "Unsupported constant " + source + " from " + className);
+    if (mappedValue == null) {
+      if (throwsOnUnsupportedValue()) {
+        throw new ArgumentConversionException(
+            "Unsupported constant " + source + " from " + className);
+      }
+      return convertWhenNoMapping(source);
     }
     return mappedValue;
   }
@@ -43,6 +46,10 @@ protected boolean throwsOnUnsupportedValue() {
     return true;
   }
 
+  protected T convertWhenNoMapping(Object source) {
+    return null;
+  }
+
   public abstract static class AbstractStringFallThruConverter
       extends AbstractClassConstantConvertor<String> {
     @Override

utils/junit-utils/src/main/java/datadog/trace/junit/utils/converter/SamplingMechanismConverter.java

@@ -48,4 +48,14 @@ protected String className() {
   protected Map<String, Byte> mapping() {
     return MAPPING;
   }
+
+  @Override
+  protected boolean throwsOnUnsupportedValue() {
+    return false;
+  }
+
+  @Override
+  protected Byte convertWhenNoMapping(Object source) {
+    return Byte.parseByte((String) source);
+  }
 }