RUMM-437 Encoding doesn't ignore miliseconds anymore

DataDog · May 4, 2020 · f67b725 · f67b725
1 parent 2364512
commit f67b725
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/Sources/Datadog/Core/Persistence/FileWriter.swift b/Sources/Datadog/Core/Persistence/FileWriter.swift
@@ -20,7 +20,19 @@ internal final class FileWriter {
         self.orchestrator = orchestrator
         self.queue = queue
         self.jsonEncoder = JSONEncoder()
-        jsonEncoder.dateEncodingStrategy = .iso8601
+
+        let iso8601Formatter: DateFormatter = {
+            // TODO: RUMM-437 Find a way to test encoded values
+            // Taken from https://useyourloaf.com/blog/swift-codable-with-custom-dates/
+            let formatter = DateFormatter()
+            formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS"
+            formatter.calendar = Calendar(identifier: .iso8601)
+            formatter.timeZone = TimeZone(secondsFromGMT: 0)
+            formatter.locale = Locale(identifier: "en_US_POSIX")
+            return formatter
+        }()
+        jsonEncoder.dateEncodingStrategy = .formatted(iso8601Formatter)
+
         if #available(iOS 13.0, OSX 10.15, *) {
             jsonEncoder.outputFormatting = [.withoutEscapingSlashes]
         }