diff --git a/CHANGELOG.md b/CHANGELOG.md index 56ff3d11bde8c..e5475533e751d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `ch.qos.logback:logback-core` from 1.5.16 to 1.5.17 ([#17609](https://github.com/opensearch-project/OpenSearch/pull/17609)) - Bump `org.jruby.joni:joni` from 2.2.3 to 2.2.5 ([#17608](https://github.com/opensearch-project/OpenSearch/pull/17608)) - Bump `dangoslen/dependabot-changelog-helper` from 3 to 4 ([#17498](https://github.com/opensearch-project/OpenSearch/pull/17498)) +- Bump `com.google.api:gax` from 2.35.0 to 2.63.1 ([#17465](https://github.com/opensearch-project/OpenSearch/pull/17465)) ### Changed diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 4e772118e18d5..515ad4c3bc0ed 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -49,7 +49,7 @@ opensearchplugin { dependencies { api 'com.google.api:api-common:2.46.1' - api 'com.google.api:gax:2.35.0' + api 'com.google.api:gax:2.63.1' api 'com.google.api:gax-httpjson:2.42.0' api 'com.google.apis:google-api-services-storage:v1-rev20230617-2.0.0' @@ -202,9 +202,26 @@ thirdPartyAudit { 'javax.jms.Message', 'javax.servlet.ServletContextEvent', 'javax.servlet.ServletContextListener', - // Bump for gax 2.42.0 - 'com.google.api.gax.rpc.EndpointContext', - 'com.google.api.gax.rpc.RequestMutator' + + // opentelemetry-api is an optional dependency of com.google.api:gax + 'io.opentelemetry.api.OpenTelemetry', + 'io.opentelemetry.api.common.Attributes', + 'io.opentelemetry.api.common.AttributesBuilder', + 'io.opentelemetry.api.metrics.DoubleHistogram', + 'io.opentelemetry.api.metrics.DoubleHistogramBuilder', + 'io.opentelemetry.api.metrics.LongCounter', + 'io.opentelemetry.api.metrics.LongCounterBuilder', + 'io.opentelemetry.api.metrics.Meter', + 'io.opentelemetry.api.metrics.MeterBuilder', + + // slf4j is an optional dependency of com.google.api:gax + 'org.slf4j.ILoggerFactory', + 'org.slf4j.Logger', + 'org.slf4j.LoggerFactory', + 'org.slf4j.MDC', + 'org.slf4j.event.Level', + 'org.slf4j.helpers.NOPLogger', + 'org.slf4j.spi.LoggingEventBuilder' ) } diff --git a/plugins/repository-gcs/licenses/gax-2.35.0.jar.sha1 b/plugins/repository-gcs/licenses/gax-2.35.0.jar.sha1 deleted file mode 100644 index 778922c637dc1..0000000000000 --- a/plugins/repository-gcs/licenses/gax-2.35.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -98d52034cfa6d1b881e16f418894afcfacd89b7a \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/gax-2.63.1.jar.sha1 b/plugins/repository-gcs/licenses/gax-2.63.1.jar.sha1 new file mode 100644 index 0000000000000..d438c0b04fcb9 --- /dev/null +++ b/plugins/repository-gcs/licenses/gax-2.63.1.jar.sha1 @@ -0,0 +1 @@ +6c9a340608a63e24dc8acd8da84afd8ffecca4b7 \ No newline at end of file