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
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ tasks {

// TODO (trask) use animal sniffer
disable("Java8ApiChecker")
disable("AndroidJdkLibsChecker")

// apparently disabling android doesn't disable this
disable("StaticOrDefaultInterfaceMethod")
Expand Down
6 changes: 3 additions & 3 deletions custom-checks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ dependencies {
}

otelJava {
minJavaVersionSupported.set(JavaVersion.VERSION_17)
minJavaVersionSupported.set(JavaVersion.VERSION_21)
}

// We cannot use "--release" javac option here because that will forbid exporting com.sun.tools package.
// We also can't seem to use the toolchain without the "--release" option. So disable everything.

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
toolchain {
languageVersion.set(null as JavaLanguageVersion?)
}
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ val DEPENDENCY_BOMS = listOf(

val autoServiceVersion = "1.1.1"
val autoValueVersion = "1.11.0"
val errorProneVersion = "2.42.0"
val errorProneVersion = "2.43.0"
val byteBuddyVersion = "1.17.8"
val asmVersion = "9.9"
val jmhVersion = "1.37"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,6 @@ public InetSocketAddress getNetworkLocalInetSocketAddress(
}

private static HttpRequest request(ServiceRequestContext ctx) {
HttpRequest request = ctx.request();
if (request == null) {
throw new IllegalStateException(
"Context always has a request in decorators, this exception indicates a programming bug.");
}
return request;
return ctx.request();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ private GenAiOperationNameIncubatingValues() {}
// used to approximate input/output token count for Cohere and Mistral AI models,
// which don't provide these values in the response body.
// https://docs.aws.amazon.com/bedrock/latest/userguide/model-customization-prepare.html
private static final Double CHARS_PER_TOKEN = 6.0;
private static final double CHARS_PER_TOKEN = 6.0;

private enum ModelFamily {
AMAZON_NOVA,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ muzzle {
if (findProperty("testLatestDeps") as Boolean) {
// when running on jdk 21 Elasticsearch53SpringRepositoryTest occasionally fails with timeout
otelJava {
maxJavaVersionSupported.set(JavaVersion.VERSION_17)
maxJavaVersionForTests.set(JavaVersion.VERSION_17)
}
}

Expand Down
6 changes: 1 addition & 5 deletions instrumentation/grails-3.0/javaagent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ muzzle {
}
}

otelJava {
maxJavaVersionSupported.set(JavaVersion.VERSION_17)
}

val grailsVersion = "3.0.6" // first version that the tests pass on
val springBootVersion = "1.2.5.RELEASE"

Expand Down Expand Up @@ -57,7 +53,7 @@ if (!latestDepTest) {
resolutionStrategy {
eachDependency {
if (requested.group == "org.codehaus.groovy") {
useVersion("3.0.9")
useVersion("3.0.25")
}
}
}
Expand Down
12 changes: 2 additions & 10 deletions instrumentation/zio/zio-2.0/javaagent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,9 @@ muzzle {
assertInverse.set(true)
}
}

otelJava {
maxJavaVersionSupported.set(JavaVersion.VERSION_17)
}

dependencies {
compileOnly("dev.zio:zio_$scalaVersion:$zioVersion")

testImplementation("dev.zio:zio_$scalaVersion:$zioVersion")

latestDepTestLibrary("dev.zio:zio_$scalaVersion:latest.release")
library("dev.zio:zio_$scalaVersion:$zioVersion")
testCompileOnly("org.scala-lang:scala-library:2.12.20")
}

tasks {
Expand Down