From 162196a176db5b54c8e42fe7d86c46d3aa8bda02 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Nov 2026 21:30:35 +0000
Subject: [PATCH 1/2] build(deps): bump google-cloud-gax

Bumps the google-cloud group with 1 update in the /quickwit directory: [google-cloud-gax](https://github.com/googleapis/google-cloud-rust).


Updates `google-cloud-gax` from 0.19.2 to 1.15.0
- [Release notes](https://github.com/googleapis/google-cloud-rust/releases)
- [Commits](https://github.com/googleapis/google-cloud-rust/commits)

---
updated-dependencies:
- dependency-name: google-cloud-gax
  dependency-version: 1.15.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: google-cloud
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 quickwit/Cargo.lock | 93 ++++++++++++++++++++++++++++++++++-----------
 quickwit/Cargo.toml |  2 +-
 2 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
index 79841fcb371..b8b7b9b0c34 100644
--- a/quickwit/Cargo.lock
+++ b/quickwit/Cargo.lock
@@ -204,7 +204,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -215,7 +215,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1878,7 +1878,7 @@ version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3196,7 +3196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3789,6 +3789,26 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "google-cloud-gax"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc64ee071c0d22cb68662b454f1bea5424506cafeaddc51260fbc585bac1d29d"
+dependencies = [
+ "bytes",
+ "futures",
+ "google-cloud-rpc",
+ "google-cloud-wkt",
+ "http 1.5.0",
+ "pin-project",
+ "rand 0.10.3",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.21",
+ "tokio",
+ "tokio-stream",
+]
+
 [[package]]
 name = "google-cloud-googleapis"
 version = "0.16.1"
@@ -3820,7 +3840,7 @@ dependencies = [
  "async-channel 1.9.0",
  "async-stream",
  "google-cloud-auth",
- "google-cloud-gax",
+ "google-cloud-gax 0.19.2",
  "google-cloud-googleapis",
  "google-cloud-token",
  "prost-types 0.13.5",
@@ -3830,6 +3850,19 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "google-cloud-rpc"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2162c08a89118130979ba261080e960e44cdcb2d6e2ab8ca9b1da245285d353"
+dependencies = [
+ "bytes",
+ "google-cloud-wkt",
+ "serde",
+ "serde_json",
+ "serde_with",
+]
+
 [[package]]
 name = "google-cloud-token"
 version = "0.1.2"
@@ -3839,6 +3872,22 @@ dependencies = [
  "async-trait",
 ]
 
+[[package]]
+name = "google-cloud-wkt"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75baa147c141fa2b11047827e7ff4eea3a84ab00c3d2cf44fccd132b2ed326cf"
+dependencies = [
+ "base64 0.23.1",
+ "bytes",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "thiserror 2.0.21",
+ "time",
+ "url",
+]
+
 [[package]]
 name = "governor"
 version = "0.10.4"
@@ -4641,7 +4690,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5553,7 +5602,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5734,7 +5783,7 @@ version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "chrono",
  "getrandom 0.2.17",
  "http 1.5.0",
@@ -6176,7 +6225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -7802,7 +7851,7 @@ dependencies = [
  "fnv",
  "futures",
  "google-cloud-auth",
- "google-cloud-gax",
+ "google-cloud-gax 1.15.0",
  "google-cloud-googleapis",
  "google-cloud-pubsub",
  "itertools 0.15.0",
@@ -8483,7 +8532,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls 0.23.46",
- "socket2 0.5.10",
+ "socket2 0.6.5",
  "thiserror 2.0.21",
  "tokio",
  "tracing",
@@ -8522,9 +8571,9 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.10",
+ "socket2 0.6.5",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -9362,7 +9411,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -9442,7 +9491,7 @@ dependencies = [
  "security-framework",
  "security-framework-sys",
  "webpki-root-certs",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -9697,7 +9746,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -10238,7 +10287,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -10504,7 +10553,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "psm",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -10885,10 +10934,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand 2.5.0",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "once_cell",
  "rustix 1.1.5",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -10897,7 +10946,7 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8c27177b12a6399ffc08b98f76f7c9a1f4fe9fc967c784c5a071fa8d93cf7e1"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -12341,7 +12390,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml
index 10c9c222bf2..b97dae68961 100644
--- a/quickwit/Cargo.toml
+++ b/quickwit/Cargo.toml
@@ -94,7 +94,7 @@ glob = "0.3"
 # We can't directly update google-cloud-auth to 1.3 and google-cloud-gax to 1.4, because the latest version
 # of google-cloud-pubsub is "0.30" which explicitly depends on: google-cloud-auth ^0.17 and google-cloud-gax ^0.19.
 google-cloud-auth = { version = "0.17", default-features = false, features = ["rustls-tls"] }
-google-cloud-gax = "0.19"
+google-cloud-gax = "1.15"
 google-cloud-googleapis = { version = "0.16", features = ["pubsub"] }
 google-cloud-pubsub = { version = "0.30", default-features = false, features = ["auth", "rustls-tls"] }
 governor = "0.10"

From 0dd1aad593ababaf77540414ff957b7acdd52b7c Mon Sep 17 00:00:00 2001
From: "david.yaffe" <david.yaffe@datadoghq.com>
Date: Wed, 4 Nov 2026 20:22:51 +0000
Subject: [PATCH 2/2] Drop direct google-cloud-gax dependency

---
 quickwit/Cargo.lock                           | 52 +------------------
 quickwit/Cargo.toml                           |  6 +--
 quickwit/quickwit-indexing/Cargo.toml         |  2 -
 .../src/source/gcp_pubsub_source.rs           |  4 +-
 4 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
index b8b7b9b0c34..c90afb43dc9 100644
--- a/quickwit/Cargo.lock
+++ b/quickwit/Cargo.lock
@@ -3789,26 +3789,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "google-cloud-gax"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc64ee071c0d22cb68662b454f1bea5424506cafeaddc51260fbc585bac1d29d"
-dependencies = [
- "bytes",
- "futures",
- "google-cloud-rpc",
- "google-cloud-wkt",
- "http 1.5.0",
- "pin-project",
- "rand 0.10.3",
- "serde",
- "serde_json",
- "thiserror 2.0.21",
- "tokio",
- "tokio-stream",
-]
-
 [[package]]
 name = "google-cloud-googleapis"
 version = "0.16.1"
@@ -3840,7 +3820,7 @@ dependencies = [
  "async-channel 1.9.0",
  "async-stream",
  "google-cloud-auth",
- "google-cloud-gax 0.19.2",
+ "google-cloud-gax",
  "google-cloud-googleapis",
  "google-cloud-token",
  "prost-types 0.13.5",
@@ -3850,19 +3830,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "google-cloud-rpc"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2162c08a89118130979ba261080e960e44cdcb2d6e2ab8ca9b1da245285d353"
-dependencies = [
- "bytes",
- "google-cloud-wkt",
- "serde",
- "serde_json",
- "serde_with",
-]
-
 [[package]]
 name = "google-cloud-token"
 version = "0.1.2"
@@ -3872,22 +3839,6 @@ dependencies = [
  "async-trait",
 ]
 
-[[package]]
-name = "google-cloud-wkt"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75baa147c141fa2b11047827e7ff4eea3a84ab00c3d2cf44fccd132b2ed326cf"
-dependencies = [
- "base64 0.23.1",
- "bytes",
- "serde",
- "serde_json",
- "serde_with",
- "thiserror 2.0.21",
- "time",
- "url",
-]
-
 [[package]]
 name = "governor"
 version = "0.10.4"
@@ -7851,7 +7802,6 @@ dependencies = [
  "fnv",
  "futures",
  "google-cloud-auth",
- "google-cloud-gax 1.15.0",
  "google-cloud-googleapis",
  "google-cloud-pubsub",
  "itertools 0.15.0",
diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml
index b97dae68961..3d6421ea1b6 100644
--- a/quickwit/Cargo.toml
+++ b/quickwit/Cargo.toml
@@ -91,10 +91,10 @@ fnv = "1"
 futures = "0.3"
 futures-util = { version = "0.3", default-features = false }
 glob = "0.3"
-# We can't directly update google-cloud-auth to 1.3 and google-cloud-gax to 1.4, because the latest version
-# of google-cloud-pubsub is "0.30" which explicitly depends on: google-cloud-auth ^0.17 and google-cloud-gax ^0.19.
+# These are yoshidan's google-cloud-rust crates. Their crates.io names now belong to Google's official SDK,
+# with an unrelated API from google-cloud-auth 0.18, google-cloud-gax 0.20 and google-cloud-pubsub 0.31 on,
+# so they can't be bumped past google-cloud-pubsub 0.30 (which requires google-cloud-auth ^0.17).
 google-cloud-auth = { version = "0.17", default-features = false, features = ["rustls-tls"] }
-google-cloud-gax = "1.15"
 google-cloud-googleapis = { version = "0.16", features = ["pubsub"] }
 google-cloud-pubsub = { version = "0.30", default-features = false, features = ["auth", "rustls-tls"] }
 governor = "0.10"
diff --git a/quickwit/quickwit-indexing/Cargo.toml b/quickwit/quickwit-indexing/Cargo.toml
index a0dc08b0ee5..efc08674d09 100644
--- a/quickwit/quickwit-indexing/Cargo.toml
+++ b/quickwit/quickwit-indexing/Cargo.toml
@@ -24,7 +24,6 @@ flume = { workspace = true }
 fnv = { workspace = true }
 futures = { workspace = true }
 google-cloud-auth = { workspace = true, optional = true }
-google-cloud-gax = { workspace = true, optional = true }
 google-cloud-googleapis = { workspace = true, optional = true }
 google-cloud-pubsub = { workspace = true, optional = true }
 itertools = { workspace = true }
@@ -68,7 +67,6 @@ quickwit-storage = { workspace = true }
 [features]
 gcp-pubsub = [
   "dep:google-cloud-auth",
-  "dep:google-cloud-gax",
   "dep:google-cloud-googleapis",
   "dep:google-cloud-pubsub",
 ]
diff --git a/quickwit/quickwit-indexing/src/source/gcp_pubsub_source.rs b/quickwit/quickwit-indexing/src/source/gcp_pubsub_source.rs
index 53f26e46d00..bc7c6b84478 100644
--- a/quickwit/quickwit-indexing/src/source/gcp_pubsub_source.rs
+++ b/quickwit/quickwit-indexing/src/source/gcp_pubsub_source.rs
@@ -19,7 +19,6 @@ use anyhow::Context;
 use async_trait::async_trait;
 use bytes::Bytes;
 use google_cloud_auth::credentials::CredentialsFile;
-use google_cloud_gax::retry::RetrySetting;
 use google_cloud_pubsub::client::{Client, ClientConfig};
 use google_cloud_pubsub::subscription::Subscription;
 use quickwit_actors::{ActorExitStatus, Mailbox};
@@ -133,7 +132,8 @@ impl GcpPubSubSource {
             max_messages_per_pull=%max_messages_per_pull,
             "starting GCP PubSub source"
         );
-        if !subscription.exists(Some(RetrySetting::default())).await? {
+        // `None` makes the client use its default retry setting.
+        if !subscription.exists(None).await? {
             anyhow::bail!("GCP PubSub subscription `{subscription_name}` does not exist");
         }
         Ok(Self {