From aeca7300e1dc89922df5596c99172a301b576575 Mon Sep 17 00:00:00 2001
From: Darren Bolduc <dbolduc@google.com>
Date: Tue, 17 Dec 2024 20:06:58 -0500
Subject: [PATCH] chore: pin bazel to 7.4.1 (#375)

---
 pubsub-open-telemetry/.bazelrc        |  3 ++-
 pubsub-open-telemetry/.bazelversion   |  2 +-
 pubsub-open-telemetry/WORKSPACE.bazel | 32 +++++++++++++++++----------
 setup/.bazelversion                   |  1 +
 setup/WORKSPACE.bazel                 | 28 +++++++++++++----------
 5 files changed, 40 insertions(+), 26 deletions(-)
 create mode 100644 setup/.bazelversion

diff --git a/pubsub-open-telemetry/.bazelrc b/pubsub-open-telemetry/.bazelrc
index 6979214..f0f1c17 100644
--- a/pubsub-open-telemetry/.bazelrc
+++ b/pubsub-open-telemetry/.bazelrc
@@ -25,7 +25,6 @@ build:macos --cxxopt=-std=c++14
 build --experimental_convenience_symlinks=ignore
 
 # Enable OpenTelemetry tracing instrumentation for google-cloud-cpp.
-build --@io_opentelemetry_cpp//api:with_abseil
 build --@google_cloud_cpp//:enable_opentelemetry
 
 
@@ -62,3 +61,5 @@ build:tsan --action_env=TSAN_OPTIONS=halt_on_error=1:second_deadlock_stack=1:rep
 
 # --config otel2: Open Telemetery ABI version 2
 build:otel2 --cxxopt=-DOPENTELEMETRY_ABI_VERSION_NO=2
+
+build --noenable_bzlmod
diff --git a/pubsub-open-telemetry/.bazelversion b/pubsub-open-telemetry/.bazelversion
index ae9a76b..815da58 100644
--- a/pubsub-open-telemetry/.bazelversion
+++ b/pubsub-open-telemetry/.bazelversion
@@ -1 +1 @@
-8.0.0
+7.4.1
diff --git a/pubsub-open-telemetry/WORKSPACE.bazel b/pubsub-open-telemetry/WORKSPACE.bazel
index aa3e969..b89cc53 100644
--- a/pubsub-open-telemetry/WORKSPACE.bazel
+++ b/pubsub-open-telemetry/WORKSPACE.bazel
@@ -24,25 +24,33 @@ http_archive(
     url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.32.0.tar.gz",
 )
 
-load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
+load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
 
-google_cloud_cpp_deps()
+gl_cpp_workspace0()
 
-load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
+load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
 
-switched_rules_by_language(
-    name = "com_google_googleapis_imports",
-    cc = True,
-    grpc = True,
-)
+gl_cpp_workspace1()
+
+load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
+
+gl_cpp_workspace2()
+
+load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
+
+gl_cpp_workspace3()
+
+load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
+
+gl_cpp_workspace4()
 
-load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
+load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
 
-grpc_deps()
+gl_cpp_workspace5()
 
-load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
+load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps")
 
-grpc_extra_deps()
+opentelemetry_cpp_deps()
 
 # Boost
 http_archive(
diff --git a/setup/.bazelversion b/setup/.bazelversion
new file mode 100644
index 0000000..815da58
--- /dev/null
+++ b/setup/.bazelversion
@@ -0,0 +1 @@
+7.4.1
diff --git a/setup/WORKSPACE.bazel b/setup/WORKSPACE.bazel
index 5c76f90..0d8d625 100644
--- a/setup/WORKSPACE.bazel
+++ b/setup/WORKSPACE.bazel
@@ -27,23 +27,27 @@ http_archive(
 # [END cpp_setup_bazel_download]
 
 # [START cpp_setup_bazel_recurse]
-load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
+load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
 
-google_cloud_cpp_deps()
+gl_cpp_workspace0()
 
-load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
+load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
 
-switched_rules_by_language(
-    name = "com_google_googleapis_imports",
-    cc = True,
-    grpc = True,
-)
+gl_cpp_workspace1()
+
+load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
+
+gl_cpp_workspace2()
+
+load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
+
+gl_cpp_workspace3()
 
-load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
+load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
 
-grpc_deps()
+gl_cpp_workspace4()
 
-load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
+load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
 
-grpc_extra_deps()
+gl_cpp_workspace5()
 # [END cpp_setup_bazel_recurse]