feat: mark opentelemetry as required in build files (#15830)

Author: mpeddada1

.bazelrc

@@ -54,9 +54,6 @@ build --experimental_ui_max_stdouterr_bytes=-1
 # in a random order to help expose undesirable interdependencies.
 test --test_env=GTEST_SHUFFLE --test_env=GTEST_RANDOM_SEED
 
-# By default, build the library with OpenTelemetry
-build --//:enable_opentelemetry
-
 # Don't show warnings when building external dependencies. This still shows
 # warnings when using these dependencies (say in headers).
 build --output_filter='^//((?!(external):).)*$'

BUILD.bazel

@@ -254,8 +254,3 @@ cc_library(
         "//google/cloud:google_cloud_cpp_universe_domain",
     ],
 )
-
-bool_flag(
-    name = "enable_opentelemetry",
-    build_setting_default = False,
-)

bazel/workspace0.bzl

@@ -274,8 +274,7 @@ def gl_cpp_workspace0(name = None):
     )
 
     # Open Telemetry
-    maybe(
-        http_archive,
+    http_archive(
         name = "opentelemetry-cpp",
         urls = [
             "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz",

ci/abi-dumps/google_cloud_cpp_storage_grpc.expected.abi.dump.gz

@@ -302,7 +302,8 @@ export_libraries_bzl()
 #   other feature, or even if no features are enabled.
 # ~~~
 macro (google_cloud_cpp_enable_deps)
-    find_package(opentelemetry-cpp CONFIG)
+    list(APPEND GOOGLE_CLOUD_CPP_ENABLE monitoring trace opentelemetry
+         universe_domain)
     if (__ga_libraries__ IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
         list(APPEND GOOGLE_CLOUD_CPP_ENABLE ${GOOGLE_CLOUD_CPP_GA_LIBRARIES})
         list(APPEND GOOGLE_CLOUD_CPP_ENABLE
@@ -341,11 +342,6 @@ macro (google_cloud_cpp_enable_deps)
     if (asset IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
         list(INSERT GOOGLE_CLOUD_CPP_ENABLE 0 accesscontextmanager osconfig)
     endif ()
-    if (bigtable IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
-        if (opentelemetry-cpp_FOUND)
-            list(INSERT GOOGLE_CLOUD_CPP_ENABLE 0 opentelemetry)
-        endif ()
-    endif ()
     if (contentwarehouse IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
         list(INSERT GOOGLE_CLOUD_CPP_ENABLE 0 documentai)
     endif ()
@@ -360,9 +356,6 @@ macro (google_cloud_cpp_enable_deps)
         OR (experimental-storage_grpc IN_LIST GOOGLE_CLOUD_CPP_ENABLE))
         list(INSERT GOOGLE_CLOUD_CPP_ENABLE 0 storage)
     endif ()
-    if (opentelemetry IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
-        list(INSERT GOOGLE_CLOUD_CPP_ENABLE 0 monitoring trace opentelemetry)
-    endif ()
 endmacro ()
 
 # Cleanup the "GOOGLE_CLOUD_CPP_ENABLE" variable. Remove duplicates, and set

ci/cloudbuild/builds/otel-disabled-bazel.sh

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 #include "generator/integration_tests/golden/v1/internal/request_id_tracing_stub.h"
 #include "generator/integration_tests/golden/v1/internal/request_id_connection_impl.h"
 #include "generator/integration_tests/golden/v1/internal/request_id_option_defaults.h"
@@ -39,27 +37,16 @@ namespace {
 using ::google::cloud::golden_v1_testing::MockRequestIdServiceStub;
 using ::google::cloud::testing_util::InstallSpanCatcher;
 using ::google::cloud::testing_util::OTelAttribute;
-using ::google::cloud::testing_util::OTelContextCaptured;
 using ::google::cloud::testing_util::SpanHasAttributes;
-using ::google::cloud::testing_util::SpanHasInstrumentationScope;
-using ::google::cloud::testing_util::SpanKindIsClient;
 using ::google::cloud::testing_util::SpanNamed;
-using ::google::cloud::testing_util::SpanWithStatus;
 using ::google::cloud::testing_util::ThereIsAnActiveSpan;
 using ::google::cloud::testing_util::ValidatePropagator;
 using ::google::test::requestid::v1::CreateFooRequest;
 using ::google::test::requestid::v1::Foo;
-using ::google::test::requestid::v1::ListFoosRequest;
-using ::google::test::requestid::v1::ListFoosResponse;
 using ::google::test::requestid::v1::RenameFooRequest;
-using ::testing::_;
-using ::testing::ByMove;
 using ::testing::ElementsAre;
-using ::testing::Eq;
 using ::testing::IsEmpty;
 using ::testing::Not;
-using ::testing::ResultOf;
-using ::testing::Return;
 
 Status TransientError() {
   return Status(StatusCode::kUnavailable, "try-again");
@@ -214,5 +201,3 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1
 }  // namespace cloud
 }  // namespace google
-
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY

ci/cloudbuild/triggers/otel-disabled-bazel-ci.yaml

@@ -44,13 +44,6 @@ capture_build_info(
     ],
 )
 
-config_setting(
-    name = "enable_opentelemetry",
-    flag_values = {
-        "//:enable_opentelemetry": "true",
-    },
-)
-
 filegroup(
     name = "common_hdrs",
     srcs = [h for h in google_cloud_cpp_common_hdrs if not h.startswith("internal/")],
@@ -61,13 +54,10 @@ cc_library(
     name = "google_cloud_cpp_common_private",
     srcs = google_cloud_cpp_common_srcs + ["internal/build_info.cc"],
     hdrs = google_cloud_cpp_common_hdrs,
-    defines = select({
-        ":enable_opentelemetry": [
-            # Enable OpenTelemetry features in google-cloud-cpp
-            "GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY",
-        ],
-        "//conditions:default": [],
-    }),
+    defines = [
+        # Enable OpenTelemetry features in google-cloud-cpp
+        "GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY",
+    ],
     linkopts = select({
         "@platforms//os:windows": [
             "-DEFAULTLIB:bcrypt.lib",
@@ -94,12 +84,8 @@ cc_library(
         "@abseil-cpp//absl/types:optional",
         "@abseil-cpp//absl/types:span",
         "@abseil-cpp//absl/types:variant",
+        "@opentelemetry-cpp//api",
     ] + select({
-        ":enable_opentelemetry": [
-            "@opentelemetry-cpp//api",
-        ],
-        "//conditions:default": [],
-    }) + select({
         "@platforms//os:windows": [],
         "//conditions:default": [
             "@boringssl//:crypto",