Skip to content

Commit 8fff5ac

Browse files
authored
Merge pull request #1039 from iRevive/sdk/logs-module
Add `otel4s-sdk-logs` module
2 parents de1d02d + 62cd1e3 commit 8fff5ac

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ jobs:
252252
- name: Submit Dependencies
253253
uses: scalacenter/sbt-dependency-submission@v2
254254
with:
255-
modules-ignore: otel4s-core-logs_native0.4_2.13 otel4s-core-logs_native0.4_3 otel4s-benchmarks_2.13 otel4s-benchmarks_3 otel4s-examples_2.13 otel4s-examples_3 otel4s_2.13 otel4s_3 docs_2.13 docs_3 scalafix-output_2.13 scalafix-input_2.13 otel4s-core-logs_sjs1_2.13 otel4s-core-logs_sjs1_3 otel4s_2.13 otel4s_3 otel4s-core-logs_2.13 otel4s-core-logs_3 otel4s_2.13 otel4s_3 scalafix-tests_2.12
255+
modules-ignore: otel4s-core-logs_native0.4_2.13 otel4s-core-logs_native0.4_3 otel4s-benchmarks_2.13 otel4s-benchmarks_3 otel4s-examples_2.13 otel4s-examples_3 otel4s_2.13 otel4s_3 docs_2.13 docs_3 scalafix-output_2.13 scalafix-input_2.13 otel4s-core-logs_sjs1_2.13 otel4s-core-logs_sjs1_3 otel4s_2.13 otel4s_3 otel4s-core-logs_2.13 otel4s-core-logs_3 otel4s_2.13 otel4s_3 otel4s-sdk-logs_sjs1_2.13 otel4s-sdk-logs_sjs1_3 scalafix-tests_2.12 otel4s-sdk-logs_2.13 otel4s-sdk-logs_3 otel4s-sdk-logs_native0.4_2.13 otel4s-sdk-logs_native0.4_3
256256
configs-ignore: test scala-tool scala-doc-tool test-internal
257257

258258
validate-steward:

build.sbt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ lazy val root = tlCrossRootProject
141141
core,
142142
`instrumentation-metrics`,
143143
`sdk-common`,
144+
`sdk-logs`,
144145
`sdk-metrics`,
145146
`sdk-metrics-testkit`,
146147
`sdk-trace`,
@@ -307,6 +308,28 @@ lazy val `sdk-common` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
307308
.settings(munitDependencies)
308309
.jsSettings(scalaJSLinkerSettings)
309310

311+
lazy val `sdk-logs` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
312+
.crossType(CrossType.Pure)
313+
.in(file("sdk/logs"))
314+
.enablePlugins(NoPublishPlugin)
315+
.dependsOn(
316+
`sdk-common` % "compile->compile;test->test",
317+
`core-logs` % "compile->compile;test->test",
318+
)
319+
.settings(
320+
name := "otel4s-sdk-logs",
321+
startYear := Some(2025),
322+
libraryDependencies ++= Seq(
323+
"org.typelevel" %%% "cats-effect" % CatsEffectVersion,
324+
"org.typelevel" %%% "cats-laws" % CatsVersion % Test,
325+
"org.typelevel" %%% "cats-effect-testkit" % CatsEffectVersion % Test,
326+
"org.typelevel" %%% "discipline-munit" % MUnitDisciplineVersion % Test,
327+
"org.typelevel" %%% "scalacheck-effect-munit" % MUnitScalaCheckEffectVersion % Test
328+
),
329+
)
330+
.settings(munitDependencies)
331+
.jsSettings(scalaJSLinkerSettings)
332+
310333
lazy val `sdk-metrics` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
311334
.crossType(CrossType.Pure)
312335
.in(file("sdk/metrics"))
@@ -969,6 +992,7 @@ lazy val unidocs = project
969992
core.jvm,
970993
`instrumentation-metrics`.jvm,
971994
`sdk-common`.jvm,
995+
`sdk-logs`.jvm,
972996
`sdk-metrics`.jvm,
973997
`sdk-metrics-testkit`.jvm,
974998
`sdk-trace`.jvm,

0 commit comments

Comments
 (0)