Skip to content

Commit

Permalink
Merge pull request #310 from typelevel/update/natchez-core-0.3.0
Browse files Browse the repository at this point in the history
Update natchez-core, natchez-xray to 0.3.0
  • Loading branch information
armanbilge authored Jan 18, 2023
2 parents afcd798 + e24e280 commit 440e95c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

name := "feral"

ThisBuild / tlBaseVersion := "0.1"
ThisBuild / tlBaseVersion := "0.2"
ThisBuild / startYear := Some(2021)

ThisBuild / developers := List(
Expand Down Expand Up @@ -60,7 +60,7 @@ val catsEffectVersion = "3.4.5"
val circeVersion = "0.14.3"
val fs2Version = "3.5.0"
val http4sVersion = "0.23.17"
val natchezVersion = "0.1.6"
val natchezVersion = "0.3.0"
val munitVersion = "0.7.29"
val munitCEVersion = "1.0.7"
val scalacheckEffectVersion = "1.0.4"
Expand Down Expand Up @@ -182,8 +182,8 @@ lazy val examples = crossProject(JSPlatform, JVMPlatform)
"org.http4s" %%% "http4s-dsl" % http4sVersion,
"org.http4s" %%% "http4s-ember-client" % http4sVersion,
"org.tpolecat" %%% "natchez-xray" % natchezVersion,
"org.tpolecat" %%% "natchez-http4s" % "0.3.2",
"org.tpolecat" %%% "skunk-core" % "0.3.2"
"org.tpolecat" %%% "natchez-http4s" % "0.5.0",
"org.tpolecat" %%% "skunk-core" % "0.5.0"
)
)
.settings(commonSettings)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package events

import io.circe.Decoder
import natchez.Kernel
import org.typelevel.ci.CIString

final case class Http(method: String)
object Http {
Expand Down Expand Up @@ -52,5 +53,6 @@ object ApiGatewayProxyEventV2 {
"isBase64Encoded"
)(ApiGatewayProxyEventV2.apply)

implicit def kernelSource: KernelSource[ApiGatewayProxyEventV2] = e => Kernel(e.headers)
implicit def kernelSource: KernelSource[ApiGatewayProxyEventV2] =
e => Kernel(e.headers.map { case (name, value) => CIString(name) -> value })
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package events
import io.circe.Decoder
import io.circe.scodec._
import natchez.Kernel
import org.typelevel.ci._
import scodec.bits.ByteVector

import java.time.Instant
Expand Down Expand Up @@ -109,7 +110,9 @@ object SqsRecordAttributes {
))

implicit def kernelSource: KernelSource[SqsRecordAttributes] = a =>
Kernel(a.awsTraceHeader.map("X-Amzn-Trace-Id" -> _).toMap)
Kernel(a.awsTraceHeader.map(`X-Amzn-Trace-Id` -> _).toMap)

private[this] val `X-Amzn-Trace-Id` = ci"X-Amzn-Trace-Id"
}

sealed abstract class SqsMessageAttribute
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.18")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")

0 comments on commit 440e95c

Please sign in to comment.