File tree Expand file tree Collapse file tree 3 files changed +13
-5
lines changed
Expand file tree Collapse file tree 3 files changed +13
-5
lines changed Original file line number Diff line number Diff 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
2827otelBom.projectFilter.set { it.findProperty(" otel.stable" ) != " true" }
Original file line number Diff line number Diff line change @@ -12,6 +12,14 @@ javaPlatform {
1212
1313dependencies {
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
1725otelBom.projectFilter.set { it.findProperty(" otel.stable" ) == " true" }
Original file line number Diff line number Diff line change @@ -47,10 +47,11 @@ val jmhVersion = "1.37"
4747val mockitoVersion = " 4.11.0"
4848val slf4jVersion = " 2.0.16"
4949val semConvVersion = " 1.30.0-rc.1"
50+ val semConvAlphaVersion = semConvVersion.replaceFirst(" (-rc.*)?$" .toRegex(), " -alpha$1" )
5051
5152val 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} " ,
You can’t perform that action at this time.
0 commit comments