fix compilation 3

Author: robertomonteromiguel

dd-trace-core/src/main/java/datadog/trace/common/writer/PayloadDispatcherImpl.java

@@ -135,13 +135,11 @@ public void accept(int messageCount, ByteBuffer buffer) {
       sendDetails.put("trace_count", messageCount);
       sendDetails.put("payload_size_bytes", sizeInBytes);
       sendDetails.put("success", response.success());
-      if (response.exception() != null) {
-        sendDetails.put("exception", response.exception().getClass().getName());
-        sendDetails.put("exception_message", response.exception().getMessage());
-      }
-      if (response.status() != null) {
-        sendDetails.put("http_status", response.status());
-      }
+      response.exception().ifPresent(ex -> {
+        sendDetails.put("exception", ex.getClass().getName());
+        sendDetails.put("exception_message", ex.getMessage());
+      });
+      response.status().ifPresent(status -> sendDetails.put("http_status", status));
 
       Assert.always(
           response.success(),
@@ -158,13 +156,11 @@ public void accept(int messageCount, ByteBuffer buffer) {
         ObjectNode failureDetails = JsonNodeFactory.instance.objectNode();
         failureDetails.put("trace_count", messageCount);
         failureDetails.put("payload_size_bytes", sizeInBytes);
-        if (response.exception() != null) {
-          failureDetails.put("exception", response.exception().getClass().getName());
-          failureDetails.put("exception_message", response.exception().getMessage());
-        }
-        if (response.status() != null) {
-          failureDetails.put("http_status", response.status());
-        }
+        response.exception().ifPresent(ex -> {
+          failureDetails.put("exception", ex.getClass().getName());
+          failureDetails.put("exception_message", ex.getMessage());
+        });
+        response.status().ifPresent(status -> failureDetails.put("http_status", status));
 
         Assert.unreachable(
             "Trace sending failure path should never be reached - indicates traces are being lost",

dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteWriter.java

@@ -88,7 +88,6 @@ public void write(final List<DDSpan> trace) {
       // Antithesis: Track when traces are dropped due to writer being closed
       ObjectNode shutdownDetails = JsonNodeFactory.instance.objectNode();
       shutdownDetails.put("trace_size", trace.size());
-      shutdownDetails.put("span_count", trace.stream().mapToInt(List::size).sum());
       shutdownDetails.put("reason", "writer_closed_during_shutdown");
 
       Assert.sometimes(
@@ -120,7 +119,6 @@ public void write(final List<DDSpan> trace) {
             // Antithesis: Buffer overflow should NEVER happen - this indicates a serious problem
             ObjectNode overflowDetails = JsonNodeFactory.instance.objectNode();
             overflowDetails.put("trace_size", trace.size());
-            overflowDetails.put("span_count", trace.stream().mapToInt(List::size).sum());
             overflowDetails.put("sampling_priority", samplingPriority);
             overflowDetails.put("buffer_capacity", traceProcessingWorker.getCapacity());
             overflowDetails.put("reason", "buffer_overflow_backpressure");