chore: Update dependencies and prepare code for Scala 3.4+

voidcontext · voidcontext · commit 996266f060a5 · 2025-12-01T10:37:26.000Z
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.9.3
+version = 3.10.2
 align = some
 align {
   arrowEnumeratorGenerator = false
diff --git a/build.sbt b/build.sbt
@@ -61,21 +61,32 @@ ThisBuild / credentials ++= (
 val common = Seq(
   Test / fork := true,
   // The key is ised by sbt-git, despite the misleading lint warning, hence the Invisible Keyrank
-  git.useGitDescribe.withRank(KeyRanks.Invisible) := true,
+  git.useGitDescribe.withRank(KeyRanks.Invisible) := true,  
+  usePgpKeyHex("E71D99CFF3D96821F3FB612490019D40886E2FB3"),
   publishMavenStyle := true,
-  libraryDependencies ++= Seq(
-      compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
-      compilerPlugin("org.typelevel" % "kind-projector" % "0.13.4" cross CrossVersion.full)
-    ).filterNot(_ => scalaVersion.value.startsWith("3.")),
+  libraryDependencies ++= {
+    CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, 13)) => Seq(
+        compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
+        compilerPlugin("org.typelevel" % "kind-projector" % "0.13.4" cross CrossVersion.full),
+      )
+      case _             => Seq.empty
+    }
+  },
+  scalacOptions ++= {
+    CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, 13)) => Seq("-Xsource:3")
+      case _             => Seq.empty
+    }
+  },
   libraryDependencies ++= Seq(
     "org.typelevel" %% "cats-core" % "2.13.0",
-    "org.typelevel" %% "cats-effect" % "3.5.7",
-    "org.scalameta" %% "munit" % "0.7.29" % Test,
-    "org.scalacheck" %% "scalacheck" % "1.18.1" % Test,
-    "org.typelevel" %% "munit-cats-effect-3" % "1.0.7" % Test,
-    "org.typelevel" %% "scalacheck-effect-munit" % "1.0.4" % Test
+    "org.typelevel" %% "cats-effect" % "3.6.3",
+    "org.scalameta" %% "munit" % "1.2.1" % Test,
+    "org.scalacheck" %% "scalacheck" % "1.19.0" % Test,
+    "org.typelevel" %% "munit-cats-effect" % "2.1.0" % Test,
+    "org.typelevel" %% "scalacheck-effect-munit" % "2.1.0-RC1" % Test
   ),
-  usePgpKeyHex("E71D99CFF3D96821F3FB612490019D40886E2FB3")
 )
 
 lazy val metricsCommon = projectMatrix
@@ -84,14 +95,15 @@ lazy val metricsCommon = projectMatrix
   .enablePlugins(GitVersioning)
   .settings(common :+ (name := "natchez-extras-metrics"))
 
-val log4catsVersion = "2.7.0"
-val natchezVersion = "0.3.7"
-val http4sMilestoneVersion = "1.0.0-M44"
-val http4sStableVersion = "0.23.30"
-val circeVersion = "0.14.10"
-val slf4jVersion = "1.7.36"
-val fs2Version = "3.11.0"
-val doobieVersion = "1.0.0-RC8"
+val log4catsVersion = "2.7.1"
+val kittensVersion = "3.5.0"
+val natchezVersion = "0.3.8"
+val http4sMilestoneVersion = "1.0.0-M46"
+val http4sStableVersion = "0.23.33"
+val circeVersion = "0.14.15"
+val slf4jVersion = "2.0.17"
+val fs2Version = "3.12.2"
+val doobieVersion = "1.0.0-RC11"
 val doobieLegacyVersion = "1.0.0-RC2"
 
 lazy val natchezDatadog = projectMatrix
@@ -139,10 +151,10 @@ lazy val natchezSlf4j = projectMatrix
   .settings(common :+ (name := "natchez-extras-slf4j"))
   .settings(
     libraryDependencies ++= Seq(
-        "org.tpolecat" %% "natchez-core" % natchezVersion,
-        "org.slf4j" % "slf4j-api" % slf4jVersion,
-        "uk.org.lidalia" % "slf4j-test" % "1.2.0" % Test
-      )
+      "org.tpolecat" %% "natchez-core" % natchezVersion,
+      "org.slf4j" % "slf4j-api" % slf4jVersion,
+      "com.github.valfirst" % "slf4j-test" % "3.0.3" % Test
+    )
   )
 
 lazy val natchezHttp4s = projectMatrix
