iRevive · iRevive · Apr 20, 2025 · Apr 20, 2025 · Apr 20, 2025 · Apr 20, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -91,11 +91,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 semconv/stable/.jvm/target oteljava/metrics/target oteljava/context-storage/target instrumentation/metrics/js/target sdk/common/native/target core/trace/.js/target semconv/metrics/stable/.jvm/target semconv/metrics/experimental/.jvm/target semconv/metrics/stable/.native/target sdk-exporter/all/.jvm/target semconv/experimental/.js/target core/common/.jvm/target oteljava/common-testkit/target sdk/metrics/.native/target sdk-exporter/metrics/.jvm/target sdk-exporter/trace/.jvm/target unidocs/target sdk-contrib/aws/resource/.jvm/target oteljava/trace-testkit/target core/metrics/.native/target core/all/.native/target sdk/trace-testkit/.jvm/target sdk/trace-testkit/.native/target sdk/testkit/.native/target sdk-exporter/prometheus/.jvm/target semconv/experimental/.native/target core/metrics/.jvm/target core/all/.js/target sdk-exporter/proto/.jvm/target sdk-exporter/proto/.js/target semconv/stable/.native/target sdk/all/.native/target sdk/metrics-testkit/.js/target sdk-contrib/aws/xray-propagator/.native/target core/metrics/.js/target sdk/testkit/.js/target core/all/.jvm/target sdk/common/jvm/target core/trace/.native/target oteljava/metrics-testkit/target instrumentation/metrics/jvm/target sdk/trace/.native/target semconv/experimental/.jvm/target sdk/metrics-testkit/.native/target sdk/metrics/.jvm/target oteljava/common/target scalafix/rules/target sdk-exporter/proto/.native/target core/trace/.jvm/target sdk-exporter/common/.jvm/target sdk/metrics-testkit/.jvm/target core/common/.native/target sdk/trace-testkit/.js/target core/common/.js/target oteljava/trace/target semconv/metrics/experimental/.native/target oteljava/testkit/target sdk/testkit/.jvm/target sdk-exporter/all/.js/target sdk-contrib/aws/xray/.native/target semconv/metrics/experimental/.js/target semconv/metrics/stable/.js/target instrumentation/metrics/native/target sdk/all/.jvm/target sdk-exporter/all/.native/target oteljava/all/target sdk/trace/.jvm/target sdk-contrib/aws/xray-propagator/.jvm/target semconv/stable/.js/target sdk-contrib/aws/xray/.jvm/target project/target
+        run: mkdir -p core/logs/.native/target semconv/stable/.jvm/target sdk/logs-testkit/.js/target oteljava/metrics/target oteljava/context-storage/target instrumentation/metrics/js/target sdk/common/native/target oteljava/logs/target core/trace/.js/target semconv/metrics/stable/.jvm/target semconv/metrics/experimental/.jvm/target semconv/metrics/stable/.native/target sdk-exporter/all/.jvm/target semconv/experimental/.js/target core/common/.jvm/target oteljava/common-testkit/target sdk/metrics/.native/target sdk-exporter/metrics/.jvm/target sdk-exporter/trace/.jvm/target unidocs/target sdk-contrib/aws/resource/.jvm/target oteljava/trace-testkit/target core/metrics/.native/target core/all/.native/target sdk/trace-testkit/.jvm/target sdk/trace-testkit/.native/target sdk/testkit/.native/target sdk-exporter/prometheus/.jvm/target sdk/logs-testkit/.jvm/target semconv/experimental/.native/target core/metrics/.jvm/target core/logs/.js/target core/all/.js/target sdk-exporter/proto/.jvm/target sdk-exporter/proto/.js/target semconv/stable/.native/target sdk-exporter/logs/.jvm/target sdk/all/.native/target sdk/logs-testkit/.native/target sdk/metrics-testkit/.js/target sdk-contrib/aws/xray-propagator/.native/target core/metrics/.js/target sdk/testkit/.js/target core/all/.jvm/target sdk/common/jvm/target core/trace/.native/target oteljava/metrics-testkit/target core/logs/.jvm/target instrumentation/metrics/jvm/target sdk/trace/.native/target semconv/experimental/.jvm/target sdk/metrics-testkit/.native/target sdk/metrics/.jvm/target oteljava/common/target scalafix/rules/target sdk-exporter/proto/.native/target core/trace/.jvm/target sdk-exporter/common/.jvm/target sdk/metrics-testkit/.jvm/target core/common/.native/target sdk/trace-testkit/.js/target core/common/.js/target oteljava/trace/target semconv/metrics/experimental/.native/target oteljava/testkit/target sdk/testkit/.jvm/target sdk-exporter/all/.js/target sdk-contrib/aws/xray/.native/target semconv/metrics/experimental/.js/target sdk/logs/.jvm/target sdk/logs/.native/target semconv/metrics/stable/.js/target instrumentation/metrics/native/target oteljava/logs-testkit/target sdk/all/.jvm/target sdk-exporter/all/.native/target oteljava/all/target sdk/trace/.jvm/target sdk-contrib/aws/xray-propagator/.jvm/target semconv/stable/.js/target sdk-contrib/aws/xray/.jvm/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 semconv/stable/.jvm/target oteljava/metrics/target oteljava/context-storage/target instrumentation/metrics/js/target sdk/common/native/target core/trace/.js/target semconv/metrics/stable/.jvm/target semconv/metrics/experimental/.jvm/target semconv/metrics/stable/.native/target sdk-exporter/all/.jvm/target semconv/experimental/.js/target core/common/.jvm/target oteljava/common-testkit/target sdk/metrics/.native/target sdk-exporter/metrics/.jvm/target sdk-exporter/trace/.jvm/target unidocs/target sdk-contrib/aws/resource/.jvm/target oteljava/trace-testkit/target core/metrics/.native/target core/all/.native/target sdk/trace-testkit/.jvm/target sdk/trace-testkit/.native/target sdk/testkit/.native/target sdk-exporter/prometheus/.jvm/target semconv/experimental/.native/target core/metrics/.jvm/target core/all/.js/target sdk-exporter/proto/.jvm/target sdk-exporter/proto/.js/target semconv/stable/.native/target sdk/all/.native/target sdk/metrics-testkit/.js/target sdk-contrib/aws/xray-propagator/.native/target core/metrics/.js/target sdk/testkit/.js/target core/all/.jvm/target sdk/common/jvm/target core/trace/.native/target oteljava/metrics-testkit/target instrumentation/metrics/jvm/target sdk/trace/.native/target semconv/experimental/.jvm/target sdk/metrics-testkit/.native/target sdk/metrics/.jvm/target oteljava/common/target scalafix/rules/target sdk-exporter/proto/.native/target core/trace/.jvm/target sdk-exporter/common/.jvm/target sdk/metrics-testkit/.jvm/target core/common/.native/target sdk/trace-testkit/.js/target core/common/.js/target oteljava/trace/target semconv/metrics/experimental/.native/target oteljava/testkit/target sdk/testkit/.jvm/target sdk-exporter/all/.js/target sdk-contrib/aws/xray/.native/target semconv/metrics/experimental/.js/target semconv/metrics/stable/.js/target instrumentation/metrics/native/target sdk/all/.jvm/target sdk-exporter/all/.native/target oteljava/all/target sdk/trace/.jvm/target sdk-contrib/aws/xray-propagator/.jvm/target semconv/stable/.js/target sdk-contrib/aws/xray/.jvm/target project/target
+        run: tar cf targets.tar core/logs/.native/target semconv/stable/.jvm/target sdk/logs-testkit/.js/target oteljava/metrics/target oteljava/context-storage/target instrumentation/metrics/js/target sdk/common/native/target oteljava/logs/target core/trace/.js/target semconv/metrics/stable/.jvm/target semconv/metrics/experimental/.jvm/target semconv/metrics/stable/.native/target sdk-exporter/all/.jvm/target semconv/experimental/.js/target core/common/.jvm/target oteljava/common-testkit/target sdk/metrics/.native/target sdk-exporter/metrics/.jvm/target sdk-exporter/trace/.jvm/target unidocs/target sdk-contrib/aws/resource/.jvm/target oteljava/trace-testkit/target core/metrics/.native/target core/all/.native/target sdk/trace-testkit/.jvm/target sdk/trace-testkit/.native/target sdk/testkit/.native/target sdk-exporter/prometheus/.jvm/target sdk/logs-testkit/.jvm/target semconv/experimental/.native/target core/metrics/.jvm/target core/logs/.js/target core/all/.js/target sdk-exporter/proto/.jvm/target sdk-exporter/proto/.js/target semconv/stable/.native/target sdk-exporter/logs/.jvm/target sdk/all/.native/target sdk/logs-testkit/.native/target sdk/metrics-testkit/.js/target sdk-contrib/aws/xray-propagator/.native/target core/metrics/.js/target sdk/testkit/.js/target core/all/.jvm/target sdk/common/jvm/target core/trace/.native/target oteljava/metrics-testkit/target core/logs/.jvm/target instrumentation/metrics/jvm/target sdk/trace/.native/target semconv/experimental/.jvm/target sdk/metrics-testkit/.native/target sdk/metrics/.jvm/target oteljava/common/target scalafix/rules/target sdk-exporter/proto/.native/target core/trace/.jvm/target sdk-exporter/common/.jvm/target sdk/metrics-testkit/.jvm/target core/common/.native/target sdk/trace-testkit/.js/target core/common/.js/target oteljava/trace/target semconv/metrics/experimental/.native/target oteljava/testkit/target sdk/testkit/.jvm/target sdk-exporter/all/.js/target sdk-contrib/aws/xray/.native/target semconv/metrics/experimental/.js/target sdk/logs/.jvm/target sdk/logs/.native/target semconv/metrics/stable/.js/target instrumentation/metrics/native/target oteljava/logs-testkit/target sdk/all/.jvm/target sdk-exporter/all/.native/target oteljava/all/target sdk/trace/.jvm/target sdk-contrib/aws/xray-propagator/.jvm/target semconv/stable/.js/target sdk-contrib/aws/xray/.jvm/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')

