From a5860ff293b51ef57adbf7b1394b5d830ea16b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20S=C3=B3jko?= <karolsojko@gmail.com>
Date: Mon, 19 Oct 2020 13:27:09 +0200
Subject: [PATCH] fix: add logs and traces correlation for datadog

---
 config/initializers/lograge.rb | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb
index e7cf34513..8d8be8a5f 100644
--- a/config/initializers/lograge.rb
+++ b/config/initializers/lograge.rb
@@ -5,11 +5,19 @@ Rails.application.configure do
   config.lograge.formatter = Lograge::Formatters::Json.new
   config.lograge.ignore_actions = ['HealthCheckController#index']
   config.lograge.custom_options = lambda do |event|
+    correlation = Datadog.tracer.active_correlation
     {
-      :ddsource => ["ruby"],
-      :time => event.time,
-      :params => event.payload[:params],
-      :level => event.payload[:level]
+      dd: {
+        trace_id: correlation.trace_id.to_s,
+        span_id: correlation.span_id.to_s,
+        env: correlation.env.to_s,
+        service: correlation.service.to_s,
+        version: correlation.version.to_s
+      },
+      ddsource: ['ruby'],
+      time: event.time,
+      params: event.payload[:params],
+      level: event.payload[:level]
     }
   end
 end