From 1a9c7dbe41a807e4e9de07aff900b595b169aa77 Mon Sep 17 00:00:00 2001 From: iq3 Date: Tue, 21 Jul 2020 12:43:32 +0900 Subject: [PATCH 1/2] Added status to property. --- Sources/DataDogLog/DataDogLogHandler.swift | 2 +- Sources/DataDogLog/Log.swift | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Sources/DataDogLog/DataDogLogHandler.swift b/Sources/DataDogLog/DataDogLogHandler.swift index 2a2d446..5cd620f 100644 --- a/Sources/DataDogLog/DataDogLogHandler.swift +++ b/Sources/DataDogLog/DataDogLogHandler.swift @@ -24,7 +24,7 @@ public struct DataDogLogHandler: LogHandler { let logMetadata = metadata.map { $0.merging(callsite) { $1 } } ?? callsite let mergedMetadata = self.metadata.merging(logMetadata) { $1 } let ddMessage = Message(level: level, message: "\(message)") - let log = Log(ddsource: label, ddtags: "\(mergedMetadata.prettified.map { "\($0)" } ?? "")", hostname: self.hostname ?? "", message: "\(ddMessage)") + let log = Log(ddsource: label, ddtags: "\(mergedMetadata.prettified.map { "\($0)" } ?? "")", hostname: self.hostname ?? "", message: "\(ddMessage)", status: "\(level)") session.send(log, key: key) { result in if case .failure(let message) = result { diff --git a/Sources/DataDogLog/Log.swift b/Sources/DataDogLog/Log.swift index ecbbc3b..44e9494 100644 --- a/Sources/DataDogLog/Log.swift +++ b/Sources/DataDogLog/Log.swift @@ -1,10 +1,12 @@ import Logging +/// https://docs.datadoghq.com/logs/log_collection/?tab=http#reserved-attributes struct Log: Encodable { let ddsource: String let ddtags: String let hostname: String let message: String + let status: String } struct Message: CustomStringConvertible { From 94b58ad75edd66e7424acfb2abf208247575201d Mon Sep 17 00:00:00 2001 From: iq3 Date: Tue, 21 Jul 2020 13:12:19 +0900 Subject: [PATCH 2/2] Add comment --- Sources/DataDogLog/Log.swift | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Sources/DataDogLog/Log.swift b/Sources/DataDogLog/Log.swift index 44e9494..3499a35 100644 --- a/Sources/DataDogLog/Log.swift +++ b/Sources/DataDogLog/Log.swift @@ -1,11 +1,18 @@ import Logging -/// https://docs.datadoghq.com/logs/log_collection/?tab=http#reserved-attributes +/// Attribute for Datadog Logs +/// +/// See https://docs.datadoghq.com/logs/log_collection/#reserved-attributes struct Log: Encodable { let ddsource: String let ddtags: String let hostname: String let message: String + + /// Log Status + /// + /// Logger.Level.trace will be sorted into Datadog as .debug. + /// See https://docs.datadoghq.com/logs/processing/processors/#log-status-remapper for details. let status: String }