Update dependencies and Otel to v1.20.2 (#285)

Author: rapphil

awsagentprovider/build.gradle.kts

@@ -27,8 +27,10 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
   compileOnly("org.slf4j:slf4j-api")
 
-  implementation("io.opentelemetry:opentelemetry-sdk-extension-aws")
+  // Trace ID Generation and Sampling Rules
   implementation("io.opentelemetry.contrib:opentelemetry-aws-xray")
+  // AWS Resource Detectors
+  implementation("io.opentelemetry.contrib:opentelemetry-aws-resources")
 
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")

build.gradle.kts

@@ -163,7 +163,11 @@ allprojects {
         mergeServiceFiles()
 
         // rewrite library instrumentation dependencies
-        relocate("io.opentelemetry.instrumentation", "io.opentelemetry.javaagent.shaded.instrumentation")
+        relocate("io.opentelemetry.instrumentation", "io.opentelemetry.javaagent.shaded.instrumentation") {
+          // As per https://github.com/open-telemetry/opentelemetry-java/issues/4919#issuecomment-1305774636
+          exclude("io.opentelemetry.instrumentation.resources.*")
+          exclude("io.opentelemetry.instrumentation.spring.resources.*")
+        }
 
         // rewrite dependencies calling Logger.getLogger
         relocate("java.util.logging.Logger", "io.opentelemetry.javaagent.bootstrap.PatchLogger")

dependencyManagement/build.gradle.kts

@@ -26,25 +26,25 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 
 val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
-// This is the only version that affects the released artifact.
-val otelVersion = "1.19.2"
-val otelSnapshotVersion = "1.20.0"
+// This is the version of the upstream instrumentation BOM
+val otelVersion = "1.20.2"
+val otelSnapshotVersion = "1.21.0"
 
 // All versions below are only used in testing and do not affect the released artifact.
 
 val DEPENDENCY_BOMS = listOf(
-  "com.amazonaws:aws-java-sdk-bom:1.12.341",
-  "com.fasterxml.jackson:jackson-bom:2.14.0",
+  "com.amazonaws:aws-java-sdk-bom:1.12.353",
+  "com.fasterxml.jackson:jackson-bom:2.14.1",
   "com.google.guava:guava-bom:31.1-jre",
-  "com.google.protobuf:protobuf-bom:3.21.9",
+  "com.google.protobuf:protobuf-bom:3.21.10",
   "com.linecorp.armeria:armeria-bom:1.20.3",
-  "io.grpc:grpc-bom:1.50.2",
+  "io.grpc:grpc-bom:1.51.0",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"}",
   "org.apache.logging.log4j:log4j-bom:2.19.0",
   "org.junit:junit-bom:5.9.1",
   "org.springframework.boot:spring-boot-dependencies:2.7.5",
-  "org.testcontainers:testcontainers-bom:1.17.5",
-  "software.amazon.awssdk:bom:2.18.11"
+  "org.testcontainers:testcontainers-bom:1.17.6",
+  "software.amazon.awssdk:bom:2.18.29"
 )
 
 val DEPENDENCY_SETS = listOf(
@@ -72,7 +72,8 @@ val DEPENDENCIES = listOf(
   "commons-logging:commons-logging:1.2",
   "com.sparkjava:spark-core:2.9.4",
   "com.squareup.okhttp3:okhttp:4.10.0",
-  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.19.1",
+  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.20.1",
+  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.20.1-alpha",
   "io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha",
   "io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"}",
   "net.bytebuddy:byte-buddy:1.12.19"