Bring back Odin module

.github/workflows/ci.yml

@@ -94,11 +94,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.1')
-        run: mkdir -p modules/mtl/native/target modules/lightstep-grpc/target modules/log/jvm/target modules/noop/jvm/target modules/mock/target modules/examples/target target modules/log/native/target .js/target modules/core/native/target modules/docs/target modules/lightstep-http/target modules/datadog/target modules/xray/jvm/target modules/opentracing/target modules/noop/native/target modules/xray/js/target modules/core/js/target modules/noop/js/target modules/core/jvm/target .jvm/target modules/jaeger/target .native/target modules/opencensus/target modules/honeycomb/target modules/log/js/target modules/mtl/js/target modules/newrelic/target modules/mtl/jvm/target modules/lightstep/target project/target
+        run: mkdir -p modules/mtl/native/target modules/lightstep-grpc/target modules/log/jvm/target modules/noop/jvm/target modules/mock/target modules/examples/target target modules/log/native/target .js/target modules/core/native/target modules/docs/target modules/lightstep-http/target modules/datadog/target modules/xray/jvm/target modules/opentracing/target modules/noop/native/target modules/xray/js/target modules/core/js/target modules/noop/js/target modules/core/jvm/target .jvm/target modules/jaeger/target .native/target modules/opencensus/target modules/honeycomb/target modules/log/js/target modules/mtl/js/target modules/newrelic/target modules/log-odin/target modules/mtl/jvm/target modules/lightstep/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.1')
-        run: tar cf targets.tar modules/mtl/native/target modules/lightstep-grpc/target modules/log/jvm/target modules/noop/jvm/target modules/mock/target modules/examples/target target modules/log/native/target .js/target modules/core/native/target modules/docs/target modules/lightstep-http/target modules/datadog/target modules/xray/jvm/target modules/opentracing/target modules/noop/native/target modules/xray/js/target modules/core/js/target modules/noop/js/target modules/core/jvm/target .jvm/target modules/jaeger/target .native/target modules/opencensus/target modules/honeycomb/target modules/log/js/target modules/mtl/js/target modules/newrelic/target modules/mtl/jvm/target modules/lightstep/target project/target
+        run: tar cf targets.tar modules/mtl/native/target modules/lightstep-grpc/target modules/log/jvm/target modules/noop/jvm/target modules/mock/target modules/examples/target target modules/log/native/target .js/target modules/core/native/target modules/docs/target modules/lightstep-http/target modules/datadog/target modules/xray/jvm/target modules/opentracing/target modules/noop/native/target modules/xray/js/target modules/core/js/target modules/noop/js/target modules/core/jvm/target .jvm/target modules/jaeger/target .native/target modules/opencensus/target modules/honeycomb/target modules/log/js/target modules/mtl/js/target modules/newrelic/target modules/log-odin/target modules/mtl/jvm/target modules/lightstep/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/series/0.1')

build.sbt

@@ -73,6 +73,7 @@ lazy val root = tlCrossRootProject.aggregate(
   mtl,
   noop,
   xray,
+  logOdin,
   examples
 )
 
@@ -316,20 +317,21 @@ lazy val examples = project
     )
   )
 
-// lazy val logOdin = project
-//   .in(file("modules/log-odin"))
-//   .dependsOn(core.jvm)
-//   .enablePlugins(AutomateHeaderPlugin)
-// //   .settings(
-//     publish / skip := scalaVersion.value.startsWith("3."),
-//     name        := "natchez-log-odin",
-//     description := "Logging bindings for Natchez, using Odin.",
-//     libraryDependencies ++= Seq(
-//       "io.circe"              %% "circe-core" % "0.14.0",
-//       "com.github.valskalla"  %% "odin-core"  % "0.9.1",
-//       "com.github.valskalla"  %% "odin-json"  % "0.9.1"
-//     ).filterNot(_ => scalaVersion.value.startsWith("3."))
-//   )
+lazy val logOdin = project
+  .in(file("modules/log-odin"))
+  .dependsOn(core.jvm)
+  .enablePlugins(AutomateHeaderPlugin)
+  .settings(commonSettings)
+  .settings(
+    name        := "natchez-log-odin",
+    description := "Logging bindings for Natchez, using Odin.",
+    tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "0.1.7").toMap,
+    libraryDependencies ++= Seq(
+      "io.circe"              %% "circe-core" % "0.14.1",
+      "com.github.valskalla"  %% "odin-core"  % "0.13.0",
+      "com.github.valskalla"  %% "odin-json"  % "0.13.0"
+    )
+  )
 
 lazy val docs = project
   .in(file("modules/docs"))

modules/log-odin/src/main/scala-2/LogSpan.scala → modules/log-odin/src/main/scala/LogSpan.scala

@@ -89,7 +89,7 @@ private[logodin] final case class LogSpan[F[_]: Sync: Logger](
           exitCase match {
             case Succeeded           => List("exit.case" -> "completed".asJson)
             case Canceled            => List("exit.case" -> "canceled".asJson)
-            case Errored(ex: Fields) => exitFields(ex) ++ ex.fields.toList.map(_.map(_.asJson))
+            case Errored(ex: Fields) => exitFields(ex) ++ ex.fields.toList.map(_.fmap(_.asJson))
             case Errored(ex)         => exitFields(ex)
           }
         } ++ fs ++ List("children" -> cs.reverse.map(Json.fromJsonObject).asJson)
@@ -213,4 +213,4 @@ private[logodin] object LogSpan {
     fromKernel(service, name, kernel).recoverWith {
       case _: NoSuchElementException => root(service, name)
     }
-}
+}