feat: remove ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY from generator (#15835)

Author: mpeddada1

generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.cc

@@ -26,8 +26,6 @@ namespace cloud {
 namespace golden_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 DeprecatedServiceTracingConnection::DeprecatedServiceTracingConnection(
     std::shared_ptr<golden_v1::DeprecatedServiceConnection> child)
     : child_(std::move(child)) {}
@@ -39,16 +37,12 @@ DeprecatedServiceTracingConnection::Noop(google::test::deprecated::v1::Deprecate
   return internal::EndSpan(*span, child_->Noop(request));
 }
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 std::shared_ptr<golden_v1::DeprecatedServiceConnection>
 MakeDeprecatedServiceTracingConnection(
     std::shared_ptr<golden_v1::DeprecatedServiceConnection> conn) {
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   if (internal::TracingEnabled(conn->options())) {
     conn = std::make_shared<DeprecatedServiceTracingConnection>(std::move(conn));
   }
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   return conn;
 }
 

generator/integration_tests/golden/v1/internal/deprecated_tracing_connection.h

@@ -28,8 +28,6 @@ namespace cloud {
 namespace golden_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 class DeprecatedServiceTracingConnection
     : public golden_v1::DeprecatedServiceConnection {
  public:
@@ -47,8 +45,6 @@ class DeprecatedServiceTracingConnection
   std::shared_ptr<golden_v1::DeprecatedServiceConnection> child_;
 };
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 /**
  * Conditionally applies the tracing decorator to the given connection.
  *

generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.cc

@@ -26,8 +26,6 @@ namespace cloud {
 namespace golden_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 DeprecatedServiceTracingStub::DeprecatedServiceTracingStub(
     std::shared_ptr<DeprecatedServiceStub> child)
     : child_(std::move(child)), propagator_(internal::MakePropagator()) {}
@@ -43,15 +41,9 @@ Status DeprecatedServiceTracingStub::Noop(
                            child_->Noop(context, options, request));
 }
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 std::shared_ptr<DeprecatedServiceStub> MakeDeprecatedServiceTracingStub(
     std::shared_ptr<DeprecatedServiceStub> stub) {
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   return std::make_shared<DeprecatedServiceTracingStub>(std::move(stub));
-#else
-  return stub;
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

generator/integration_tests/golden/v1/internal/deprecated_tracing_stub.h

@@ -30,8 +30,6 @@ namespace cloud {
 namespace golden_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 class DeprecatedServiceTracingStub : public DeprecatedServiceStub {
  public:
   ~DeprecatedServiceTracingStub() override = default;
@@ -48,8 +46,6 @@ class DeprecatedServiceTracingStub : public DeprecatedServiceStub {
   std::shared_ptr<opentelemetry::context::propagation::TextMapPropagator> propagator_;
 };
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 /**
  * Applies the tracing decorator to the given stub.
  *

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc

@@ -27,8 +27,6 @@ namespace cloud {
 namespace golden_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 GoldenKitchenSinkTracingConnection::GoldenKitchenSinkTracingConnection(
     std::shared_ptr<golden_v1::GoldenKitchenSinkConnection> child)
     : child_(std::move(child)) {}
@@ -136,16 +134,12 @@ GoldenKitchenSinkTracingConnection::ListOperations(google::longrunning::ListOper
         std::move(span), std::move(sr));
 }
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 std::shared_ptr<golden_v1::GoldenKitchenSinkConnection>
 MakeGoldenKitchenSinkTracingConnection(
     std::shared_ptr<golden_v1::GoldenKitchenSinkConnection> conn) {
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   if (internal::TracingEnabled(conn->options())) {
     conn = std::make_shared<GoldenKitchenSinkTracingConnection>(std::move(conn));
   }
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   return conn;
 }
 

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.h

@@ -28,8 +28,6 @@ namespace cloud {
 namespace golden_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 class GoldenKitchenSinkTracingConnection
     : public golden_v1::GoldenKitchenSinkConnection {
  public:
@@ -88,8 +86,6 @@ class GoldenKitchenSinkTracingConnection
   std::shared_ptr<golden_v1::GoldenKitchenSinkConnection> child_;
 };
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 /**
  * Conditionally applies the tracing decorator to the given connection.
  *

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc

@@ -31,8 +31,6 @@ namespace cloud {
 namespace golden_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 GoldenKitchenSinkTracingStub::GoldenKitchenSinkTracingStub(
     std::shared_ptr<GoldenKitchenSinkStub> child)
     : child_(std::move(child)), propagator_(internal::MakePropagator()) {}
@@ -242,15 +240,9 @@ GoldenKitchenSinkTracingStub::AsyncStreamingWrite(
       std::move(context), std::move(stream), std::move(span));
 }
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 std::shared_ptr<GoldenKitchenSinkStub> MakeGoldenKitchenSinkTracingStub(
     std::shared_ptr<GoldenKitchenSinkStub> stub) {
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   return std::make_shared<GoldenKitchenSinkTracingStub>(std::move(stub));
-#else
-  return stub;
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.h

@@ -30,8 +30,6 @@ namespace cloud {
 namespace golden_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 class GoldenKitchenSinkTracingStub : public GoldenKitchenSinkStub {
  public:
   ~GoldenKitchenSinkTracingStub() override = default;
@@ -139,8 +137,6 @@ class GoldenKitchenSinkTracingStub : public GoldenKitchenSinkStub {
   std::shared_ptr<opentelemetry::context::propagation::TextMapPropagator> propagator_;
 };
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 /**
  * Applies the tracing decorator to the given stub.
  *

generator/integration_tests/golden/v1/internal/golden_rest_only_tracing_connection.cc

@@ -26,8 +26,6 @@ namespace cloud {
 namespace golden_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 GoldenRestOnlyTracingConnection::GoldenRestOnlyTracingConnection(
     std::shared_ptr<golden_v1::GoldenRestOnlyConnection> child)
     : child_(std::move(child)) {}
@@ -39,16 +37,12 @@ GoldenRestOnlyTracingConnection::Noop(google::protobuf::Empty const& request) {
   return internal::EndSpan(*span, child_->Noop(request));
 }
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 std::shared_ptr<golden_v1::GoldenRestOnlyConnection>
 MakeGoldenRestOnlyTracingConnection(
     std::shared_ptr<golden_v1::GoldenRestOnlyConnection> conn) {
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   if (internal::TracingEnabled(conn->options())) {
     conn = std::make_shared<GoldenRestOnlyTracingConnection>(std::move(conn));
   }
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   return conn;
 }
 

generator/integration_tests/golden/v1/internal/golden_rest_only_tracing_connection.h

@@ -28,8 +28,6 @@ namespace cloud {
 namespace golden_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 class GoldenRestOnlyTracingConnection
     : public golden_v1::GoldenRestOnlyConnection {
  public:
@@ -47,8 +45,6 @@ class GoldenRestOnlyTracingConnection
   std::shared_ptr<golden_v1::GoldenRestOnlyConnection> child_;
 };
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 /**
  * Conditionally applies the tracing decorator to the given connection.
  *