diff --git a/.mergify.yml b/.mergify.yml
@@ -78,6 +78,14 @@ pull_request_rules:
       add:
       - tracing
       remove: []
+- name: Label logs PRs
+  conditions:
+  - files~=/(logs)/
+  actions:
+    label:
+      add:
+      - logs
+      remove: []
 - name: Label Scala Steward PRs
   conditions:
   - author=typelevel-steward[bot]

diff --git a/build.sbt b/build.sbt
@@ -71,6 +71,11 @@ ThisBuild / mergifyPrRules ++= Seq(
     List(MergifyCondition.Custom("files~=/(trace)/")),
     List(MergifyAction.Label(add = List("tracing")))
   ),
+  MergifyPrRule(
+    "Label logs PRs",
+    List(MergifyCondition.Custom("files~=/(logs)/")),
+    List(MergifyAction.Label(add = List("logs")))
+  ),
   MergifyPrRule(
     "Label Scala Steward PRs",
     List(MergifyCondition.Custom("author=typelevel-steward[bot]")),
@@ -130,11 +135,14 @@ semanticConventionsGenerate := {
 lazy val root = tlCrossRootProject
   .aggregate(
     `core-common`,
+    `core-logs`,
     `core-metrics`,
     `core-trace`,
     core,
     `instrumentation-metrics`,
     `sdk-common`,
+    `sdk-logs`,
+    `sdk-logs-testkit`,
     `sdk-metrics`,
     `sdk-metrics-testkit`,
     `sdk-trace`,
@@ -143,6 +151,7 @@ lazy val root = tlCrossRootProject
     sdk,
     `sdk-exporter-common`,
     `sdk-exporter-proto`,
+    `sdk-exporter-logs`,
     `sdk-exporter-metrics`,
     `sdk-exporter-prometheus`,
     `sdk-exporter-trace`,
@@ -152,6 +161,8 @@ lazy val root = tlCrossRootProject
     `sdk-contrib-aws-xray-propagator`,
     `oteljava-common`,
     `oteljava-common-testkit`,
+    `oteljava-logs`,
+    `oteljava-logs-testkit`,
     `oteljava-metrics`,
     `oteljava-metrics-testkit`,
     `oteljava-trace`,
@@ -196,6 +207,21 @@ lazy val `core-common` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
     )
   )
 
+lazy val `core-logs` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
+  .crossType(CrossType.Pure)
+  .in(file("core/logs"))
+  .dependsOn(`core-common`)
+  .settings(munitDependencies)
+  .settings(
+    name := "otel4s-core-logs",
+    libraryDependencies ++= Seq(
+      "org.typelevel" %%% "cats-effect-kernel" % CatsEffectVersion,
+      "org.typelevel" %%% "cats-effect-testkit" % CatsEffectVersion % Test,
+      "org.typelevel" %%% "cats-laws" % CatsVersion % Test,
+      "org.typelevel" %%% "discipline-munit" % MUnitDisciplineVersion % Test
+    )
+  )
+
 lazy val `core-metrics` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .crossType(CrossType.Pure)
   .in(file("core/metrics"))
@@ -232,7 +258,7 @@ lazy val `core-trace` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
 lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .crossType(CrossType.Pure)
   .in(file("core/all"))
-  .dependsOn(`core-common`, `core-metrics`, `core-trace`)
+  .dependsOn(`core-common`, `core-logs`, `core-metrics`, `core-trace`)
   .settings(
     name := "otel4s-core"
   )
@@ -285,6 +311,37 @@ lazy val `sdk-common` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .settings(munitDependencies)
   .jsSettings(scalaJSLinkerSettings)
 
+lazy val `sdk-logs` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
+  .crossType(CrossType.Pure)
+  .in(file("sdk/logs"))
+  .dependsOn(
+    `sdk-common` % "compile->compile;test->test",
+    `core-logs` % "compile->compile;test->test",
+  )
+  .settings(
+    name := "otel4s-sdk-logs",
+    startYear := Some(2025),
+    libraryDependencies ++= Seq(
+      "org.typelevel" %%% "cats-effect" % CatsEffectVersion,
+      "org.typelevel" %%% "cats-laws" % CatsVersion % Test,
+      "org.typelevel" %%% "cats-effect-testkit" % CatsEffectVersion % Test,
+      "org.typelevel" %%% "discipline-munit" % MUnitDisciplineVersion % Test,
+      "org.typelevel" %%% "scalacheck-effect-munit" % MUnitScalaCheckEffectVersion % Test
+    ),
+  )
+  .settings(munitDependencies)
+  .jsSettings(scalaJSLinkerSettings)
+
+lazy val `sdk-logs-testkit` =
+  crossProject(JVMPlatform, JSPlatform, NativePlatform)
+    .crossType(CrossType.Pure)
+    .in(file("sdk/logs-testkit"))
+    .dependsOn(`sdk-logs`)
+    .settings(
+      name := "otel4s-sdk-logs-testkit",
+      startYear := Some(2025)
+    )
+
 lazy val `sdk-metrics` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .crossType(CrossType.Pure)
   .in(file("sdk/metrics"))
@@ -351,7 +408,7 @@ lazy val `sdk-trace-testkit` =
 lazy val `sdk-testkit` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .crossType(CrossType.Pure)
   .in(file("sdk/testkit"))
-  .dependsOn(core, `sdk-metrics-testkit`, `sdk-trace-testkit`)
+  .dependsOn(core, `sdk-logs-testkit`, `sdk-metrics-testkit`, `sdk-trace-testkit`)
   .settings(
     name := "otel4s-sdk-testkit",
     startYear := Some(2024)
@@ -363,6 +420,7 @@ lazy val sdk = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .dependsOn(
     core,
     `sdk-common`,
+    `sdk-logs` % "compile->compile;test->test",
     `sdk-metrics` % "compile->compile;test->test",
     `sdk-metrics-testkit` % Test,
     `sdk-trace` % "compile->compile;test->test",
@@ -469,6 +527,29 @@ lazy val `sdk-exporter-common` =
     .nativeSettings(scalaNativeSettings)
     .settings(munitDependencies)
 
+lazy val `sdk-exporter-logs` =
+  crossProject(JVMPlatform, JSPlatform, NativePlatform)
+    .crossType(CrossType.Pure)
    .in(file("sdk-exporter/logs"))
+    .enablePlugins(DockerComposeEnvPlugin)
+    .dependsOn(
+      `sdk-exporter-common` % "compile->compile;test->test",
+      `sdk-logs` % "compile->compile;test->test"
+    )
+    .settings(
+      name := "otel4s-sdk-exporter-logs",
+      startYear := Some(2025),
+      dockerComposeEnvFile := crossProjectBaseDirectory.value / "docker" / "docker-compose.yml",
+      Test / scalacOptions ++= {
+        // see https://github.com/circe/circe/issues/2162
+        if (tlIsScala3.value) Seq("-Xmax-inlines", "64") else Nil
+      }
+    )
+    .jsSettings(scalaJSLinkerSettings)
+    .nativeEnablePlugins(ScalaNativeBrewedConfigPlugin)
+    .nativeSettings(scalaNativeSettings)
+    .settings(munitDependencies)
+
 lazy val `sdk-exporter-metrics` =
   crossProject(JVMPlatform, JSPlatform, NativePlatform)
     .crossType(CrossType.Pure)
@@ -549,6 +630,7 @@ lazy val `sdk-exporter` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .dependsOn(
     sdk,
     `sdk-exporter-common`,
+    `sdk-exporter-logs`,
     `sdk-exporter-metrics`,
     `sdk-exporter-trace`
   )
@@ -645,6 +727,29 @@ lazy val `oteljava-common-testkit` = project
     startYear := Some(2024)
   )
 
+lazy val `oteljava-logs` = project
+  .in(file("oteljava/logs"))
+  .dependsOn(
+    `oteljava-common`,
+    `core-logs`.jvm % "compile->compile;test->test"
+  )
+  .settings(munitDependencies)
+  .settings(
+    name := "otel4s-oteljava-logs",
+    libraryDependencies ++= Seq(
+      "io.opentelemetry" % "opentelemetry-sdk-testing" % OpenTelemetryVersion % Test
+    )
+  )
+
+lazy val `oteljava-logs-testkit` = project
+  .in(file("oteljava/logs-testkit"))
+  .dependsOn(`oteljava-logs`, `oteljava-common-testkit`)
+  .settings(munitDependencies)
+  .settings(
+    name := "otel4s-oteljava-logs-testkit",
+    startYear := Some(2025)
+  )
+
 lazy val `oteljava-metrics` = project
   .in(file("oteljava/metrics"))
   .dependsOn(
@@ -696,7 +801,7 @@ lazy val `oteljava-trace-testkit` = project
 
 lazy val `oteljava-testkit` = project
   .in(file("oteljava/testkit"))
-  .dependsOn(core.jvm, `oteljava-metrics-testkit`, `oteljava-trace-testkit`)
+  .dependsOn(core.jvm, `oteljava-logs-testkit`, `oteljava-metrics-testkit`, `oteljava-trace-testkit`)
   .settings(
     name := "otel4s-oteljava-testkit",
     startYear := Some(2024)
@@ -721,6 +826,7 @@ lazy val oteljava = project
   .in(file("oteljava/all"))
   .dependsOn(
     core.jvm,
+    `oteljava-logs` % "compile->compile;test->test",
     `oteljava-metrics` % "compile->compile;test->test",
     `oteljava-metrics-testkit` % Test,
     `oteljava-trace` % "compile->compile;test->test",
@@ -847,6 +953,7 @@ lazy val examples = project
   .settings(
     name := "otel4s-examples",
     libraryDependencies ++= Seq(
+      "com.outr" %% "scribe" % "3.16.1",
       "org.apache.pekko" %% "pekko-stream" % PekkoStreamVersion,
       "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
       "io.opentelemetry" % "opentelemetry-exporter-otlp" % OpenTelemetryVersion,
@@ -941,18 +1048,22 @@ lazy val unidocs = project
     name := "otel4s-docs",
     ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(
       `core-common`.jvm,
+      `core-logs`.jvm,
       `core-metrics`.jvm,
       `core-trace`.jvm,
       core.jvm,
       `instrumentation-metrics`.jvm,
       `sdk-common`.jvm,
+      `sdk-logs`.jvm,
+      `sdk-logs-testkit`.jvm,
       `sdk-metrics`.jvm,
       `sdk-metrics-testkit`.jvm,
       `sdk-trace`.jvm,
       `sdk-trace-testkit`.jvm,
       `sdk-testkit`.jvm,
       sdk.jvm,
       `sdk-exporter-common`.jvm,
+      `sdk-exporter-logs`.jvm,
       `sdk-exporter-metrics`.jvm,
       `sdk-exporter-prometheus`.jvm,
       `sdk-exporter-trace`.jvm,
@@ -962,6 +1073,8 @@ lazy val unidocs = project
       `sdk-contrib-aws-xray-propagator`.jvm,
       `oteljava-common`,
       `oteljava-common-testkit`,
+      `oteljava-logs`,
+      `oteljava-logs-testkit`,
       `oteljava-metrics`,
       `oteljava-metrics-testkit`,
       `oteljava-trace`,

diff --git a/core/all/src/main/scala/org/typelevel/otel4s/Otel4s.scala b/core/all/src/main/scala/org/typelevel/otel4s/Otel4s.scala
@@ -19,6 +19,7 @@ package org.typelevel.otel4s
 import cats.mtl.Local
 import org.typelevel.otel4s.baggage.BaggageManager
 import org.typelevel.otel4s.context.propagation.ContextPropagators
+import org.typelevel.otel4s.logs.LoggerProvider
 import org.typelevel.otel4s.metrics.MeterProvider
 import org.typelevel.otel4s.trace.TracerProvider
 
@@ -41,4 +42,12 @@ trait Otel4s[F[_]] {
 
   /** A utility for accessing and modifying [[baggage.Baggage `Baggage`]]. */
   def baggageManager: BaggageManager[F]
+
+  /** An entry point of the logging API for bridging logs into OpenTelemetry.
+    *
+    * @note
+    *   the logs bridge API exists to enable bridging logs from other log frameworks (e.g. SLF4J, Log4j, JUL, Logback,
+    *   etc) into OpenTelemetry and is '''NOT''' a replacement log API.
+    */
+  def loggerProvider: LoggerProvider[F, Ctx]
 }