Skip to content

Commit e464516

Browse files
authored
Update to Java Instrumentation 2.9.0 (#1505)
1 parent ef0caea commit e464516

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
77
val dependencyVersions = hashMapOf<String, String>()
88
rootProject.extra["versions"] = dependencyVersions
99

10-
val otelInstrumentationVersion = "2.8.0-alpha"
10+
val otelInstrumentationVersion = "2.9.0-alpha"
1111

1212
val DEPENDENCY_BOMS = listOf(
1313
"com.fasterxml.jackson:jackson-bom:2.18.0",
@@ -36,6 +36,8 @@ val CORE_DEPENDENCIES = listOf(
3636
"com.google.errorprone:error_prone_core:${errorProneVersion}",
3737
"io.github.netmikey.logunit:logunit-jul:2.0.0",
3838
"io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
39+
// these two constraints can be removed once the opentelemetry-instrumentation-bom-alpha
40+
// is updated to contain the latest version of opentelemetry-semconv
3941
"io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}",
4042
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvVersion}",
4143
"io.prometheus:simpleclient:${prometheusVersion}",
@@ -76,6 +78,12 @@ javaPlatform {
7678

7779
dependencies {
7880
for (bom in DEPENDENCY_BOMS) {
81+
// this is needed until io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha
82+
// is updated to contain the latest version of opentelemetry-semconv
83+
if (bom.equals("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}")) {
84+
api(platform(bom))
85+
continue
86+
}
7987
api(enforcedPlatform(bom))
8088
val split = bom.split(':')
8189
dependencyVersions[split[0]] = split[2]

jmx-scraper/build.gradle.kts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,7 @@ otelJava.moduleName.set("io.opentelemetry.contrib.jmxscraper")
1313

1414
application.mainClass.set("io.opentelemetry.contrib.jmxscraper.JmxScraper")
1515

16-
repositories {
17-
mavenCentral()
18-
mavenLocal()
19-
// TODO: remove snapshot repository once 2.9.0 is released
20-
maven {
21-
setUrl("https://oss.sonatype.org/content/repositories/snapshots")
22-
}
23-
}
24-
2516
dependencies {
26-
// TODO remove snapshot dependency on upstream once 2.9.0 is released
27-
api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.9.0-alpha-SNAPSHOT"))
28-
2917
implementation("io.opentelemetry:opentelemetry-api")
3018
implementation("io.opentelemetry:opentelemetry-sdk")
3119
implementation("io.opentelemetry:opentelemetry-sdk-metrics")

0 commit comments

Comments
 (0)