@@ -209,7 +221,7 @@ lazy val natchezFs2 = projectMatrix
   .settings(common :+ (name := "natchez-extras-fs2"))
   .settings(
     libraryDependencies ++= Seq(
-      "org.typelevel" %% "kittens" % "3.5.0",
+      "org.typelevel" %% "kittens" % kittensVersion,
       "org.tpolecat" %% "natchez-core" % natchezVersion,
       "co.fs2" %% "fs2-core" % fs2Version
     )
diff --git a/natchez-ce3/src/main/scala/com/ovoenergy/natchez/extras/combine/ce3/IOLocalTrace.scala b/natchez-ce3/src/main/scala/com/ovoenergy/natchez/extras/combine/ce3/IOLocalTrace.scala
@@ -13,7 +13,7 @@ class IOLocalTrace(private val local: IOLocal[Span[IO]]) extends Trace[IO] {
     local.get.flatMap(_.kernel)
 
   override def put(fields: (String, TraceValue)*): IO[Unit] =
-    local.get.flatMap(_.put(fields: _*))
+    local.get.flatMap(_.put(fields *))
 
   private def scope[G](t: Span[IO])(f: IO[G]): IO[G] =
     MonadCancel[IO, Throwable].bracket(local.getAndSet(t))(_ => f)(local.set)
@@ -32,9 +32,9 @@ class IOLocalTrace(private val local: IOLocal[Span[IO]]) extends Trace[IO] {
     local.get.flatMap(_.traceUri)
 
   override def attachError(err: Throwable, fields: (String, TraceValue)*): IO[Unit] =
-    local.get.flatMap(_.attachError(err, fields: _*))
+    local.get.flatMap(_.attachError(err, fields *))
   override def log(event: String): IO[Unit] = local.get.flatMap(_.log(event))
-  override def log(fields: (String, TraceValue)*): IO[Unit] = local.get.flatMap(_.log(fields: _*))
+  override def log(fields: (String, TraceValue)*): IO[Unit] = local.get.flatMap(_.log(fields *))
   override def spanR(name: String, options: Span.Options): Resource[IO, IO ~> IO] =
     for {
       parent <- Resource.eval(local.get)
diff --git a/natchez-ce3/src/test/scala/com/ovoenergy/natchez/extras/combine/ce3/IOLocalEntrypointTest.scala b/natchez-ce3/src/test/scala/com/ovoenergy/natchez/extras/combine/ce3/IOLocalEntrypointTest.scala
@@ -59,7 +59,7 @@ class IOLocalEntrypointTest extends CatsEffectSuite {
     local.get.assertEquals(rootSpan) >>
     spanR.use(span =>
       IO(span).assertEquals(childSpan) >>
-      local.get.assertEquals(childSpan)
+        local.get.assertEquals(childSpan)
     ) >>
     local.get.assertEquals(rootSpan)
   }
diff --git a/natchez-extras-combine/src/main/scala/com/ovoenergy/natchez/extras/combine/Combine.scala b/natchez-extras-combine/src/main/scala/com/ovoenergy/natchez/extras/combine/Combine.scala
@@ -20,7 +20,7 @@ object Combine {
         (s1.kernel, s2.kernel).mapN { case (k1, k2) => Kernel(k1.toHeaders ++ k2.toHeaders) }
 
       def put(fields: (String, TraceValue)*): F[Unit] =
-        (s1.put(fields: _*), s2.put(fields: _*)).tupled.as(())
+        (s1.put(fields *), s2.put(fields *)).tupled.as(())
 
       def traceId: F[Option[String]] =
         OptionT(s1.traceId).orElseF(s2.traceId).value
@@ -32,11 +32,11 @@ object Combine {
         OptionT(s1.traceUri).orElseF(s2.traceUri).value
 
       def attachError(err: Throwable, fields: (String, TraceValue)*): F[Unit] =
-        (s1.attachError(err, fields: _*), s2.attachError(err, fields: _*)).tupled.as(())
+        (s1.attachError(err, fields *), s2.attachError(err, fields *)).tupled.as(())
 
       def log(event: String): F[Unit] = (s1.log(event), s2.log(event)).tupled.as(())
 
-      def log(fields: (String, TraceValue)*): F[Unit] = (s1.log(fields: _*), s2.log(fields: _*)).tupled.as(())
+      def log(fields: (String, TraceValue)*): F[Unit] = (s1.log(fields *), s2.log(fields *)).tupled.as(())
 
       def span(name: String, options: Span.Options): Resource[F, Span[F]] =
         (s1.span(name, options), s2.span(name, options)).mapN[Span[F]](combineSpan[F])
diff --git a/natchez-extras-datadog/src/main/scala/com/ovoenergy/natchez/extras/datadog/DatadogSpan.scala b/natchez-extras-datadog/src/main/scala/com/ovoenergy/natchez/extras/datadog/DatadogSpan.scala
@@ -59,11 +59,11 @@ case class DatadogSpan[F[_]: Async](
     Monad[F].pure(None)
 
   override def attachError(err: Throwable, fields: (String, TraceValue)*): F[Unit] =
-    put(Tags.error(true) :: fields.toList: _*)
+    put((Tags.error(true) :: fields.toList) *)
 
   override def log(event: String): F[Unit] = put("event" -> TraceValue.StringValue(event))
 
-  override def log(fields: (String, TraceValue)*): F[Unit] = put(fields: _*)
+  override def log(fields: (String, TraceValue)*): F[Unit] = put(fields *)
 }
 
 object DatadogSpan {
diff --git a/natchez-extras-datadog/src/test/scala/com/ovoenergy/natchez/extras/datadog/DatadogTest.scala b/natchez-extras-datadog/src/test/scala/com/ovoenergy/natchez/extras/datadog/DatadogTest.scala
@@ -53,8 +53,8 @@ class DatadogTest extends CatsEffectSuite {
     val test: EntryPoint[IO] => IO[Unit] =
       ep =>
         ep.root("first").use(_ => IO.unit) >>
-        IO.sleep(1.second) >>
-        ep.root("second").use(_ => IO.unit)
+          IO.sleep(1.second) >>
+          ep.root("second").use(_ => IO.unit)
 
     assertIO(
       returns = 2,
diff --git a/natchez-extras-datadog/src/test/scala/com/ovoenergy/natchez/extras/datadog/TestClient.scala b/natchez-extras-datadog/src/test/scala/com/ovoenergy/natchez/extras/datadog/TestClient.scala
@@ -21,20 +21,19 @@ object TestClient {
     (
       Ref.of[F, List[Request[F]]](List.empty),
       Queue.unbounded[F, F[Response[F]]]
-    ).mapN {
-      case (reqs, resps) =>
-        new TestClient[F] {
-          def requests: F[List[Request[F]]] =
-            reqs.get
-          def respondWith(r: F[Response[F]]): F[Unit] =
-            resps.offer(r)
-          def client: Client[F] =
-            Client { r =>
-              Resource.eval(
-                reqs.update(_ :+ r) >>
+    ).mapN { case (reqs, resps) =>
+      new TestClient[F] {
+        def requests: F[List[Request[F]]] =
+          reqs.get
+        def respondWith(r: F[Response[F]]): F[Unit] =
+          resps.offer(r)
+        def client: Client[F] =
+          Client { r =>
+            Resource.eval(
+              reqs.update(_ :+ r) >>
                 resps.tryTake.flatMap(r => r.getOrElse(Monad[F].pure(Response[F]())))
-              )
-            }
-        }
+            )
+          }
+      }
     }
 }
diff --git a/natchez-extras-dogstatsd/src/main/scala/com/ovoenergy/natchez/extras/dogstatsd/Dogstatsd.scala b/natchez-extras-dogstatsd/src/main/scala/com/ovoenergy/natchez/extras/dogstatsd/Dogstatsd.scala
@@ -117,7 +117,7 @@ object Dogstatsd {
   /**
    * Create an instance of Metrics that uses a UDP socket to communicate with Datadog.
    */
-  def apply[F[_]: Network](config: Config): Resource[F, Metrics[F] with Events[F]] = {
+  def apply[F[_]: Network](config: Config): Resource[F, Metrics[F] & Events[F]] = {
     Network[F].openDatagramSocket().map { sock =>
       new Metrics[F] with Events[F] {
         def counter(m: Metric)(value: Long): F[Unit] =
diff --git a/natchez-extras-doobie-legacy/src/main/scala/com/ovoenergy/natchez/extras/doobie/TracedTransactor.scala b/natchez-extras-doobie-legacy/src/main/scala/com/ovoenergy/natchez/extras/doobie/TracedTransactor.scala
@@ -20,7 +20,7 @@ object TracedTransactor {
     transactor: Transactor[F]
   ): Transactor[Traced[F, *]] = {
     val kleisliTransactor = transactor
-      .mapK(Kleisli.liftK[F, Span[F]])(implicitly, Async.asyncForKleisli(implicitly))
+      .mapK(Kleisli.liftK[F, Span[F]])(using implicitly, Async.asyncForKleisli(implicitly))
     trace(ServiceAndResource(s"$service-db", DefaultResourceName), kleisliTransactor)
   }
 
diff --git a/natchez-extras-doobie-legacy/src/test/scala/com/ovoenergy/natchez/extras/doobie/TracedTransactorTest.scala b/natchez-extras-doobie-legacy/src/test/scala/com/ovoenergy/natchez/extras/doobie/TracedTransactorTest.scala
@@ -35,15 +35,17 @@ class TracedTransactorTest extends CatsEffectSuite {
           IO.pure(None)
         def traceUri: IO[Option[URI]] =
           IO.pure(None)
-        def attachError(err: Throwable, fields: (String, TraceValue)*): IO[Unit] =
-          put(Tags.error(true) :: fields.toList: _*)
+        def attachError(err: Throwable, fields: (String, TraceValue)*): IO[Unit] = {
+          val tags = Tags.error(true) :: fields.toList
+          put(tags *)
+        }
         def log(event: String): IO[Unit] = put("event" -> TraceValue.StringValue(event))
-        def log(fields: (String, TraceValue)*): IO[Unit] = put(fields: _*)
+        def log(fields: (String, TraceValue)*): IO[Unit] = put(fields *)
       }
       a.run(spanMock).attempt.flatMap(_ => sps.get)
     }
 
-  val database: SyncIO[FunFixture[Transactor[Traced[IO, *]]]] = ResourceFixture(
+  val database: SyncIO[FunFixture[Transactor[Traced[IO, *]]]] = ResourceFunFixture(
     newH2Transactor[IO]("jdbc:h2:mem:test", "foo", "bar", global).map(TracedTransactor("test", _))
   )
 
diff --git a/natchez-extras-doobie/src/test/scala/com/ovoenergy/natchez/extras/doobie/TracedTransactorTest.scala b/natchez-extras-doobie/src/test/scala/com/ovoenergy/natchez/extras/doobie/TracedTransactorTest.scala
@@ -36,14 +36,14 @@ class TracedTransactorTest extends CatsEffectSuite {
         def traceUri: IO[Option[URI]] =
           IO.pure(None)
         def attachError(err: Throwable, fields: (String, TraceValue)*): IO[Unit] =
-          put(Tags.error(true) :: fields.toList: _*)
+          put((Tags.error(true) :: fields.toList) *)
         def log(event: String): IO[Unit] = put("event" -> TraceValue.StringValue(event))
-        def log(fields: (String, TraceValue)*): IO[Unit] = put(fields: _*)
+        def log(fields: (String, TraceValue)*): IO[Unit] = put(fields *)
       }
       a.run(spanMock).attempt.flatMap(_ => sps.get)
     }
 
-  val database: SyncIO[FunFixture[Transactor[Traced[IO, *]]]] = ResourceFixture(
+  val database: SyncIO[FunFixture[Transactor[Traced[IO, *]]]] = ResourceFunFixture(
     newH2Transactor[IO]("jdbc:h2:mem:test", "foo", "bar", global).map(TracedTransactor("test", _))
   )
 
diff --git a/natchez-extras-fs2/src/main/scala/com/ovoenergy/natchez/extras/fs2/AllocatedSpan.scala b/natchez-extras-fs2/src/main/scala/com/ovoenergy/natchez/extras/fs2/AllocatedSpan.scala
@@ -45,7 +45,7 @@ object AllocatedSpan {
       def kernel: F[Kernel] =
         spn.kernel
       def put(fields: (String, TraceValue)*): F[Unit] =
-        spn.put(fields: _*)
+        spn.put(fields *)
       def span(name: String, options: Span.Options): Resource[F, Span[F]] =
         spn.span(name, options)
       def addSubmitTask(task: F[Unit]): AllocatedSpan[F] =
@@ -59,9 +59,9 @@ object AllocatedSpan {
       def traceUri: F[Option[URI]] =
         spn.traceUri
       def attachError(err: Throwable, fields: (String, TraceValue)*): F[Unit] =
-        put(Tags.error(true) :: fields.toList: _*)
+        put((Tags.error(true) :: fields.toList) *)
       def log(event: String): F[Unit] = put("event" -> TraceValue.StringValue(event))
-      def log(fields: (String, TraceValue)*): F[Unit] = put(fields: _*)
+      def log(fields: (String, TraceValue)*): F[Unit] = put(fields *)
     }
 
   /**
diff --git a/natchez-extras-fs2/src/test/scala/com/ovoenergy/natchez/extras/fs2/AllocatedSpanTest.scala b/natchez-extras-fs2/src/test/scala/com/ovoenergy/natchez/extras/fs2/AllocatedSpanTest.scala
@@ -12,7 +12,7 @@ import scala.concurrent.duration._
 class AllocatedSpanTest extends CatsEffectSuite {
 
   val testEp: SyncIO[FunFixture[TestEntryPoint[IO]]] =
-    ResourceFixture(Resource.eval(TestEntryPoint.apply[IO]))
+    ResourceFunFixture(Resource.eval(TestEntryPoint.apply[IO]))
 
   testEp.test("should submit the span even if a pre-submit task fails") { ep =>
     val stream: IO[Unit] =
diff --git a/natchez-extras-http4s/src/main/scala/com/ovoenergy/natchez/extras/http4s/client/TracedClient.scala b/natchez-extras-http4s/src/main/scala/com/ovoenergy/natchez/extras/http4s/client/TracedClient.scala
@@ -37,13 +37,13 @@ object TracedClient {
             for {
               span    <- Kleisli.ask[F, Span[F]]
               headers <- trace(span.kernel.map(_.toHeaders.map { case (k, v) => k.toString -> v }.toSeq))
-              withHeader = req.putHeaders(headers.map(keyValuesToRaw): _*).mapK(dropTracing(span))
+              withHeader = req.putHeaders(headers.map(keyValuesToRaw) *).mapK(dropTracing(span))
               reqTags  <- trace(config.request.value.run(req.mapK(dropTracing(span))))
-              _        <- trace(span.put(reqTags.toSeq: _*))
+              _        <- trace(span.put(reqTags.toSeq *))
               resTuple <- client.run(withHeader).mapK(trace[F]).map(_.mapK(trace[F])).allocated
               (resp, rel) = resTuple
               respTags <- trace(config.response.value.run(resp.mapK(dropTracing(span))))
-              _        <- trace(span.put(respTags.toSeq: _*))
+              _        <- trace(span.put(respTags.toSeq *))
             } yield resp -> rel
           }
         )
diff --git a/natchez-extras-http4s/src/main/scala/com/ovoenergy/natchez/extras/http4s/server/TraceMiddleware.scala b/natchez-extras-http4s/src/main/scala/com/ovoenergy/natchez/extras/http4s/server/TraceMiddleware.scala
@@ -43,11 +43,11 @@ object TraceMiddleware {
         .use { span =>
           for {
             reqTags    <- configuration.request.value.run(r)
-            _          <- span.put(reqTags.toSeq: _*)
+            _          <- span.put(reqTags.toSeq *)
             tracedResp <- service.run(traceRequest).run(span)
             response = tracedResp.mapK(runTracing(span))
             respTags <- configuration.response.value.run(response)
-            _        <- span.put(respTags.toSeq: _*)
+            _        <- span.put(respTags.toSeq *)
           } yield response
         }
     }
diff --git a/natchez-extras-http4s/src/test/scala/com/ovoenergy/natchez/extras/http4s/server/TraceMiddlewareTest.scala b/natchez-extras-http4s/src/test/scala/com/ovoenergy/natchez/extras/http4s/server/TraceMiddlewareTest.scala
@@ -55,7 +55,7 @@ class TraceMiddlewareTest extends CatsEffectSuite {
     )
 
     val requestHeaders = Headers(
-      Authorization(BasicCredentials("secret")),
+      Authorization(BasicCredentials.fromString("secret").get),
       Cookie(RequestCookie("secret", "secret")),
       `Content-Type`(MediaType.`text/event-stream`)
     )
@@ -68,14 +68,14 @@ class TraceMiddlewareTest extends CatsEffectSuite {
         "http.response.headers" -> "",
         "http.status_code" -> 200,
         "http.request.headers" ->
-        """|Authorization: <REDACTED>
-           |Cookie: <REDACTED>
-           |Content-Type: text/event-stream
-           |""".stripMargin,
+          """|Authorization: <REDACTED>
+             |Cookie: <REDACTED>
+             |Content-Type: text/event-stream
+             |""".stripMargin,
         "http.response.headers" ->
-        """|Set-Cookie: <REDACTED>
-           |X-Polite: come back soon!
-           |""".stripMargin
+          """|Set-Cookie: <REDACTED>
+             |X-Polite: come back soon!
+             |""".stripMargin
       ),
       obtained = for {
         entryPoint <- TestEntryPoint[IO]
diff --git a/natchez-extras-slf4j/src/main/scala/com/ovoenergy/natchez/extras/slf4j/Slf4jSpan.scala b/natchez-extras-slf4j/src/main/scala/com/ovoenergy/natchez/extras/slf4j/Slf4jSpan.scala
@@ -41,11 +41,11 @@ case class Slf4jSpan[F[_]: Sync](
     Sync[F].pure(None)
 
   override def attachError(err: Throwable, fields: (String, TraceValue)*): F[Unit] =
-    put(Tags.error(true) :: fields.toList: _*)
+    put((Tags.error(true) :: fields.toList) *)
 
   override def log(event: String): F[Unit] = put("event" -> TraceValue.StringValue(event))
 
-  override def log(fields: (String, TraceValue)*): F[Unit] = put(fields: _*)
+  override def log(fields: (String, TraceValue)*): F[Unit] = put(fields *)
 }
 
 object Slf4jSpan {
diff --git a/natchez-extras-slf4j/src/test/scala/com/ovoenergy/natchez/extras/slf4j/Slf4jSpanTest.scala b/natchez-extras-slf4j/src/test/scala/com/ovoenergy/natchez/extras/slf4j/Slf4jSpanTest.scala
@@ -4,7 +4,7 @@ import cats.effect.{Concurrent, IO}
 import munit.CatsEffectSuite
 import natchez.Kernel
 import org.typelevel.ci.CIStringSyntax
-import uk.org.lidalia.slf4jtest.{LoggingEvent, TestLoggerFactory}
+import com.github.valfirst.slf4jtest.{LoggingEvent, TestLoggerFactory}
 
 import scala.concurrent.duration.DurationInt
 import scala.jdk.CollectionConverters._
diff --git a/natchez-extras-testkit/src/main/scala/com/ovoenergy/natchez/extras/testkit/TestEntryPoint.scala b/natchez-extras-testkit/src/main/scala/com/ovoenergy/natchez/extras/testkit/TestEntryPoint.scala
@@ -46,10 +46,10 @@ object TestEntryPoint {
               override def spanId: F[Option[String]] = F.pure(None)
               override def traceUri: F[Option[URI]] = F.pure(None)
               override def kernel: F[Kernel] = F.pure(kern)
-              override def log(fields: (String, TraceValue)*): F[Unit] = put(fields: _*)
+              override def log(fields: (String, TraceValue)*): F[Unit] = put(fields *)
               override def log(event: String): F[Unit] = log("event" -> TraceValue.StringValue(event))
               override def attachError(err: Throwable, fields: (String, TraceValue)*): F[Unit] =
-                put(Tags.error(true) :: fields.toList: _*)
+                put((Tags.error(true) :: fields.toList) *)
               override def span(name: String, options: Span.Options): Resource[F, Span[F]] = span(name)
               private def span(newName: String): Resource[F, Span[F]] = makeSpan(newName, Some(name), kern)
             }
diff --git a/project/plugins.sbt b/project/plugins.sbt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = 3.9.3`
	`1`	`+version = 3.10.2`
`2`	`2`	`align = some`
`3`	`3`	`align {`
`4`	`4`	`arrowEnumeratorGenerator = false`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class IOLocalEntrypointTest extends CatsEffectSuite {`
`59`	`59`	`local.get.assertEquals(rootSpan) >>`
`60`	`60`	`spanR.use(span =>`
`61`	`61`	`IO(span).assertEquals(childSpan) >>`
`62`		`- local.get.assertEquals(childSpan)`
	`62`	`+ local.get.assertEquals(childSpan)`
`63`	`63`	`) >>`
`64`	`64`	`local.get.assertEquals(rootSpan)`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ object TracedTransactor {`
`20`	`20`	`transactor: Transactor[F]`
`21`	`21`	`): Transactor[Traced[F, *]] = {`
`22`	`22`	`val kleisliTransactor = transactor`
`23`		`- .mapK(Kleisli.liftK[F, Span[F]])(implicitly, Async.asyncForKleisli(implicitly))`
	`23`	`+ .mapK(Kleisli.liftK[F, Span[F]])(using implicitly, Async.asyncForKleisli(implicitly))`
`24`	`24`	`trace(ServiceAndResource(s"$service-db", DefaultResourceName), kleisliTransactor)`
`25`	`25`	`}`
`26`	`26`