regenerate maintenance proto gencode includes

Author: scotthart

google/cloud/maintenance/api/v1/internal/maintenance_auth_decorator.cc

@@ -17,7 +17,7 @@
 // source: google/cloud/maintenance/api/v1/maintenance_service.proto
 
 #include "google/cloud/maintenance/api/v1/internal/maintenance_auth_decorator.h"
-#include <google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h>
+#include "google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h"
 #include <memory>
 #include <utility>
 

google/cloud/maintenance/api/v1/internal/maintenance_logging_decorator.cc

@@ -17,9 +17,9 @@
 // source: google/cloud/maintenance/api/v1/maintenance_service.proto
 
 #include "google/cloud/maintenance/api/v1/internal/maintenance_logging_decorator.h"
+#include "google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h"
 #include "google/cloud/internal/log_wrapper.h"
 #include "google/cloud/status_or.h"
-#include <google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h>
 #include <memory>
 #include <set>
 #include <string>

google/cloud/maintenance/api/v1/internal/maintenance_metadata_decorator.cc

@@ -17,12 +17,12 @@
 // source: google/cloud/maintenance/api/v1/maintenance_service.proto
 
 #include "google/cloud/maintenance/api/v1/internal/maintenance_metadata_decorator.h"
+#include "google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/absl_str_cat_quiet.h"
 #include "google/cloud/internal/api_client_header.h"
 #include "google/cloud/internal/url_encode.h"
 #include "google/cloud/status_or.h"
-#include <google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h>
 #include <memory>
 #include <string>
 #include <utility>

google/cloud/maintenance/api/v1/internal/maintenance_stub.cc

@@ -17,9 +17,9 @@
 // source: google/cloud/maintenance/api/v1/maintenance_service.proto
 
 #include "google/cloud/maintenance/api/v1/internal/maintenance_stub.h"
+#include "google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h"
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/status_or.h"
-#include <google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h>
 #include <memory>
 #include <utility>
 

google/cloud/maintenance/api/v1/internal/maintenance_stub.h

@@ -19,11 +19,11 @@
 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MAINTENANCE_API_V1_INTERNAL_MAINTENANCE_STUB_H
 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_MAINTENANCE_API_V1_INTERNAL_MAINTENANCE_STUB_H
 
+#include "google/cloud/location/locations.grpc.pb.h"
+#include "google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h"
 #include "google/cloud/options.h"
 #include "google/cloud/status_or.h"
 #include "google/cloud/version.h"
-#include <google/cloud/location/locations.grpc.pb.h>
-#include <google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h>
 #include <memory>
 #include <utility>
 

google/cloud/maintenance/api/v1/internal/maintenance_stub_factory.cc

@@ -17,19 +17,19 @@
 // source: google/cloud/maintenance/api/v1/maintenance_service.proto
 
 #include "google/cloud/maintenance/api/v1/internal/maintenance_stub_factory.h"
+#include "google/cloud/location/locations.grpc.pb.h"
 #include "google/cloud/maintenance/api/v1/internal/maintenance_auth_decorator.h"
 #include "google/cloud/maintenance/api/v1/internal/maintenance_logging_decorator.h"
 #include "google/cloud/maintenance/api/v1/internal/maintenance_metadata_decorator.h"
 #include "google/cloud/maintenance/api/v1/internal/maintenance_stub.h"
 #include "google/cloud/maintenance/api/v1/internal/maintenance_tracing_stub.h"
+#include "google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h"
 #include "google/cloud/common_options.h"
 #include "google/cloud/grpc_options.h"
 #include "google/cloud/internal/algorithm.h"
 #include "google/cloud/internal/opentelemetry.h"
 #include "google/cloud/log.h"
 #include "google/cloud/options.h"
-#include <google/cloud/location/locations.grpc.pb.h>
-#include <google/cloud/maintenance/api/v1/maintenance_service.grpc.pb.h>
 #include <memory>
 #include <utility>
 

google/cloud/maintenance/api/v1/internal/maintenance_tracing_connection.cc

@@ -27,8 +27,6 @@ namespace cloud {
 namespace maintenance_api_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 MaintenanceTracingConnection::MaintenanceTracingConnection(
     std::shared_ptr<maintenance_api_v1::MaintenanceConnection> child)
     : child_(std::move(child)) {}
@@ -88,16 +86,12 @@ MaintenanceTracingConnection::GetLocation(
   return internal::EndSpan(*span, child_->GetLocation(request));
 }
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 std::shared_ptr<maintenance_api_v1::MaintenanceConnection>
 MakeMaintenanceTracingConnection(
     std::shared_ptr<maintenance_api_v1::MaintenanceConnection> conn) {
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   if (internal::TracingEnabled(conn->options())) {
     conn = std::make_shared<MaintenanceTracingConnection>(std::move(conn));
   }
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   return conn;
 }
 

google/cloud/maintenance/api/v1/internal/maintenance_tracing_connection.h

@@ -28,8 +28,6 @@ namespace cloud {
 namespace maintenance_api_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 class MaintenanceTracingConnection
     : public maintenance_api_v1::MaintenanceConnection {
  public:
@@ -65,8 +63,6 @@ class MaintenanceTracingConnection
   std::shared_ptr<maintenance_api_v1::MaintenanceConnection> child_;
 };
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 /**
  * Conditionally applies the tracing decorator to the given connection.
  *

google/cloud/maintenance/api/v1/internal/maintenance_tracing_stub.cc

@@ -26,8 +26,6 @@ namespace cloud {
 namespace maintenance_api_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 MaintenanceTracingStub::MaintenanceTracingStub(
     std::shared_ptr<MaintenanceStub> child)
     : child_(std::move(child)), propagator_(internal::MakePropagator()) {}
@@ -97,15 +95,9 @@ StatusOr<google::cloud::location::Location> MaintenanceTracingStub::GetLocation(
                            child_->GetLocation(context, options, request));
 }
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 std::shared_ptr<MaintenanceStub> MakeMaintenanceTracingStub(
     std::shared_ptr<MaintenanceStub> stub) {
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
   return std::make_shared<MaintenanceTracingStub>(std::move(stub));
-#else
-  return stub;
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

google/cloud/maintenance/api/v1/internal/maintenance_tracing_stub.h

@@ -30,8 +30,6 @@ namespace cloud {
 namespace maintenance_api_v1_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-#ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 class MaintenanceTracingStub : public MaintenanceStub {
  public:
   ~MaintenanceTracingStub() override = default;
@@ -71,8 +69,6 @@ class MaintenanceTracingStub : public MaintenanceStub {
       propagator_;
 };
 
-#endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
-
 /**
  * Applies the tracing decorator to the given stub.
  *