File tree 3 files changed +13
-5
lines changed
3 files changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -18,11 +18,10 @@ dependencies {
18
18
// Get the semconv version from :dependencyManagement
19
19
val semconvConstraint = project.project(project(" :dependencyManagement" ).path).configurations[" api" ].allDependencyConstraints
20
20
.find { it.group.equals(" io.opentelemetry.semconv" )
21
- && it.name.equals(" opentelemetry-semconv" ) }
21
+ && it.name.equals(" opentelemetry-semconv-incubating " ) }
22
22
? : 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)
26
25
}
27
26
28
27
otelBom.projectFilter.set { it.findProperty(" otel.stable" ) != " true" }
Original file line number Diff line number Diff line change @@ -12,6 +12,14 @@ javaPlatform {
12
12
13
13
dependencies {
14
14
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)
15
23
}
16
24
17
25
otelBom.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"
47
47
val mockitoVersion = " 4.11.0"
48
48
val slf4jVersion = " 2.0.16"
49
49
val semConvVersion = " 1.30.0-rc.1"
50
+ val semConvAlphaVersion = semConvVersion.replaceFirst(" (-rc.*)?$" .toRegex(), " -alpha$1" )
50
51
51
52
val CORE_DEPENDENCIES = listOf (
52
53
" io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion} " ,
53
- " io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvVersion } " ,
54
+ " io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvAlphaVersion } " ,
54
55
" com.google.auto.service:auto-service:${autoServiceVersion} " ,
55
56
" com.google.auto.service:auto-service-annotations:${autoServiceVersion} " ,
56
57
" com.google.auto.value:auto-value:${autoValueVersion} " ,
You can’t perform that action at this time.
0 commit comments