Add lambda-otel4s module

.github/workflows/ci.yml

@@ -117,11 +117,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p lambda-cloudformation-custom-resource/.js/target lambda-http4s/.jvm/target unidocs/target lambda-http4s/.js/target lambda/js/target scalafix/rules/target lambda/jvm/target sbt-lambda/target google-cloud-http4s/jvm/target lambda-cloudformation-custom-resource/.jvm/target google-cloud-http4s/js/target project/target
+        run: mkdir -p lambda-natchez/jvm/target lambda-natchez/js/target lambda-cloudformation-custom-resource/.js/target lambda-http4s/.jvm/target unidocs/target lambda-http4s/.js/target lambda/js/target scalafix/rules/target lambda/jvm/target lambda-otel4s/jvm/target sbt-lambda/target lambda-otel4s/js/target google-cloud-http4s/jvm/target lambda-cloudformation-custom-resource/.jvm/target google-cloud-http4s/js/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar lambda-cloudformation-custom-resource/.js/target lambda-http4s/.jvm/target unidocs/target lambda-http4s/.js/target lambda/js/target scalafix/rules/target lambda/jvm/target sbt-lambda/target google-cloud-http4s/jvm/target lambda-cloudformation-custom-resource/.jvm/target google-cloud-http4s/js/target project/target
+        run: tar cf targets.tar lambda-natchez/jvm/target lambda-natchez/js/target lambda-cloudformation-custom-resource/.js/target lambda-http4s/.jvm/target unidocs/target lambda-http4s/.js/target lambda/js/target scalafix/rules/target lambda/jvm/target lambda-otel4s/jvm/target sbt-lambda/target lambda-otel4s/js/target google-cloud-http4s/jvm/target lambda-cloudformation-custom-resource/.jvm/target google-cloud-http4s/js/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')

.mergify.yml

@@ -68,6 +68,22 @@ pull_request_rules:
       add:
       - lambda-http4s
       remove: []
+- name: Label lambda-natchez PRs
+  conditions:
+  - files~=^lambda-natchez/
+  actions:
+    label:
+      add:
+      - lambda-natchez
+      remove: []
+- name: Label lambda-otel4s PRs
+  conditions:
+  - files~=^lambda-otel4s/
+  actions:
+    label:
+      add:
+      - lambda-otel4s
+      remove: []
 - name: Label output PRs
   conditions:
   - files~=^scalafix/output/

build.sbt

@@ -18,7 +18,7 @@ import com.typesafe.tools.mima.core._
 
 name := "feral"
 
