File tree Expand file tree Collapse file tree 8 files changed +10
-28
lines changed
conventions/src/main/kotlin
armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal
aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal
elasticsearch/elasticsearch-transport-5.3/javaagent Expand file tree Collapse file tree 8 files changed +10
-28
lines changed Original file line number Diff line number Diff line change @@ -63,7 +63,6 @@ tasks {
6363
6464 // TODO (trask) use animal sniffer
6565 disable(" Java8ApiChecker" )
66- disable(" AndroidJdkLibsChecker" )
6766
6867 // apparently disabling android doesn't disable this
6968 disable(" StaticOrDefaultInterfaceMethod" )
Original file line number Diff line number Diff line change @@ -12,15 +12,15 @@ dependencies {
1212}
1313
1414otelJava {
15- minJavaVersionSupported.set(JavaVersion .VERSION_17 )
15+ minJavaVersionSupported.set(JavaVersion .VERSION_21 )
1616}
1717
1818// We cannot use "--release" javac option here because that will forbid exporting com.sun.tools package.
1919// We also can't seem to use the toolchain without the "--release" option. So disable everything.
2020
2121java {
22- sourceCompatibility = JavaVersion .VERSION_17
23- targetCompatibility = JavaVersion .VERSION_17
22+ sourceCompatibility = JavaVersion .VERSION_21
23+ targetCompatibility = JavaVersion .VERSION_21
2424 toolchain {
2525 languageVersion.set(null as JavaLanguageVersion ? )
2626 }
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ val DEPENDENCY_BOMS = listOf(
3737
3838val autoServiceVersion = " 1.1.1"
3939val autoValueVersion = " 1.11.0"
40- val errorProneVersion = " 2.42 .0"
40+ val errorProneVersion = " 2.43 .0"
4141val byteBuddyVersion = " 1.17.8"
4242val asmVersion = " 9.9"
4343val jmhVersion = " 1.37"
Original file line number Diff line number Diff line change @@ -100,11 +100,6 @@ public InetSocketAddress getNetworkLocalInetSocketAddress(
100100 }
101101
102102 private static HttpRequest request (ServiceRequestContext ctx ) {
103- HttpRequest request = ctx .request ();
104- if (request == null ) {
105- throw new IllegalStateException (
106- "Context always has a request in decorators, this exception indicates a programming bug." );
107- }
108- return request ;
103+ return ctx .request ();
109104 }
110105}
Original file line number Diff line number Diff line change @@ -104,7 +104,7 @@ private GenAiOperationNameIncubatingValues() {}
104104 // used to approximate input/output token count for Cohere and Mistral AI models,
105105 // which don't provide these values in the response body.
106106 // https://docs.aws.amazon.com/bedrock/latest/userguide/model-customization-prepare.html
107- private static final Double CHARS_PER_TOKEN = 6.0 ;
107+ private static final double CHARS_PER_TOKEN = 6.0 ;
108108
109109 private enum ModelFamily {
110110 AMAZON_NOVA ,
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ muzzle {
3131if (findProperty(" testLatestDeps" ) as Boolean ) {
3232 // when running on jdk 21 Elasticsearch53SpringRepositoryTest occasionally fails with timeout
3333 otelJava {
34- maxJavaVersionSupported .set(JavaVersion .VERSION_17 )
34+ maxJavaVersionForTests .set(JavaVersion .VERSION_17 )
3535 }
3636}
3737
Original file line number Diff line number Diff line change @@ -18,10 +18,6 @@ muzzle {
1818 }
1919}
2020
21- otelJava {
22- maxJavaVersionSupported.set(JavaVersion .VERSION_17 )
23- }
24-
2521val grailsVersion = " 3.0.6" // first version that the tests pass on
2622val springBootVersion = " 1.2.5.RELEASE"
2723
@@ -57,7 +53,7 @@ if (!latestDepTest) {
5753 resolutionStrategy {
5854 eachDependency {
5955 if (requested.group == " org.codehaus.groovy" ) {
60- useVersion(" 3.0.9 " )
56+ useVersion(" 3.0.25 " )
6157 }
6258 }
6359 }
Original file line number Diff line number Diff line change @@ -27,17 +27,9 @@ muzzle {
2727 assertInverse.set(true )
2828 }
2929}
30-
31- otelJava {
32- maxJavaVersionSupported.set(JavaVersion .VERSION_17 )
33- }
34-
3530dependencies {
36- compileOnly(" dev.zio:zio_$scalaVersion :$zioVersion " )
37-
38- testImplementation(" dev.zio:zio_$scalaVersion :$zioVersion " )
39-
40- latestDepTestLibrary(" dev.zio:zio_$scalaVersion :latest.release" )
31+ library(" dev.zio:zio_$scalaVersion :$zioVersion " )
32+ testCompileOnly(" org.scala-lang:scala-library:2.12.20" )
4133}
4234
4335tasks {
You can’t perform that action at this time.
0 commit comments