Merge pull request #6999 from DataDog/cecile/tracer_debugfile_continue

Add tracer log file to tracer flare if datadog.slf4j.simpleLogger.logFile is defined

Author: cecile75

dd-trace-core/src/main/java/datadog/trace/core/flare/TracerFlareService.java

@@ -16,7 +16,9 @@
 import datadog.trace.util.AgentTaskScheduler.Scheduled;
 import datadog.trace.util.Strings;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.lang.management.ThreadInfo;
@@ -293,17 +295,17 @@ private void addLogs(ZipOutputStream zip) throws IOException {
       try {
         long size = Files.size(path);
         if (size > MAX_LOGFILE_SIZE_BYTES) {
-          TracerFlare.addText(
-              zip,
-              "tracer.log",
-              "Can't add tracer log file to the flare due to its size: "
-                  + size
-                  + "."
-                  + "Max Size is "
-                  + MAX_LOGFILE_SIZE_MB
-                  + " MB.");
+          int maxSizeOfSplit = MAX_LOGFILE_SIZE_BYTES / 2;
+          File originalFile = new File(path.toString());
+          try (RandomAccessFile ras = new RandomAccessFile(originalFile, "r")) {
+            final byte[] buffer = new byte[maxSizeOfSplit];
+            ras.readFully(buffer);
+            TracerFlare.addBinary(zip, "tracer_begin.log", buffer);
+            ras.seek(size - maxSizeOfSplit);
+            ras.readFully(buffer);
+            TracerFlare.addBinary(zip, "tracer_end.log", buffer);
+          }
         } else {
-
           TracerFlare.addBinary(zip, "tracer.log", readAllBytes(path));
         }
       } catch (Throwable e) {