Skip to content

Commit e7dc6a7

Browse files
author
Anuraag Agrawal
authored
Update to OTel 1.9 and other deps (#118)
* Update to OTel 1.9 and other deps. * Update licenses * 1.9.1 * Update contrib dependency and add snippet for java 17 compilation
1 parent 0247a45 commit e7dc6a7

File tree

130 files changed

+1597
-1614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+1597
-1614
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,22 @@ data class DependencySet(val group: String, val version: String, val modules: Li
2626

2727
val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
2828

29-
val otelVersion = "1.7.1"
30-
val otelJavaagentVersion = "1.7.2"
31-
val otelSnapshotVersion = "1.8.0"
29+
val otelVersion = "1.9.1"
30+
val otelSnapshotVersion = "1.10.0"
3231

3332
val DEPENDENCY_BOMS = listOf(
34-
"com.amazonaws:aws-java-sdk-bom:1.12.91",
33+
"com.amazonaws:aws-java-sdk-bom:1.12.118",
3534
"com.fasterxml.jackson:jackson-bom:2.13.0",
3635
"com.google.guava:guava-bom:31.0.1-jre",
37-
"com.google.protobuf:protobuf-bom:3.18.1",
38-
"com.linecorp.armeria:armeria-bom:1.13.0",
39-
"io.grpc:grpc-bom:1.41.0",
36+
"com.google.protobuf:protobuf-bom:3.19.1",
37+
"com.linecorp.armeria:armeria-bom:1.13.3",
38+
"io.grpc:grpc-bom:1.42.1",
4039
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"}",
4140
"org.apache.logging.log4j:log4j-bom:2.14.1",
4241
"org.junit:junit-bom:5.8.1",
43-
"org.springframework.boot:spring-boot-dependencies:2.5.5",
44-
"org.testcontainers:testcontainers-bom:1.16.1",
45-
"software.amazon.awssdk:bom:2.17.63"
42+
"org.springframework.boot:spring-boot-dependencies:2.6.0",
43+
"org.testcontainers:testcontainers-bom:1.16.2",
44+
"software.amazon.awssdk:bom:2.17.89"
4645
)
4746

4847
val DEPENDENCY_SETS = listOf(
@@ -69,10 +68,11 @@ val DEPENDENCY_SETS = listOf(
6968
val DEPENDENCIES = listOf(
7069
"commons-logging:commons-logging:1.2",
7170
"com.sparkjava:spark-core:2.9.3",
72-
"com.squareup.okhttp3:okhttp:4.9.2",
73-
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.6.0",
74-
"io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) otelJavaagentVersion else "$otelSnapshotVersion-SNAPSHOT"}",
75-
"net.bytebuddy:byte-buddy:1.11.21"
71+
"com.squareup.okhttp3:okhttp:4.9.3",
72+
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.9.0",
73+
"io.opentelemetry.proto:opentelemetry-proto:0.11.0-alpha",
74+
"io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"}",
75+
"net.bytebuddy:byte-buddy:1.12.2"
7676
)
7777

7878
javaPlatform {

gradle.properties

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,16 @@ org.gradle.parallel=true
22
org.gradle.caching=true
33

44
org.gradle.priority=low
5+
6+
# Workaround https://github.com/diffplug/spotless/issues/834
7+
org.gradle.jvmargs= \
8+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
9+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
10+
--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
11+
--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
12+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
13+
--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
14+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
15+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
16+
--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
17+
--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

0 commit comments

Comments
 (0)