fix asserts

Author: jpbempel

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

@@ -2,7 +2,9 @@
 
 import static datadog.trace.api.ProtocolVersion.V0_5;
 import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -382,7 +384,7 @@ void testApiResponseListenersSee200Responses(String agentVersion) {
       client.sendSerializedTraces(payload);
 
       Map<String, Map<String, Number>> response = agentResponse.get();
-      assertTrue(response != null && response.containsKey("hello"));
+      assertEquals(singletonMap("hello", emptyMap()), response);
       assertEquals("java", agent.getLastRequest().getHeaders().get("Datadog-Meta-Lang"));
       assertEquals(
           System.getProperty("java.version", "unknown"),

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

@@ -16,6 +16,7 @@
 import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
 import datadog.metrics.api.statsd.StatsDClient;
 import datadog.metrics.impl.MonitoringImpl;
+import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.common.writer.ddagent.DDAgentApi;
 import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery;
 import datadog.trace.common.writer.ddagent.PrioritizationStrategy.PublishResult;
@@ -202,12 +203,16 @@ void testDroppedTraceIsCounted(PublishResult publishResult) {
     DDAgentWriter localWriter =
         new DDAgentWriter(localWorker, localDispatcher, localMonitor, 1, SECONDS, false);
 
-    List<DDSpan> trace = Arrays.asList(newSpan(), newSpan());
+    DDSpan p0 = newSpan();
+    p0.setSamplingPriority(PrioritySampling.SAMPLER_DROP);
+    List<DDSpan> trace = Arrays.asList(p0, newSpan());
 
-    when(localWorker.publish(eq(trace.get(0)), anyInt(), eq(trace))).thenReturn(publishResult);
+    when(localWorker.publish(eq(trace.get(0)), eq((int) PrioritySampling.SAMPLER_DROP), eq(trace)))
+        .thenReturn(publishResult);
     localWriter.write(trace);
 
-    verify(localWorker).publish(eq(trace.get(0)), anyInt(), eq(trace));
+    verify(localWorker)
+        .publish(eq(trace.get(0)), eq((int) PrioritySampling.SAMPLER_DROP), eq(trace));
     verify(localDispatcher).onDroppedTrace(trace.size());
   }
 

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

@@ -32,6 +32,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.OptionalInt;
 import java.util.TreeMap;
 import java.util.zip.GZIPInputStream;
 import okhttp3.HttpUrl;
@@ -327,7 +328,9 @@ private void runContentIsSentAsMsgpackTest(
     Payload payload = prepareTraces(trackType, traces);
 
     try {
-      client.sendSerializedTraces(payload).status();
+      OptionalInt status = client.sendSerializedTraces(payload).status();
+      assertTrue(status.isPresent());
+      assertEquals(200, status.getAsInt());
       assertEquals("application/msgpack", intake.getLastRequest().getContentType());
       Map<String, Object> actualBody = convertMap(intake.getLastRequest().getBody());
       assertDeepEquals(expectedRequestBody, actualBody);