feat: remove ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY from generator and golden tests

Author: mpeddada1

generator/integration_tests/tests/golden_kitchen_sink_connection_test.cc

@@ -371,7 +371,6 @@ TEST(GoldenKitchenSinkConnectionTest, CheckExpectedOptions) {
               Contains(ContainsRegex("Unexpected option.+UnexpectedOption")));
 }
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 using ::google::cloud::testing_util::DisableTracing;
 using ::google::cloud::testing_util::EnableTracing;
 using ::google::cloud::testing_util::SpanNamed;
@@ -417,8 +416,6 @@ TEST(GoldenKitchenSinkConnectionTest, TracingDisabled) {
                   "golden_v1::GoldenKitchenSinkConnection::DoNothing"))));
 }
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 }  // namespace
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1

generator/integration_tests/tests/golden_kitchen_sink_rest_connection_test.cc

@@ -329,7 +329,6 @@ TEST(GoldenKitchenSinkConnectionTest, CheckExpectedOptions) {
               Contains(ContainsRegex("Unexpected option.+UnexpectedOption")));
 }
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 using ::google::cloud::testing_util::DisableTracing;
 using ::google::cloud::testing_util::EnableTracing;
 using ::google::cloud::testing_util::SpanNamed;
@@ -374,8 +373,6 @@ TEST(GoldenKitchenSinkConnectionTest, TracingDisabled) {
               Not(Contains(SpanNamed(
                   "golden_v1::GoldenKitchenSinkConnection::DoNothing"))));
 }
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 }  // namespace
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1

generator/integration_tests/tests/golden_kitchen_sink_stub_factory_test.cc

@@ -71,7 +71,6 @@ TEST(GoldenKitchenSinkStubFactoryTest, DefaultStubWithAuth) {
   EXPECT_THAT(response, StatusIs(StatusCode::kAborted, "fail"));
 }
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 using ::google::cloud::testing_util::DisableTracing;
 using ::google::cloud::testing_util::EnableTracing;
 using ::google::cloud::testing_util::SpanNamed;
@@ -108,8 +107,6 @@ TEST(GoldenKitchenSinkStubFactoryTest, DefaultStubWithTracingDisabled) {
           "google.test.admin.database.v1.GoldenKitchenSink/DoNothing"))));
 }
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 }  // namespace
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal

generator/integration_tests/tests/golden_thing_admin_stub_factory_test.cc

@@ -71,7 +71,6 @@ TEST(GoldenStubFactoryTest, DefaultStubWithAuth) {
   EXPECT_THAT(response, StatusIs(StatusCode::kAborted, "fail"));
 }
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 using ::google::cloud::testing_util::DisableTracing;
 using ::google::cloud::testing_util::EnableTracing;
 using ::google::cloud::testing_util::SpanNamed;
@@ -109,8 +108,6 @@ TEST(GoldenStubFactoryTest, DefaultStubWithTracingDisabled) {
           "google.test.admin.database.v1.GoldenThingAdmin/DeleteBackup"))));
 }
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 }  // namespace
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace golden_v1_internal

generator/internal/tracing_connection_generator.cc

@@ -57,8 +57,6 @@ Status TracingConnectionGenerator::GenerateHeader() {
   if (!result.ok()) return result;
 
   HeaderPrint(R"""(
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 class $tracing_connection_class_name$
     : public $product_namespace$::$connection_class_name$ {
  public:
@@ -87,8 +85,6 @@ class $tracing_connection_class_name$
   std::shared_ptr<$product_namespace$::$connection_class_name$> child_;
 };
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 /**
  * Conditionally applies the tracing decorator to the given connection.
  *
@@ -130,8 +126,6 @@ Status TracingConnectionGenerator::GenerateCc() {
   if (!result.ok()) return result;
 
   CcPrint(R"""(
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 $tracing_connection_class_name$::$tracing_connection_class_name$(
     std::shared_ptr<$product_namespace$::$connection_class_name$> child)
     : child_(std::move(child)) {}
@@ -148,16 +142,12 @@ Status TracingConnectionGenerator::GenerateCc() {
   }
 
   CcPrint(R"""(
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 std::shared_ptr<$product_namespace$::$connection_class_name$>
 Make$tracing_connection_class_name$(
     std::shared_ptr<$product_namespace$::$connection_class_name$> conn) {
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   if (internal::TracingEnabled(conn->options())) {
     conn = std::make_shared<$tracing_connection_class_name$>(std::move(conn));
   }
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   return conn;
 }
 )""");

generator/internal/tracing_stub_generator.cc

@@ -57,8 +57,6 @@ Status TracingStubGenerator::GenerateHeader() {
   // Tracing stub class definition
   HeaderPrint(
       R"""(
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 class $tracing_stub_class_name$ : public $stub_class_name$ {
  public:
   ~$tracing_stub_class_name$() override = default;
@@ -74,8 +72,6 @@ class $tracing_stub_class_name$ : public $stub_class_name$ {
   std::shared_ptr<opentelemetry::context::propagation::TextMapPropagator> propagator_;
 };
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 /**
  * Applies the tracing decorator to the given stub.
  *
@@ -129,8 +125,6 @@ Status TracingStubGenerator::GenerateCc() {
   // constructor
   CcPrint(
       R"""(
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 $tracing_stub_class_name$::$tracing_stub_class_name$(
     std::shared_ptr<$stub_class_name$> child)
     : child_(std::move(child)), propagator_(internal::MakePropagator()) {}
@@ -346,15 +340,9 @@ future<Status> $tracing_stub_class_name$::AsyncCancelOperation(
   }
 
   CcPrint(R"""(
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 std::shared_ptr<$stub_class_name$> Make$tracing_stub_class_name$(
     std::shared_ptr<$stub_class_name$> stub) {
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   return std::make_shared<$tracing_stub_class_name$>(std::move(stub));
-#else
-  return stub;
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 }
 )""");
   CcCloseNamespaces();