Skip to content

Commit fe69c32

Browse files
authored
Merge pull request #1013 from iRevive/logs/init-module
logs: add `core-logs` module
2 parents b9dea58 + 08e2c51 commit fe69c32

File tree

3 files changed

+31
-1
lines changed

3 files changed

+31
-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-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_2.13 otel4s_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 scalafix-tests_2.12
256256
configs-ignore: test scala-tool scala-doc-tool test-internal
257257

258258
validate-steward:

.mergify.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,14 @@ pull_request_rules:
7878
add:
7979
- tracing
8080
remove: []
81+
- name: Label logs PRs
82+
conditions:
83+
- files~=/(logs)/
84+
actions:
85+
label:
86+
add:
87+
- logs
88+
remove: []
8189
- name: Label Scala Steward PRs
8290
conditions:
8391
- author=typelevel-steward[bot]

build.sbt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ ThisBuild / mergifyPrRules ++= Seq(
7171
List(MergifyCondition.Custom("files~=/(trace)/")),
7272
List(MergifyAction.Label(add = List("tracing")))
7373
),
74+
MergifyPrRule(
75+
"Label logs PRs",
76+
List(MergifyCondition.Custom("files~=/(logs)/")),
77+
List(MergifyAction.Label(add = List("logs")))
78+
),
7479
MergifyPrRule(
7580
"Label Scala Steward PRs",
7681
List(MergifyCondition.Custom("author=typelevel-steward[bot]")),
@@ -130,6 +135,7 @@ semanticConventionsGenerate := {
130135
lazy val root = tlCrossRootProject
131136
.aggregate(
132137
`core-common`,
138+
`core-logs`,
133139
`core-metrics`,
134140
`core-trace`,
135141
core,
@@ -196,6 +202,21 @@ lazy val `core-common` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
196202
)
197203
)
198204

205+
lazy val `core-logs` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
206+
.crossType(CrossType.Pure)
207+
.in(file("core/logs"))
208+
.enablePlugins(NoPublishPlugin)
209+
.dependsOn(`core-common`)
210+
.settings(munitDependencies)
211+
.settings(
212+
name := "otel4s-core-logs",
213+
libraryDependencies ++= Seq(
214+
"org.typelevel" %%% "cats-laws" % CatsVersion % Test,
215+
"org.typelevel" %%% "discipline-munit" % MUnitDisciplineVersion % Test
216+
),
217+
mimaPreviousArtifacts := Set.empty
218+
)
219+
199220
lazy val `core-metrics` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
200221
.crossType(CrossType.Pure)
201222
.in(file("core/metrics"))
@@ -941,6 +962,7 @@ lazy val unidocs = project
941962
name := "otel4s-docs",
942963
ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(
943964
`core-common`.jvm,
965+
`core-logs`.jvm,
944966
`core-metrics`.jvm,
945967
`core-trace`.jvm,
946968
core.jvm,

0 commit comments

Comments
 (0)