Skip to content

Commit 1586af2

Browse files
committed
fix incubating semconv version
1 parent e558e32 commit 1586af2

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

bom-alpha/build.gradle.kts

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ dependencies {
1818
// Get the semconv version from :dependencyManagement
1919
val semconvConstraint = project.project(project(":dependencyManagement").path).configurations["api"].allDependencyConstraints
2020
.find { it.group.equals("io.opentelemetry.semconv")
21-
&& it.name.equals("opentelemetry-semconv") }
21+
&& it.name.equals("opentelemetry-semconv-incubating") }
2222
?: throw Exception("semconv constraint not found")
23-
val semconvVersion = semconvConstraint.version ?: throw Exception("missing version")
24-
otelBom.addExtra(semconvConstraint.group, semconvConstraint.name, semconvVersion)
25-
otelBom.addExtra(semconvConstraint.group, "opentelemetry-semconv-incubating", semconvVersion)
23+
val semconvAlphaVersion = semconvConstraint.version ?: throw Exception("missing version")
24+
otelBom.addExtra(semconvConstraint.group, "opentelemetry-semconv-incubating", semconvAlphaVersion)
2625
}
2726

2827
otelBom.projectFilter.set { it.findProperty("otel.stable") != "true" }

bom/build.gradle.kts

+8
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ javaPlatform {
1212

1313
dependencies {
1414
api(platform("io.opentelemetry:opentelemetry-bom"))
15+
16+
// Get the semconv version from :dependencyManagement
17+
val semconvConstraint = project.project(project(":dependencyManagement").path).configurations["api"].allDependencyConstraints
18+
.find { it.group.equals("io.opentelemetry.semconv")
19+
&& it.name.equals("opentelemetry-semconv") }
20+
?: throw Exception("semconv constraint not found")
21+
val semconvVersion = semconvConstraint.version ?: throw Exception("missing version")
22+
otelBom.addExtra(semconvConstraint.group, semconvConstraint.name, semconvVersion)
1523
}
1624

1725
otelBom.projectFilter.set { it.findProperty("otel.stable") == "true" }

dependencyManagement/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ val jmhVersion = "1.37"
4747
val mockitoVersion = "4.11.0"
4848
val slf4jVersion = "2.0.16"
4949
val semConvVersion = "1.30.0-rc.1"
50+
val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1")
5051

5152
val CORE_DEPENDENCIES = listOf(
5253
"io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}",
53-
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvVersion}",
54+
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvAlphaVersion}",
5455
"com.google.auto.service:auto-service:${autoServiceVersion}",
5556
"com.google.auto.service:auto-service-annotations:${autoServiceVersion}",
5657
"com.google.auto.value:auto-value:${autoValueVersion}",

0 commit comments

Comments
 (0)