-ThisBuild / tlBaseVersion := "0.3"
+ThisBuild / tlBaseVersion := "0.4"
 ThisBuild / startYear := Some(2021)
 
 ThisBuild / developers := List(
@@ -64,6 +64,7 @@ val natchezVersion = "0.3.8"
 val munitVersion = "1.2.0"
 val munitCEVersion = "2.1.0"
 val scalacheckEffectVersion = "2.1.0-RC1"
+val otel4sVersion = "0.14.0"
 
 lazy val commonSettings = Seq(
   crossScalaVersions := Seq(Scala3, Scala213)
@@ -75,6 +76,8 @@ lazy val root =
       lambda,
       lambdaHttp4s,
       lambdaCloudFormationCustomResource,
+      lambdaNatchez,
+      lambdaOtel4s,
       googleCloudHttp4s,
       examples,
       unidocs
@@ -95,7 +98,7 @@ lazy val lambda = crossProject(JSPlatform, JVMPlatform)
     name := "feral-lambda",
     libraryDependencies ++= Seq(
       "org.typelevel" %%% "cats-effect" % catsEffectVersion,
-      "org.tpolecat" %%% "natchez-core" % natchezVersion,
+      "org.typelevel" %%% "case-insensitive" % "1.4.0",
       "io.circe" %%% "circe-scodec" % circeVersion,
       "io.circe" %%% "circe-jawn" % circeVersion,
       "com.comcast" %%% "ip4s-core" % "3.7.0",
@@ -181,19 +184,55 @@ lazy val lambdaCloudFormationCustomResource = crossProject(JSPlatform, JVMPlatfo
   .settings(commonSettings)
   .dependsOn(lambda)
 
+lazy val lambdaNatchez = crossProject(JSPlatform, JVMPlatform)
+  .in(file("lambda-natchez"))
+  .settings(
+    name := "feral-lambda-natchez",
+    libraryDependencies ++= Seq(
+      "org.tpolecat" %%% "natchez-core" % natchezVersion,
+      "org.scalameta" %%% "munit-scalacheck" % munitVersion % Test,
+      "org.typelevel" %%% "munit-cats-effect" % munitCEVersion % Test
+    )
+  )
+  .settings(commonSettings)
+  .dependsOn(lambda)
+
+lazy val lambdaOtel4s = crossProject(JSPlatform, JVMPlatform)
+  .in(file("lambda-otel4s"))
+  .settings(
+    name := "feral-lambda-otel4s",
+    libraryDependencies ++= Seq(
+      "org.typelevel" %%% "otel4s-core-trace" % otel4sVersion,
+      "org.typelevel" %%% "otel4s-sdk-trace-testkit" % otel4sVersion % Test,
+      "org.typelevel" %%% "otel4s-semconv-experimental" % otel4sVersion % Test,
+      "org.scalameta" %%% "munit-scalacheck" % munitVersion % Test,
+      "org.typelevel" %%% "munit-cats-effect" % munitCEVersion % Test
+    )
+  )
+  .settings(commonSettings)
+  .dependsOn(lambda)
+
 lazy val examples = crossProject(JSPlatform, JVMPlatform)
   .in(file("examples"))
   .settings(
     libraryDependencies ++= Seq(
       "org.http4s" %%% "http4s-dsl" % http4sVersion,
       "org.http4s" %%% "http4s-ember-client" % http4sVersion,
+      "org.http4s" %%% "http4s-otel4s-middleware-trace-client" % "0.15.0",
       "org.tpolecat" %%% "natchez-xray" % natchezVersion,
       "org.tpolecat" %%% "natchez-http4s" % "0.6.1",
+      "org.tpolecat" %%% "skunk-core" % "0.6.4",
+      "org.tpolecat" %%% "natchez-http4s" % "0.6.1",
       "org.tpolecat" %%% "skunk-core" % "0.6.4"
     )
   )
   .settings(commonSettings)
-  .dependsOn(lambda, lambdaHttp4s, googleCloudHttp4s)
+  .dependsOn(lambda, lambdaHttp4s, lambdaNatchez, lambdaOtel4s, googleCloudHttp4s)
+  .jvmSettings(libraryDependencies ++= Seq(
+    "org.typelevel" %%% "otel4s-oteljava" % otel4sVersion,
+    "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "1.55.0",
+    "com.google.cloud.functions.invoker" % "java-function-invoker" % "1.3.3"
+  ))
   .jsSettings(
     scalaJSUseMainModuleInitializer := true,
     Compile / mainClass := Some("feral.examples.http4sGoogleCloudHandler"),
@@ -224,22 +263,23 @@ lazy val unidocs = project
   )
 
 lazy val scalafix = tlScalafixProject
+  .in(file("scalafix"))
   .rulesSettings(
     name := "feral-scalafix",
     startYear := Some(2023),
     crossScalaVersions := Seq(Scala212)
   )
   .inputSettings(
     crossScalaVersions := Seq(Scala213),
-    libraryDependencies += "org.typelevel" %%% "feral-lambda-http4s" % "0.2.4",
+    libraryDependencies += "org.typelevel" %%% "feral-lambda" % "0.3.1",
     headerSources / excludeFilter := AllPassFilter
   )
   .inputConfigure(_.disablePlugins(ScalafixPlugin))
   .outputSettings(
     crossScalaVersions := Seq(Scala213),
     headerSources / excludeFilter := AllPassFilter
   )
-  .outputConfigure(_.dependsOn(lambdaHttp4s.jvm).disablePlugins(ScalafixPlugin))
+  .outputConfigure(_.dependsOn(lambdaNatchez.jvm).disablePlugins(ScalafixPlugin))
   .testsSettings(
     startYear := Some(2023),
     crossScalaVersions := Seq(Scala212)

examples/jvm/src/main/scala/feral/examples/SqsOtelJavaExample.scala

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2021 Typelevel
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package feral.examples
+
+import cats.Monad
+import cats.effect.IO
+import cats.syntax.all._
+import feral.lambda.INothing
+import feral.lambda.IOLambda
+import feral.lambda.Invocation
+import feral.lambda.events.SqsEvent
+import feral.lambda.events.SqsRecord
+import feral.lambda.otel4s._
+import org.http4s.client.Client
+import org.http4s.ember.client.EmberClientBuilder
+import org.http4s.otel4s.middleware.trace.client.ClientMiddleware
+import org.http4s.otel4s.middleware.trace.client.ClientSpanDataProvider
+import org.http4s.otel4s.middleware.trace.client.UriRedactor
+import org.typelevel.otel4s.oteljava.OtelJava
+import org.typelevel.otel4s.trace.Tracer
+import org.typelevel.otel4s.trace.TracerProvider
+import org.typelevel.scalaccompat.annotation.unused
+
+object SqsOtelExample extends IOLambda[SqsEvent, INothing] {
+
+  def handler =
+    OtelJava
+      .autoConfigured[IO]()
+      .evalMap { otel =>
+        implicit val tp: TracerProvider[IO] = otel.tracerProvider
+        val otelClientRedactor = new UriRedactor.OnlyRedactUserInfo {}
+        val spanDataProvider = ClientSpanDataProvider.openTelemetry(otelClientRedactor)
+        val tracer = tp.get("com.example")
+        val middleware = ClientMiddleware.builder[IO](spanDataProvider).build
+        (middleware, tracer).tupled
+      }
+      .flatMap {
+        case (middleware, tracer) =>
+          implicit val t: Tracer[IO] = tracer
+
+          for {
+            client <- EmberClientBuilder.default[IO].build.map(middleware.wrapClient)
+          } yield { implicit inv: Invocation[IO, SqsEvent] =>
+            TracedHandler[IO, SqsEvent, INothing](
+              handleEvent[IO](client)
+            )
+          }
+      }
+
+  def handleEvent[F[_]: Monad: Tracer](
+      @unused client: Client[F]
+  )(implicit inv: Invocation[F, SqsEvent]): F[Option[INothing]] = inv.event.flatMap { event =>
+    event
+      .records
+      .traverse(record =>
+        Tracer[F].span("handle-record", SqsRecordAttributes(record)).surround {
+          handleRecord[F](record)
+        })
+      .as(None)
+  }
+
+  def handleRecord[F[_]: Monad: Tracer](@unused record: SqsRecord): F[Unit] = {
+    Tracer[F].span("some-operation").surround {
+      Monad[F].unit
+    }
+  }
+
+}

examples/shared/src/main/scala/feral/examples/Http4sLambda.scala

@@ -16,14 +16,15 @@
 
 package feral.examples
 
+import _root_.feral.lambda._
+import _root_.feral.lambda.events._
+import _root_.feral.lambda.http4s._
+import _root_.feral.lambda.natchez._
+import _root_.natchez.Trace
+import _root_.natchez.http4s.NatchezMiddleware
+import _root_.natchez.xray.XRay
 import cats.effect._
 import cats.effect.std.Random
-import feral.lambda._
-import feral.lambda.events._
-import feral.lambda.http4s._
-import natchez.Trace
-import natchez.http4s.NatchezMiddleware
-import natchez.xray.XRay
 import org.http4s.HttpApp
 import org.http4s.HttpRoutes
 import org.http4s.client.Client

examples/shared/src/main/scala/feral/examples/KinesisLambda.scala

@@ -16,12 +16,12 @@
 
 package feral.examples
 
+import _root_.feral.lambda._
+import _root_.feral.lambda.events.SqsEvent
+import _root_.natchez.Trace
+import _root_.natchez.xray.XRay
 import cats.effect._
 import cats.effect.std.Random
-import feral.lambda._
-import feral.lambda.events.SqsEvent
-import natchez.Trace
-import natchez.xray.XRay
 import skunk.Session
 
 /**

lambda/shared/src/main/scala/feral/lambda/AwsTags.scala → lambda-natchez/shared/src/main/scala/feral/lambda/natchez/AwsTags.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package feral.lambda
+package feral.lambda.natchez
 
 import natchez.TraceValue
 

lambda-natchez/shared/src/main/scala/feral/lambda/natchez/KernelSource.scala

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021 Typelevel
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package feral.lambda.natchez
+
+import feral.lambda.events.ApiGatewayProxyEvent
+import feral.lambda.events.ApiGatewayProxyEventV2
+import feral.lambda.events.DynamoDbStreamEvent
+import feral.lambda.events.KinesisStreamEvent
+import feral.lambda.events.S3BatchEvent
+import feral.lambda.events.SqsRecordAttributes
+import natchez.Kernel
+import org.typelevel.ci._
+
+trait KernelSource[Event] {
+  def extract(event: Event): Kernel
+}
+
+object KernelSource {
+  @inline def apply[E](implicit ev: KernelSource[E]): ev.type = ev
+
+  def emptyKernelSource[E]: KernelSource[E] = _ => Kernel(Map.empty)
+
+  private[this] val `X-Amzn-Trace-Id` = ci"X-Amzn-Trace-Id"
+
+  implicit def apiGatewayProxyEvent: KernelSource[ApiGatewayProxyEvent] =
+    e => Kernel(e.headers.getOrElse(Map.empty))
+
+  implicit def apiGatewayProxyEventV2: KernelSource[ApiGatewayProxyEventV2] =
+    e => Kernel(e.headers)
+
+  implicit def sqsRecordAttributes: KernelSource[SqsRecordAttributes] =
+    a => Kernel(a.awsTraceHeader.map(`X-Amzn-Trace-Id` -> _).toMap)
+
+  implicit def s3BatchEvent: KernelSource[S3BatchEvent] = KernelSource.emptyKernelSource
+
+  @deprecated(
+    "See feral.lambda.events.KinesisStreamEvent deprecation",
+    since = "0.3.0"
+  )
+  implicit def kinesisStreamEvent: KernelSource[KinesisStreamEvent] =
+    KernelSource.emptyKernelSource
+
+  implicit def dynamoDbStreamEvent: KernelSource[DynamoDbStreamEvent] =
+    KernelSource.emptyKernelSource
+}

lambda/shared/src/main/scala/feral/lambda/TracedHandler.scala → lambda-natchez/shared/src/main/scala/feral/lambda/natchez/TracedHandler.scala

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package feral.lambda
+package feral.lambda.natchez
 
 import cats.data.Kleisli
 import cats.effect.IO
 import cats.effect.kernel.MonadCancelThrow
 import cats.syntax.all._
+import feral.lambda.Invocation
 import natchez.EntryPoint
 import natchez.Span
 import natchez.Trace

lambda/shared/src/test/scala/feral/lambda/TracedHandlerSuite.scala → lambda-natchez/shared/src/test/scala/feral/lambda/natchez/TracedHandlerSuite.scala

@@ -14,18 +14,20 @@
  * limitations under the License.
  */
 
-package feral.lambda
+package feral.lambda.natchez
 
 import cats.data.Kleisli
 import cats.effect.IO
+import feral.lambda.INothing
+import feral.lambda.Invocation
 import feral.lambda.events.KinesisStreamEvent
 import natchez.EntryPoint
 import natchez.Span
 import natchez.Trace
 
 import scala.annotation.nowarn
 
-class TracedLambdaSuite {
+class TracedHandlerSuite {
 
   @nowarn
   def syntaxTest = { // Checking for compilation, nothing more