Update dependencies and Otel to v1.29.0 (#508)

aws-observability · Aug 21, 2023 · 1ded1d0 · 1ded1d0
1 parent 72f8dfb
commit 1ded1d0
Show file tree

Hide file tree

Showing 97 changed files with 1,419 additions and 1,416 deletions.
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -27,25 +27,25 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
 // This is the version of the upstream instrumentation BOM
-val otelVersion = "1.28.0"
-val otelSnapshotVersion = "1.29.0"
+val otelVersion = "1.29.0"
+val otelSnapshotVersion = "1.30.0"
 val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
 val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
 // 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.529",
+  "com.amazonaws:aws-java-sdk-bom:1.12.533",
   "com.fasterxml.jackson:jackson-bom:2.15.2",
   "com.google.guava:guava-bom:32.1.2-jre",
-  "com.google.protobuf:protobuf-bom:3.23.4",
+  "com.google.protobuf:protobuf-bom:3.24.1",
   "com.linecorp.armeria:armeria-bom:1.24.3",
-  "io.grpc:grpc-bom:1.57.1",
+  "io.grpc:grpc-bom:1.57.2",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelAlphaVersion",
   "org.apache.logging.log4j:log4j-bom:2.20.0",
   "org.junit:junit-bom:5.10.0",
   "org.springframework.boot:spring-boot-dependencies:2.7.14",
-  "org.testcontainers:testcontainers-bom:1.18.3",
-  "software.amazon.awssdk:bom:2.20.122",
+  "org.testcontainers:testcontainers-bom:1.19.0",
+  "software.amazon.awssdk:bom:2.20.131",
 )
 
 val DEPENDENCY_SETS = listOf(

diff --git a/...tations-2.20.102.jar/META-INF/LICENSE.txt → ...tations-2.20.131.jar/META-INF/LICENSE.txt b/...tations-2.20.102.jar/META-INF/LICENSE.txt → ...tations-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...otations-2.20.102.jar/META-INF/NOTICE.txt → ...otations-2.20.131.jar/META-INF/NOTICE.txt b/...otations-2.20.102.jar/META-INF/NOTICE.txt → ...otations-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...-client-2.20.102.jar/META-INF/LICENSE.txt → ...-client-2.20.131.jar/META-INF/LICENSE.txt b/...-client-2.20.102.jar/META-INF/LICENSE.txt → ...-client-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...e-client-2.20.102.jar/META-INF/NOTICE.txt → ...e-client-2.20.131.jar/META-INF/NOTICE.txt b/...e-client-2.20.102.jar/META-INF/NOTICE.txt → ...e-client-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/licenses/armeria-1.24.2.jar/META-INF/LICENSE → licenses/armeria-1.24.3.jar/META-INF/LICENSE b/licenses/armeria-1.24.2.jar/META-INF/LICENSE → licenses/armeria-1.24.3.jar/META-INF/LICENSE
diff --git a/...es/arns-2.20.102.jar/META-INF/LICENSE.txt → ...es/arns-2.20.131.jar/META-INF/LICENSE.txt b/...es/arns-2.20.102.jar/META-INF/LICENSE.txt → ...es/arns-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...ses/arns-2.20.102.jar/META-INF/NOTICE.txt → ...ses/arns-2.20.131.jar/META-INF/NOTICE.txt b/...ses/arns-2.20.102.jar/META-INF/NOTICE.txt → ...ses/arns-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...es/auth-2.20.102.jar/META-INF/LICENSE.txt → ...es/auth-2.20.131.jar/META-INF/LICENSE.txt b/...es/auth-2.20.102.jar/META-INF/LICENSE.txt → ...es/auth-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...ses/auth-2.20.102.jar/META-INF/NOTICE.txt → ...ses/auth-2.20.131.jar/META-INF/NOTICE.txt b/...ses/auth-2.20.102.jar/META-INF/NOTICE.txt → ...ses/auth-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...ws-core-2.20.102.jar/META-INF/LICENSE.txt → ...ws-core-2.20.131.jar/META-INF/LICENSE.txt b/...ws-core-2.20.102.jar/META-INF/LICENSE.txt → ...ws-core-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...aws-core-2.20.102.jar/META-INF/NOTICE.txt → ...aws-core-2.20.131.jar/META-INF/NOTICE.txt b/...aws-core-2.20.102.jar/META-INF/NOTICE.txt → ...aws-core-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...rotocol-2.20.102.jar/META-INF/LICENSE.txt → ...rotocol-2.20.131.jar/META-INF/LICENSE.txt b/...rotocol-2.20.102.jar/META-INF/LICENSE.txt → ...rotocol-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...protocol-2.20.102.jar/META-INF/NOTICE.txt → ...protocol-2.20.131.jar/META-INF/NOTICE.txt b/...protocol-2.20.102.jar/META-INF/NOTICE.txt → ...protocol-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...rotocol-2.20.102.jar/META-INF/LICENSE.txt → ...rotocol-2.20.131.jar/META-INF/LICENSE.txt b/...rotocol-2.20.102.jar/META-INF/LICENSE.txt → ...rotocol-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...protocol-2.20.102.jar/META-INF/NOTICE.txt → ...protocol-2.20.131.jar/META-INF/NOTICE.txt b/...protocol-2.20.102.jar/META-INF/NOTICE.txt → ...protocol-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...es/byte-buddy-1.14.5.jar/META-INF/LICENSE → ...es/byte-buddy-1.14.6.jar/META-INF/LICENSE b/...es/byte-buddy-1.14.5.jar/META-INF/LICENSE → ...es/byte-buddy-1.14.6.jar/META-INF/LICENSE
diff --git a/...ses/byte-buddy-1.14.5.jar/META-INF/NOTICE → ...ses/byte-buddy-1.14.6.jar/META-INF/NOTICE b/...ses/byte-buddy-1.14.5.jar/META-INF/NOTICE → ...ses/byte-buddy-1.14.6.jar/META-INF/NOTICE
diff --git a/...rt-core-2.20.102.jar/META-INF/LICENSE.txt → ...rt-core-2.20.131.jar/META-INF/LICENSE.txt b/...rt-core-2.20.102.jar/META-INF/LICENSE.txt → ...rt-core-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...crt-core-2.20.102.jar/META-INF/NOTICE.txt → ...crt-core-2.20.131.jar/META-INF/NOTICE.txt b/...crt-core-2.20.102.jar/META-INF/NOTICE.txt → ...crt-core-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...nts-spi-2.20.102.jar/META-INF/LICENSE.txt → ...nts-spi-2.20.131.jar/META-INF/LICENSE.txt b/...nts-spi-2.20.102.jar/META-INF/LICENSE.txt → ...nts-spi-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...ints-spi-2.20.102.jar/META-INF/NOTICE.txt → ...ints-spi-2.20.131.jar/META-INF/NOTICE.txt b/...ints-spi-2.20.102.jar/META-INF/NOTICE.txt → ...ints-spi-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...ses/guava-32.1.1-jre.jar/META-INF/LICENSE → ...ses/guava-32.1.2-jre.jar/META-INF/LICENSE b/...ses/guava-32.1.1-jre.jar/META-INF/LICENSE → ...ses/guava-32.1.2-jre.jar/META-INF/LICENSE
diff --git a/...ent-spi-2.20.102.jar/META-INF/LICENSE.txt → ...ent-spi-2.20.131.jar/META-INF/LICENSE.txt b/...ent-spi-2.20.102.jar/META-INF/LICENSE.txt → ...ent-spi-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...ient-spi-2.20.102.jar/META-INF/NOTICE.txt → ...ient-spi-2.20.131.jar/META-INF/NOTICE.txt b/...ient-spi-2.20.102.jar/META-INF/NOTICE.txt → ...ient-spi-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...n-utils-2.20.102.jar/META-INF/LICENSE.txt → ...n-utils-2.20.131.jar/META-INF/LICENSE.txt b/...n-utils-2.20.102.jar/META-INF/LICENSE.txt → ...n-utils-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...on-utils-2.20.102.jar/META-INF/NOTICE.txt → ...on-utils-2.20.131.jar/META-INF/NOTICE.txt b/...on-utils-2.20.102.jar/META-INF/NOTICE.txt → ...on-utils-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/licenses/licenses.md b/licenses/licenses.md
diff --git a/...ics-spi-2.20.102.jar/META-INF/LICENSE.txt → ...ics-spi-2.20.131.jar/META-INF/LICENSE.txt b/...ics-spi-2.20.102.jar/META-INF/LICENSE.txt → ...ics-spi-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...rics-spi-2.20.102.jar/META-INF/NOTICE.txt → ...rics-spi-2.20.131.jar/META-INF/NOTICE.txt b/...rics-spi-2.20.102.jar/META-INF/NOTICE.txt → ...rics-spi-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...-client-2.20.102.jar/META-INF/LICENSE.txt → ...-client-2.20.131.jar/META-INF/LICENSE.txt b/...-client-2.20.102.jar/META-INF/LICENSE.txt → ...-client-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...o-client-2.20.102.jar/META-INF/NOTICE.txt → ...o-client-2.20.131.jar/META-INF/NOTICE.txt b/...o-client-2.20.102.jar/META-INF/NOTICE.txt → ...o-client-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...rofiles-2.20.102.jar/META-INF/LICENSE.txt → ...rofiles-2.20.131.jar/META-INF/LICENSE.txt b/...rofiles-2.20.102.jar/META-INF/LICENSE.txt → ...rofiles-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...profiles-2.20.102.jar/META-INF/NOTICE.txt → ...profiles-2.20.131.jar/META-INF/NOTICE.txt b/...profiles-2.20.102.jar/META-INF/NOTICE.txt → ...profiles-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...ol-core-2.20.102.jar/META-INF/LICENSE.txt → ...ol-core-2.20.131.jar/META-INF/LICENSE.txt b/...ol-core-2.20.102.jar/META-INF/LICENSE.txt → ...ol-core-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...col-core-2.20.102.jar/META-INF/NOTICE.txt → ...col-core-2.20.131.jar/META-INF/NOTICE.txt b/...col-core-2.20.102.jar/META-INF/NOTICE.txt → ...col-core-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...regions-2.20.102.jar/META-INF/LICENSE.txt → ...regions-2.20.131.jar/META-INF/LICENSE.txt b/...regions-2.20.102.jar/META-INF/LICENSE.txt → ...regions-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/.../regions-2.20.102.jar/META-INF/NOTICE.txt → .../regions-2.20.131.jar/META-INF/NOTICE.txt b/.../regions-2.20.102.jar/META-INF/NOTICE.txt → .../regions-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...nses/s3-2.20.102.jar/META-INF/LICENSE.txt → ...nses/s3-2.20.131.jar/META-INF/LICENSE.txt b/...nses/s3-2.20.102.jar/META-INF/LICENSE.txt → ...nses/s3-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/licenses/s3-2.20.102.jar/META-INF/NOTICE.txt → licenses/s3-2.20.131.jar/META-INF/NOTICE.txt b/licenses/s3-2.20.102.jar/META-INF/NOTICE.txt → licenses/s3-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...dk-core-2.20.102.jar/META-INF/LICENSE.txt → ...dk-core-2.20.131.jar/META-INF/LICENSE.txt b/...dk-core-2.20.102.jar/META-INF/LICENSE.txt → ...dk-core-2.20.131.jar/META-INF/LICENSE.txt
diff --git a/...sdk-core-2.20.102.jar/META-INF/NOTICE.txt → ...sdk-core-2.20.131.jar/META-INF/NOTICE.txt b/...sdk-core-2.20.102.jar/META-INF/NOTICE.txt → ...sdk-core-2.20.131.jar/META-INF/NOTICE.txt
diff --git a/...pring-aop-5.3.28.jar/META-INF/license.txt → ...pring-aop-5.3.29.jar/META-INF/license.txt b/...pring-aop-5.3.28.jar/META-INF/license.txt → ...pring-aop-5.3.29.jar/META-INF/license.txt
diff --git a/...ng-context-5.3.28.jar/META-INF/notice.txt → ...spring-aop-5.3.29.jar/META-INF/notice.txt b/...ng-context-5.3.28.jar/META-INF/notice.txt → ...spring-aop-5.3.29.jar/META-INF/notice.txt
diff --git a/...g-context-5.3.28.jar/META-INF/license.txt → ...ing-beans-5.3.29.jar/META-INF/license.txt b/...g-context-5.3.28.jar/META-INF/license.txt → ...ing-beans-5.3.29.jar/META-INF/license.txt
diff --git a/...spring-aop-5.3.28.jar/META-INF/notice.txt → ...ring-beans-5.3.29.jar/META-INF/notice.txt b/...spring-aop-5.3.28.jar/META-INF/notice.txt → ...ring-beans-5.3.29.jar/META-INF/notice.txt
diff --git a/...ring-boot-2.7.13.jar/META-INF/LICENSE.txt → ...ring-boot-2.7.14.jar/META-INF/LICENSE.txt b/...ring-boot-2.7.13.jar/META-INF/LICENSE.txt → ...ring-boot-2.7.14.jar/META-INF/LICENSE.txt
diff --git a/...pring-boot-2.7.13.jar/META-INF/NOTICE.txt → ...pring-boot-2.7.14.jar/META-INF/NOTICE.txt b/...pring-boot-2.7.13.jar/META-INF/NOTICE.txt → ...pring-boot-2.7.14.jar/META-INF/NOTICE.txt
diff --git a/...configure-2.7.13.jar/META-INF/LICENSE.txt → ...configure-2.7.14.jar/META-INF/LICENSE.txt b/...configure-2.7.13.jar/META-INF/LICENSE.txt → ...configure-2.7.14.jar/META-INF/LICENSE.txt
diff --git a/...oconfigure-2.7.13.jar/META-INF/NOTICE.txt → ...oconfigure-2.7.14.jar/META-INF/NOTICE.txt b/...oconfigure-2.7.13.jar/META-INF/NOTICE.txt → ...oconfigure-2.7.14.jar/META-INF/NOTICE.txt
diff --git a/...t-starter-2.7.13.jar/META-INF/LICENSE.txt → ...t-starter-2.7.14.jar/META-INF/LICENSE.txt b/...t-starter-2.7.13.jar/META-INF/LICENSE.txt → ...t-starter-2.7.14.jar/META-INF/LICENSE.txt
diff --git a/...ot-starter-2.7.13.jar/META-INF/NOTICE.txt → ...ot-starter-2.7.14.jar/META-INF/NOTICE.txt b/...ot-starter-2.7.13.jar/META-INF/NOTICE.txt → ...ot-starter-2.7.14.jar/META-INF/NOTICE.txt
diff --git a/...rter-json-2.7.13.jar/META-INF/LICENSE.txt → ...rter-json-2.7.14.jar/META-INF/LICENSE.txt b/...rter-json-2.7.13.jar/META-INF/LICENSE.txt → ...rter-json-2.7.14.jar/META-INF/LICENSE.txt
diff --git a/...arter-json-2.7.13.jar/META-INF/NOTICE.txt → ...arter-json-2.7.14.jar/META-INF/NOTICE.txt b/...arter-json-2.7.13.jar/META-INF/NOTICE.txt → ...arter-json-2.7.14.jar/META-INF/NOTICE.txt
diff --git a/licenses/spring-boot-starter-logging-2.7.13.jar/META-INF/NOTICE.txt b/licenses/spring-boot-starter-logging-2.7.13.jar/META-INF/NOTICE.txt
diff --git a/...r-logging-2.7.13.jar/META-INF/LICENSE.txt → ...r-logging-2.7.14.jar/META-INF/LICENSE.txt b/...r-logging-2.7.13.jar/META-INF/LICENSE.txt → ...r-logging-2.7.14.jar/META-INF/LICENSE.txt
diff --git a/licenses/spring-boot-starter-logging-2.7.14.jar/META-INF/NOTICE.txt b/licenses/spring-boot-starter-logging-2.7.14.jar/META-INF/NOTICE.txt
diff --git a/licenses/spring-boot-starter-tomcat-2.7.13.jar/META-INF/NOTICE.txt b/licenses/spring-boot-starter-tomcat-2.7.13.jar/META-INF/NOTICE.txt
diff --git a/...er-tomcat-2.7.13.jar/META-INF/LICENSE.txt → ...er-tomcat-2.7.14.jar/META-INF/LICENSE.txt b/...er-tomcat-2.7.13.jar/META-INF/LICENSE.txt → ...er-tomcat-2.7.14.jar/META-INF/LICENSE.txt
diff --git a/licenses/spring-boot-starter-tomcat-2.7.14.jar/META-INF/NOTICE.txt b/licenses/spring-boot-starter-tomcat-2.7.14.jar/META-INF/NOTICE.txt
diff --git a/licenses/spring-boot-starter-web-2.7.13.jar/META-INF/NOTICE.txt b/licenses/spring-boot-starter-web-2.7.13.jar/META-INF/NOTICE.txt
diff --git a/...arter-web-2.7.13.jar/META-INF/LICENSE.txt → ...arter-web-2.7.14.jar/META-INF/LICENSE.txt b/...arter-web-2.7.13.jar/META-INF/LICENSE.txt → ...arter-web-2.7.14.jar/META-INF/LICENSE.txt
diff --git a/licenses/spring-boot-starter-web-2.7.14.jar/META-INF/NOTICE.txt b/licenses/spring-boot-starter-web-2.7.14.jar/META-INF/NOTICE.txt
diff --git a/...ing-beans-5.3.28.jar/META-INF/license.txt → ...g-context-5.3.29.jar/META-INF/license.txt b/...ing-beans-5.3.28.jar/META-INF/license.txt → ...g-context-5.3.29.jar/META-INF/license.txt
diff --git a/...pring-core-5.3.28.jar/META-INF/notice.txt → ...ng-context-5.3.29.jar/META-INF/notice.txt b/...pring-core-5.3.28.jar/META-INF/notice.txt → ...ng-context-5.3.29.jar/META-INF/notice.txt
diff --git a/...ring-core-5.3.28.jar/META-INF/license.txt → ...ring-core-5.3.29.jar/META-INF/license.txt b/...ring-core-5.3.28.jar/META-INF/license.txt → ...ring-core-5.3.29.jar/META-INF/license.txt
diff --git a/...ring-beans-5.3.28.jar/META-INF/notice.txt → ...pring-core-5.3.29.jar/META-INF/notice.txt b/...ring-beans-5.3.28.jar/META-INF/notice.txt → ...pring-core-5.3.29.jar/META-INF/notice.txt