fix LogTree (#794)

* fix LogTree

* Change to LinkedHashMap for consistent field order

modules/logging/structured/src/main/scala/tofu/logging/LogTree.scala

@@ -33,14 +33,14 @@ object LogTree extends LogBuilder[Json] {
   }
   type Top = LogDict
 
-  class LogDict(private val values: mutable.Map[String, LogTree]) extends LogTree {
+  class LogDict(private val values: mutable.LinkedHashMap[String, LogTree]) extends LogTree {
     def add(name: String, tree: LogTree): Eval[Unit] = Eval.always(values.update(name, tree))
     def getList: Eval[List[(String, LogTree)]]       = Eval.always(values.toList)
   }
 
   final case class LogArr(values: Iterable[LogTree]) extends LogTree
 
-  private val newdict = Eval.always(mutable.Map.empty[String, LogTree]).map(new LogDict(_))
+  private val newdict = Eval.always(mutable.LinkedHashMap.empty[String, LogTree]).map(new LogDict(_))
   private val newtree = Eval.always(new Value(NullValue))
 
   val receiver: LogRenderer[LogDict, Value, Output, ValRes] = new LogRenderer[LogDict, Value, Output, ValRes] {
@@ -68,7 +68,7 @@ object LogTree extends LogBuilder[Json] {
         _  <- input.set(LogArr(vs))
       } yield true
     def dict(input: Value)(receive: LogDict => Eval[Unit]): Eval[Boolean]                    =
-      newdict flatMap input.set as true
+      newdict.flatTap(receive).flatMap(input.set).as(true)
   }
 
   def buildJson(buildTree: LogDict => Output): Eval[Json] = newdict flatTap buildTree flatMap (_.json)

modules/logging/structured/src/test/scala/tofu/logging/LogTreeSuite.scala

@@ -0,0 +1,25 @@
+package tofu.logging
+
+import cats.syntax.semigroup._
+import org.scalatest.funsuite.AnyFunSuite
+import tofu.logging.{LogTree, TethysBuilder}
+import tofu.syntax.logRenderer._
+class LogTreeSuite extends AnyFunSuite {
+
+  case class Data(field1: String, field2: Int)
+
+  object Data {
+    implicit object loggable extends DictLoggable[Data] with ToStringLoggable[Data] {
+      def fields[I, V, R, S](a: Data, i: I)(implicit r: LogRenderer[I, V, R, S]): R =
+        i.addString("field1", a.field1) |+|
+          i.addInt("field2", a.field2.toLong)
+    }
+
+  }
+
+  val value = Map("aaaa" -> List(Data("lol", 2), Data("kek", -1)))
+
+  test("LogTree and tethys builder results are consistent") {
+    assert(TethysBuilder(value) === LogTree(value).noSpaces)
+  }
+}