From 37eb608413c52a04f5ad509a9134a6d20365b13f Mon Sep 17 00:00:00 2001
From: Paul Grave <paul.grave@sky.uk>
Date: Fri, 8 Apr 2022 13:45:24 +0100
Subject: [PATCH] fixed: tracing working

---
 .../Monolog/Formatter/ElasticCommonSchemaFormatter.php     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Elastic/Monolog/Formatter/ElasticCommonSchemaFormatter.php b/src/Elastic/Monolog/Formatter/ElasticCommonSchemaFormatter.php
index baf0bd5..3c1d909 100644
--- a/src/Elastic/Monolog/Formatter/ElasticCommonSchemaFormatter.php
+++ b/src/Elastic/Monolog/Formatter/ElasticCommonSchemaFormatter.php
@@ -69,6 +69,10 @@ protected function normalize($data, int $depth = 0)
             return $data->jsonSerialize();
         }
 
+        if ($data instanceof EcsTracing) {
+            return $data->jsonSerialize();
+        }
+
         return parent::normalize($data, $depth);
     }
 
@@ -104,7 +108,8 @@ public function format(array $record): string
 
         // Add Tracing Context
         if (isset($inRecord['context']['tracing']['Elastic\Types\Tracing']) === true) {
-            $outRecord += $inRecord['context']['tracing']['Elastic\Types\Tracing'];
+            $outRecord['trace.id'] = $inRecord['context']['tracing']['Elastic\Types\Tracing']['trace.id'];
+            $outRecord['span.id'] = $inRecord['context']['tracing']['Elastic\Types\Tracing']['span.id'];
             unset($inRecord['context']['tracing']);
         }