Skip to content

Commit

Permalink
oteljava: correctly capture exemplars.
Browse files Browse the repository at this point in the history
sdk, oteljava: use shared `BaseMeterSuite`.
  • Loading branch information
iRevive committed May 1, 2024
1 parent a517f1d commit 1f161ba
Show file tree
Hide file tree
Showing 18 changed files with 959 additions and 82 deletions.
15 changes: 11 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,10 @@ lazy val `sdk-common` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
lazy val `sdk-metrics` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.crossType(CrossType.Pure)
.in(file("sdk/metrics"))
.dependsOn(`sdk-common` % "compile->compile;test->test", `core-metrics`)
.dependsOn(
`sdk-common` % "compile->compile;test->test",
`core-metrics` % "compile->compile;test->test"
)
.settings(
name := "otel4s-sdk-metrics",
startYear := Some(2024),
Expand Down Expand Up @@ -300,7 +303,8 @@ lazy val sdk = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.dependsOn(
core,
`sdk-common`,
`sdk-metrics`,
`sdk-metrics` % "compile->compile;test->test",
`sdk-metrics-testkit` % Test,
`sdk-trace` % "compile->compile;test->test",
`sdk-trace-testkit` % Test
)
Expand Down Expand Up @@ -459,7 +463,10 @@ lazy val `oteljava-common-testkit` = project

lazy val `oteljava-metrics` = project
.in(file("oteljava/metrics"))
.dependsOn(`oteljava-common`, `core-metrics`.jvm)
.dependsOn(
`oteljava-common`,
`core-metrics`.jvm % "compile->compile;test->test"
)
.settings(munitDependencies)
.settings(
name := "otel4s-oteljava-metrics",
Expand Down Expand Up @@ -520,7 +527,7 @@ lazy val oteljava = project
.in(file("oteljava/all"))
.dependsOn(
core.jvm,
`oteljava-metrics`,
`oteljava-metrics` % "compile->compile;test->test",
`oteljava-metrics-testkit` % Test,
`oteljava-trace` % "compile->compile;test->test",
`oteljava-trace-testkit` % Test
Expand Down
Loading

0 comments on commit 1f161ba

Please sign in to comment.