Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,18 @@
'com.diffplug.spotless:**',
],
},

// Disable prometheus minor updates while working out translation strategy
// https://github.com/open-telemetry/opentelemetry-java/pull/8346

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{
matchPackageNames: [
'io.prometheus:**',
],
matchUpdateTypes: [
'minor',
],
enabled: false,
},
// ── Disabled updates (Java version compatibility) ──────────────────

{
// junit 6+ requires Java 17+
matchPackageNames: [
Expand Down
2 changes: 1 addition & 1 deletion VERSIONING.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ respect to semantic versioning.
|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Java | 8+ | All artifacts, unless otherwise noted | Changing requires major version bump. |
| Android | 23+ (NOTE: [desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring) is required. We stay up to date with the latest version of [desugar_jdk_libs](https://github.com/google/desugar_jdk_libs).) | Artifacts using `otel.animalsniffer-conventions` plugin | Kept in sync with minimum requirements for [Google Play services](https://developers.google.com/android/guides/setup). Subject to change in minor version. |
| Kotlin | 1.8+ | Only applies to `opentelemetry-extension-kotlin` | Kept in sync with [minimum non-deprecated](https://kotlinlang.org/docs/gradle-compiler-options.html#attributes-common-to-jvm-and-javascript) version. Subject to change in minor versions. |
| Kotlin | 1.9+ | Only applies to `opentelemetry-extension-kotlin` | Kept in sync with [minimum non-deprecated](https://kotlinlang.org/docs/gradle-compiler-options.html#attributes-common-to-jvm-and-javascript) version. Subject to change in minor versions. |

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to do this as the new org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21 version doesn't support 1.8 anymore.


## API vs SDK

Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ repositories {

dependencies {
implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:7.2.3")
implementation(enforcedPlatform("com.squareup.wire:wire-bom:6.3.0"))
implementation(enforcedPlatform("com.squareup.wire:wire-bom:6.4.0"))
implementation("com.google.auto.value:auto-value-annotations:1.11.1")
// When updating, update above in plugins too
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.4.0")
Expand All @@ -48,7 +48,7 @@ dependencies {
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
implementation("net.ltgt.gradle:gradle-errorprone-plugin:5.1.0")
implementation("net.ltgt.gradle:gradle-nullaway-plugin:3.0.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21")
implementation("org.sonatype.gradle.plugins:scan-gradle-plugin:3.1.5")
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
}
10 changes: 7 additions & 3 deletions dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ val errorProneVersion = "2.49.0"
val jmhVersion = "1.37"
// Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0
val mockitoVersion = "4.11.0"
val slf4jVersion = "2.0.17"
val slf4jVersion = "2.0.18"
val opencensusVersion = "0.31.1"
val prometheusServerVersion = "1.5.1"
val armeriaVersion = "1.39.0"
val junitVersion = "5.14.4"
val junitPlatformVersion = "1.14.4"
val okhttpVersion = "5.3.2"

val DEPENDENCY_BOMS = listOf(
Expand All @@ -28,7 +29,7 @@ val DEPENDENCY_BOMS = listOf(

"com.fasterxml.jackson:jackson-bom:2.21.3",
"com.google.guava:guava-bom:33.6.0-jre",
"com.google.protobuf:protobuf-bom:4.34.1",
"com.google.protobuf:protobuf-bom:4.35.0",
"com.squareup.okhttp3:okhttp-bom:$okhttpVersion",
"com.squareup.okio:okio-bom:3.17.0", // applies to transitive dependencies of okhttp
"io.grpc:grpc-bom:1.81.0",
Expand All @@ -42,8 +43,11 @@ val DEPENDENCY_BOMS = listOf(
)

val DEPENDENCIES = listOf(
"org.junit.jupiter:junit-jupiter:${junitVersion}",
"org.junit.jupiter:junit-jupiter-api:${junitVersion}",
"org.junit.jupiter:junit-jupiter-engine:${junitVersion}",
"org.junit.jupiter:junit-jupiter-params:${junitVersion}",
"org.junit.platform:junit-platform-launcher:${junitPlatformVersion}",
"com.linecorp.armeria:armeria:${armeriaVersion}",
"com.linecorp.armeria:armeria-grpc:${armeriaVersion}",
"com.linecorp.armeria:armeria-grpc-protocol:${armeriaVersion}",
Expand Down Expand Up @@ -82,7 +86,7 @@ val DEPENDENCIES = listOf(
"io.github.crac:org-crac:0.1.3",
"io.github.netmikey.logunit:logunit-jul:2.0.0",
"io.jaegertracing:jaeger-client:1.8.1",
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.56.0-alpha",
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.57.0-alpha",
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.41.1-alpha",
"io.opentelemetry.proto:opentelemetry-proto:1.10.0-alpha",
"io.opentracing:opentracing-api:0.33.0",
Expand Down
2 changes: 1 addition & 1 deletion extensions/kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ tasks {
withType(KotlinJvmCompile::class) {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_1_8)
apiVersion.set(KotlinVersion.KOTLIN_1_8)
apiVersion.set(KotlinVersion.KOTLIN_1_9)
}
}

Expand Down
13 changes: 0 additions & 13 deletions integration-tests/osgi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,6 @@ otelJava.moduleName.set("io.opentelemetry.integration.tests.osgi")
// https://github.com/micrometer-metrics/micrometer/tree/main/micrometer-osgi-test
// https://github.com/eclipse-osgi-technology/osgi-test/tree/main/examples/osgi-test-example-gradle

configurations.all {
resolutionStrategy {
// BND not compatible with JUnit 5.13+; see https://github.com/bndtools/bnd/issues/6651
val junitVersion = "5.12.2"
val junitLauncherVersion = "1.12.1"
force("org.junit.jupiter:junit-jupiter:$junitVersion")
force("org.junit.jupiter:junit-jupiter-api:$junitVersion")
force("org.junit.jupiter:junit-jupiter-params:$junitVersion")
force("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
force("org.junit.platform:junit-platform-launcher:$junitLauncherVersion")
}
}

// OSGi test infrastructure shared across all suites.
// Each suite's source set automatically inherits these via registerOsgiSuite().
val osgiInfraImplementation: Configuration = configurations.create("osgiInfraImplementation") {
Expand Down
Loading